steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass along to Terraform process

This commit is contained in:
Andrew Nester 2025-01-28 12:06:23 +00:00
parent 65e4f79dfe
commit 6ad894188d
No known key found for this signature in database
GPG Key ID: 12BC628A44B7DA57
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundle/deploy/terraform/init.go
View File

@ -105,6 +105,13 @@ var envCopy = []string{
// This is set in Azure DevOps by the AzureCLI@2 task. // This is set in Azure DevOps by the AzureCLI@2 task.
"AZURE_CONFIG_FILE", "AZURE_CONFIG_FILE",
// Include $AZURE_CONFIG_DIR in set of environment variables to pass along.
// This is set by Azure CLI as per https://learn.microsoft.com/en-us/cli/azure/azure-cli-configuration#cli-configuration-file
azureConfigDir, ok := env.Lookup(ctx, "AZURE_CONFIG_DIR")
if ok {
environ["AZURE_CONFIG_DIR"] = azureConfigDir
}
// Include $TF_CLI_CONFIG_FILE to override terraform provider in development. // Include $TF_CLI_CONFIG_FILE to override terraform provider in development.
// See: https://developer.hashicorp.com/terraform/cli/config/config-file#explicit-installation-method-configuration // See: https://developer.hashicorp.com/terraform/cli/config/config-file#explicit-installation-method-configuration
"TF_CLI_CONFIG_FILE", "TF_CLI_CONFIG_FILE",

2
bundle/deploy/terraform/init_test.go
View File

@ -293,6 +293,7 @@ func TestInheritEnvVars(t *testing.T) {
t.Setenv("PATH", "/foo:/bar") t.Setenv("PATH", "/foo:/bar")
t.Setenv("TF_CLI_CONFIG_FILE", "/tmp/config.tfrc") t.Setenv("TF_CLI_CONFIG_FILE", "/tmp/config.tfrc")
t.Setenv("AZURE_CONFIG_FILE", "/tmp/foo/bar") t.Setenv("AZURE_CONFIG_FILE", "/tmp/foo/bar")
t.Setenv("AZURE_CONFIG_DIR", "/tmp/foo")
ctx := context.Background() ctx := context.Background()
env := map[string]string{} env := map[string]string{}
@ -302,6 +303,7 @@ func TestInheritEnvVars(t *testing.T) {
assert.Equal(t, "/foo:/bar", env["PATH"]) assert.Equal(t, "/foo:/bar", env["PATH"])
assert.Equal(t, "/tmp/config.tfrc", env["TF_CLI_CONFIG_FILE"]) assert.Equal(t, "/tmp/config.tfrc", env["TF_CLI_CONFIG_FILE"])
assert.Equal(t, "/tmp/foo/bar", env["AZURE_CONFIG_FILE"]) assert.Equal(t, "/tmp/foo/bar", env["AZURE_CONFIG_FILE"])
assert.Equal(t, "/tmp/foo", env["AZURE_CONFIG_DIR"])
} }
} }