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

Refactor env forwarding function in terraform (#2206) 

No functional changes, just making it easier to add variables.
This commit is contained in:
Denis Bilenko 2025-01-22 13:51:17 +01:00 committed by GitHub
parent 6c3ddbd921
commit 667302b61b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,41 +88,35 @@ func (m *initialize) findExecPath(ctx context.Context, b *bundle.Bundle, tf *con
return tf.ExecPath, nil return tf.ExecPath, nil
} }
// This function inherits some environment variables for Terraform CLI. var envCopy = []string{
func inheritEnvVars(ctx context.Context, environ map[string]string) error {
// Include $HOME in set of environment variables to pass along. // Include $HOME in set of environment variables to pass along.
home, ok := env.Lookup(ctx, "HOME") "HOME",
if ok {
environ["HOME"] = home
}
// Include $USERPROFILE in set of environment variables to pass along. // Include $USERPROFILE in set of environment variables to pass along.
// This variable is used by Azure CLI on Windows to find stored credentials and metadata // This variable is used by Azure CLI on Windows to find stored credentials and metadata
userProfile, ok := env.Lookup(ctx, "USERPROFILE") "USERPROFILE",
if ok {
environ["USERPROFILE"] = userProfile
}
// Include $PATH in set of environment variables to pass along. // Include $PATH in set of environment variables to pass along.
// This is necessary to ensure that our Terraform provider can use the // This is necessary to ensure that our Terraform provider can use the
// same auxiliary programs (e.g. `az`, or `gcloud`) as the CLI. // same auxiliary programs (e.g. `az`, or `gcloud`) as the CLI.
path, ok := env.Lookup(ctx, "PATH") "PATH",
if ok {
environ["PATH"] = path
}
// Include $AZURE_CONFIG_FILE in set of environment variables to pass along. // Include $AZURE_CONFIG_FILE in set of environment variables to pass along.
// This is set in Azure DevOps by the AzureCLI@2 task. // This is set in Azure DevOps by the AzureCLI@2 task.
azureConfigFile, ok := env.Lookup(ctx, "AZURE_CONFIG_FILE") "AZURE_CONFIG_FILE",
if ok {
environ["AZURE_CONFIG_FILE"] = azureConfigFile
}
// 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
devConfigFile, ok := env.Lookup(ctx, "TF_CLI_CONFIG_FILE") "TF_CLI_CONFIG_FILE",
if ok { }
environ["TF_CLI_CONFIG_FILE"] = devConfigFile
// This function inherits some environment variables for Terraform CLI.
func inheritEnvVars(ctx context.Context, environ map[string]string) error {
for _, key := range envCopy {
value, ok := env.Lookup(ctx, key)
if ok {
environ[key] = value
}
} }
// Map $DATABRICKS_TF_CLI_CONFIG_FILE to $TF_CLI_CONFIG_FILE // Map $DATABRICKS_TF_CLI_CONFIG_FILE to $TF_CLI_CONFIG_FILE