updates

cloudposse · Jun 20, 2024 · 6746ba4 · 6746ba4
1 parent 0703d13
commit 6746ba4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/internal/exec/describe_stacks.go b/internal/exec/describe_stacks.go
@@ -235,6 +235,7 @@ func ExecuteDescribeStacks(
 							finalStacksMap[stackName] = make(map[string]any)
 						}
 
+						configAndStacksInfo.Stack = stackName
 						configAndStacksInfo.ComponentSection["atmos_component"] = componentName
 						configAndStacksInfo.ComponentSection["atmos_stack"] = stackName
 						configAndStacksInfo.ComponentSection["stack"] = stackName
@@ -252,6 +253,13 @@ func ExecuteDescribeStacks(
 								finalStacksMap[stackName].(map[string]any)["components"].(map[string]any)["terraform"].(map[string]any)[componentName] = make(map[string]any)
 							}
 
+							// Atmos component, stack, and stack manifest file
+							componentSection["atmos_component"] = componentName
+							componentSection["atmos_stack"] = stackName
+							componentSection["stack"] = stackName
+							componentSection["atmos_stack_file"] = stackFileName
+							componentSection["atmos_manifest"] = stackFileName
+
 							// Terraform workspace
 							workspace, err := BuildTerraformWorkspace(cliConfig, configAndStacksInfo)
 							if err != nil {
@@ -260,13 +268,6 @@ func ExecuteDescribeStacks(
 							componentSection["workspace"] = workspace
 							configAndStacksInfo.ComponentSection["workspace"] = workspace
 
-							// Atmos component, stack, and stack manifest file
-							componentSection["atmos_component"] = componentName
-							componentSection["atmos_stack"] = stackName
-							componentSection["stack"] = stackName
-							componentSection["atmos_stack_file"] = stackFileName
-							componentSection["atmos_manifest"] = stackFileName
-
 							// Process `Go` templates
 							componentSectionStr, err := u.ConvertToYAML(componentSection)
 							if err != nil {

diff --git a/internal/exec/terraform_generate_varfiles.go b/internal/exec/terraform_generate_varfiles.go
@@ -3,15 +3,15 @@ package exec
 import (
 	"errors"
 	"fmt"
-	c "github.com/cloudposse/atmos/pkg/convert"
-	"github.com/mitchellh/mapstructure"
 	"path"
 	"path/filepath"
 	"strings"
 
+	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/cobra"
 
 	cfg "github.com/cloudposse/atmos/pkg/config"
+	c "github.com/cloudposse/atmos/pkg/convert"
 	"github.com/cloudposse/atmos/pkg/schema"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
@@ -212,12 +212,29 @@ func ExecuteTerraformGenerateVarfiles(
 					}
 				}
 
+				configAndStacksInfo.Context = context
+				configAndStacksInfo.Stack = stackName
 				configAndStacksInfo.ComponentSection["atmos_component"] = componentName
 				configAndStacksInfo.ComponentSection["atmos_stack"] = stackName
 				configAndStacksInfo.ComponentSection["stack"] = stackName
 				configAndStacksInfo.ComponentSection["atmos_stack_file"] = stackFileName
 				configAndStacksInfo.ComponentSection["atmos_manifest"] = stackFileName
 
+				// Terraform workspace
+				workspace, err := BuildTerraformWorkspace(cliConfig, configAndStacksInfo)
+				if err != nil {
+					return err
+				}
+				componentSection["workspace"] = workspace
+				configAndStacksInfo.ComponentSection["workspace"] = workspace
+
+				// Atmos component, stack, and stack manifest file
+				componentSection["atmos_component"] = componentName
+				componentSection["atmos_stack"] = stackName
+				componentSection["stack"] = stackName
+				componentSection["atmos_stack_file"] = stackFileName
+				componentSection["atmos_manifest"] = stackFileName
+
 				// Process `Go` templates
 				componentSectionStr, err := u.ConvertToYAML(componentSection)
 				if err != nil {