fix: Handle TF_DATA_DIR and Error Logging for !terraform.output #1037
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,10 @@ package exec | |
|
|
||
| import ( | ||
| "errors" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| l "github.com/charmbracelet/log" | ||
| "github.com/cloudposse/atmos/pkg/schema" | ||
| u "github.com/cloudposse/atmos/pkg/utils" | ||
| ) | ||
|
|
@@ -25,9 +25,48 @@ func checkTerraformConfig(atmosConfig schema.AtmosConfiguration) error { | |
| // We delete the file to prevent the Terraform prompt asking to select the default or the | ||
| // previously used workspace. This happens when different backends are used for the same component. | ||
| func cleanTerraformWorkspace(atmosConfig schema.AtmosConfiguration, componentPath string) { | ||
| // Get TF_DATA_DIR, default to .terraform if not set | ||
| tfDataDir := os.Getenv("TF_DATA_DIR") | ||
| if tfDataDir == "" { | ||
| tfDataDir = ".terraform" | ||
| } | ||
|
|
||
| // Convert relative path to absolute | ||
| if !filepath.IsAbs(tfDataDir) { | ||
| tfDataDir = filepath.Join(componentPath, tfDataDir) | ||
| } | ||
|
|
||
| // Ensure the path is cleaned properly | ||
| tfDataDir = filepath.Clean(tfDataDir) | ||
|
|
||
| // Construct the full file path | ||
| filePath := filepath.Join(tfDataDir, "environment") | ||
|
|
||
| // Check if the file exists before attempting deletion | ||
| if _, err := os.Stat(filePath); err == nil { | ||
| l.Debug("Terraform environment file found. Proceeding with deletion.", | ||
| "file", filePath, | ||
| ) | ||
| if err := os.Remove(filePath); err != nil { | ||
| l.Debug("Failed to delete Terraform environment file.", | ||
| "file", filePath, | ||
| "error", err, | ||
| ) | ||
| } else { | ||
| l.Debug("Successfully deleted Terraform environment file.", | ||
| "file", filePath, | ||
| ) | ||
| } | ||
| } else if os.IsNotExist(err) { | ||
| l.Debug("Terraform environment file not found. No action needed.", | ||
| "file", filePath, | ||
| ) | ||
| } else { | ||
| l.Debug("Error checking Terraform environment file.", | ||
| "file", filePath, | ||
| "error", err, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| func shouldProcessStacks(info *schema.ConfigAndStacksInfo) (bool, bool) { | ||
|
|
@@ -50,8 +89,9 @@ func generateBackendConfig(atmosConfig *schema.AtmosConfiguration, info *schema. | |
| if atmosConfig.Components.Terraform.AutoGenerateBackendFile { | ||
| backendFileName := filepath.Join(workingDir, "backend.tf.json") | ||
|
|
||
| l.Debug("Writing the backend config to file.", | ||
| "file", backendFileName, | ||
| ) | ||
|
|
||
| if !info.DryRun { | ||
| componentBackendConfig, err := generateComponentBackendConfig(info.ComponentBackendType, info.ComponentBackendSection, info.TerraformWorkspace) | ||
|
|
@@ -74,8 +114,9 @@ func generateProviderOverrides(atmosConfig *schema.AtmosConfiguration, info *sch | |
| if len(info.ComponentProvidersSection) > 0 { | ||
| providerOverrideFileName := filepath.Join(workingDir, "providers_override.tf.json") | ||
|
|
||
| l.Debug("Writing the provider overrides to file.", | ||
| "file", providerOverrideFileName, | ||
| ) | ||
|
|
||
| if !info.DryRun { | ||
| providerOverrides := generateComponentProviderOverrides(info.ComponentProvidersSection) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix undefined
l.Tracemethod.The static analysis indicates that
l.Traceis undefined.Replace with the correct logging level:
📝 Committable suggestion
🧰 Tools
🪛 GitHub Check: Build (macos-latest, macos)
[failure] 236-236:
undefined: l.Trace
🪛 GitHub Check: Build (ubuntu-latest, linux)
[failure] 236-236:
undefined: l.Trace