Pass additional Azure DevOps SYSTEM_* environment variables to Terraform for OIDC authentication (#4318)

## Changes
Pass additional Azure DevOps SYSTEM_* environment variables to Terraform
for OIDC authentication

## Why
Fixes #4311 

## Tests
Added unit test

<!-- If your PR needs to be included in the release notes for next
release,
add a separate entry in NEXT_CHANGELOG.md as part of your PR. -->

Author: andrewnester

NEXT_CHANGELOG.md

@@ -7,6 +7,7 @@
 ### CLI
 
 ### Bundles
+* Pass additional Azure DevOps `SYSTEM_*` environment variables to Terraform for OIDC authentication: `SYSTEM_COLLECTIONURI`, `SYSTEM_DEFINITIONID`, `SYSTEM_HOSTTYPE`, `SYSTEM_JOBID`, `SYSTEM_TEAMPROJECT` ([#4318](https://github.com/databricks/cli/pull/4318))
 * Add support for valueFrom property (similar to app.yaml) inside Apps config field in bundle configuration ([#4297](https://github.com/databricks/cli/pull/4297))
 * engine/direct: Support bind & unbind. ([#4279](https://github.com/databricks/cli/pull/4279))
 

bundle/deploy/terraform/init.go

@@ -170,11 +170,16 @@ func inheritEnvVars(ctx context.Context, environ map[string]string) error {
 	// These variables are used by the Databricks Go SDK to authenticate with Azure DevOps OIDC.
 	azureDevOpsVars := []string{
 		"SYSTEM_ACCESSTOKEN",
-		"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",
-		"SYSTEM_PLANID",
 		"SYSTEM_COLLECTIONID",
-		"SYSTEM_TEAMPROJECTID",
+		"SYSTEM_COLLECTIONURI",
+		"SYSTEM_DEFINITIONID",
+		"SYSTEM_HOSTTYPE",
+		"SYSTEM_JOBID",
 		"SYSTEM_OIDCREQUESTURI",
+		"SYSTEM_PLANID",
+		"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",
+		"SYSTEM_TEAMPROJECT",
+		"SYSTEM_TEAMPROJECTID",
 	}
 	for _, varName := range azureDevOpsVars {
 		if val, ok := env.Lookup(ctx, varName); ok {

bundle/deploy/terraform/init_test.go

@@ -281,41 +281,65 @@ func TestInheritOIDCTokenEnv(t *testing.T) {
 	assert.Equal(t, "", env["DATABRICKS_OIDC_TOKEN_ENV"])
 }
 
-func TestInheritSystemAccessToken(t *testing.T) {
-	t.Setenv("SYSTEM_ACCESSTOKEN", "foobar")
-
-	ctx := context.Background()
-	env := map[string]string{}
-	err := inheritEnvVars(ctx, env)
-	require.NoError(t, err)
-	assert.Equal(t, "foobar", env["SYSTEM_ACCESSTOKEN"])
-}
+func TestInheritAzureDevOpsSystemVariablesIndividual(t *testing.T) {
+	testCases := []struct {
+		envVar   string
+		envValue string
+	}{
+		{"SYSTEM_ACCESSTOKEN", "test-token"},
+		{"SYSTEM_COLLECTIONID", "collection-id-456"},
+		{"SYSTEM_COLLECTIONURI", "https://dev.azure.com/myorg/"},
+		{"SYSTEM_DEFINITIONID", "42"},
+		{"SYSTEM_HOSTTYPE", "build"},
+		{"SYSTEM_JOBID", "job-123"},
+		{"SYSTEM_OIDCREQUESTURI", "https://oidc.example.com"},
+		{"SYSTEM_PLANID", "plan-id-123"},
+		{"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", "https://dev.azure.com/org/"},
+		{"SYSTEM_TEAMPROJECT", "my-project"},
+		{"SYSTEM_TEAMPROJECTID", "project-id-789"},
+	}
 
-func TestInheritSystemTeamFoundationCollectionUri(t *testing.T) {
-	t.Setenv("SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", "foobar")
+	for _, tc := range testCases {
+		t.Run(tc.envVar, func(t *testing.T) {
+			t.Setenv(tc.envVar, tc.envValue)
 
-	ctx := context.Background()
-	env := map[string]string{}
-	err := inheritEnvVars(ctx, env)
-	require.NoError(t, err)
-	assert.Equal(t, "foobar", env["SYSTEM_TEAMFOUNDATIONCOLLECTIONURI"])
+			ctx := context.Background()
+			env := map[string]string{}
+			err := inheritEnvVars(ctx, env)
+			require.NoError(t, err)
+			assert.Equal(t, tc.envValue, env[tc.envVar])
+		})
+	}
 }
 
 func TestInheritAzureDevOpsSystemVariables(t *testing.T) {
-	// Set Azure DevOps system variables
-	t.Setenv("SYSTEM_PLANID", "plan-id-123")
-	t.Setenv("SYSTEM_COLLECTIONID", "collection-id-456")
-	t.Setenv("SYSTEM_TEAMPROJECTID", "project-id-789")
-	t.Setenv("SYSTEM_OIDCREQUESTURI", "https://oidc.example.com")
+	// Set all Azure DevOps system variables
+	vars := map[string]string{
+		"SYSTEM_ACCESSTOKEN":                 "test-token",
+		"SYSTEM_COLLECTIONID":                "collection-id-456",
+		"SYSTEM_COLLECTIONURI":               "https://dev.azure.com/myorg/",
+		"SYSTEM_DEFINITIONID":                "42",
+		"SYSTEM_HOSTTYPE":                    "build",
+		"SYSTEM_JOBID":                       "job-123",
+		"SYSTEM_OIDCREQUESTURI":              "https://oidc.example.com",
+		"SYSTEM_PLANID":                      "plan-id-123",
+		"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/org/",
+		"SYSTEM_TEAMPROJECT":                 "my-project",
+		"SYSTEM_TEAMPROJECTID":               "project-id-789",
+	}
+
+	for k, v := range vars {
+		t.Setenv(k, v)
+	}
 
 	ctx := context.Background()
 	env := map[string]string{}
 	err := inheritEnvVars(ctx, env)
 	require.NoError(t, err)
-	assert.Equal(t, "plan-id-123", env["SYSTEM_PLANID"])
-	assert.Equal(t, "collection-id-456", env["SYSTEM_COLLECTIONID"])
-	assert.Equal(t, "project-id-789", env["SYSTEM_TEAMPROJECTID"])
-	assert.Equal(t, "https://oidc.example.com", env["SYSTEM_OIDCREQUESTURI"])
+
+	for k, v := range vars {
+		assert.Equal(t, v, env[k])
+	}
 }
 
 func TestSetUserProfileFromInheritEnvVars(t *testing.T) {