From 9cba9eddb0d987040cb9740ce692708b16639d9b Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Fri, 7 Feb 2025 22:23:42 +0300 Subject: [PATCH 1/4] Update atmos_options.go --- pkg/atmos/component-helper/atmos_options.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/atmos/component-helper/atmos_options.go b/pkg/atmos/component-helper/atmos_options.go index 2c08b0b..dc2d53e 100644 --- a/pkg/atmos/component-helper/atmos_options.go +++ b/pkg/atmos/component-helper/atmos_options.go @@ -25,9 +25,9 @@ func getAtmosOptions(t *testing.T, config *c.Config, componentName string, stack Component: componentName, Stack: stackName, NoColor: true, - BackendConfig: map[string]interface{}{ - "workspace_key_prefix": strings.Join([]string{config.RandomIdentifier, stackName}, "-"), - }, + // BackendConfig: map[string]interface{}{ + // "workspace_key_prefix": strings.Join([]string{config.RandomIdentifier, stackName}, "-"), + // }, Vars: mergedVars, EnvVars: map[string]string{ "ATMOS_BASE_PATH": config.TempDir, From 6de51c52ac2d164d094b7a7d723cd258f811103c Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Fri, 7 Feb 2025 22:26:49 +0300 Subject: [PATCH 2/4] Update atmos_options.go --- pkg/atmos/component-helper/atmos_options.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/atmos/component-helper/atmos_options.go b/pkg/atmos/component-helper/atmos_options.go index dc2d53e..d217049 100644 --- a/pkg/atmos/component-helper/atmos_options.go +++ b/pkg/atmos/component-helper/atmos_options.go @@ -1,7 +1,7 @@ package component_helper import ( - "strings" +// "strings" "testing" "dario.cat/mergo" From 79adedcb2c8b71aa4a57b65ee766c4e2b9bd0b19 Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Fri, 7 Feb 2025 22:35:28 +0300 Subject: [PATCH 3/4] Update atmos_options.go --- pkg/atmos/component-helper/atmos_options.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/atmos/component-helper/atmos_options.go b/pkg/atmos/component-helper/atmos_options.go index d217049..2c08b0b 100644 --- a/pkg/atmos/component-helper/atmos_options.go +++ b/pkg/atmos/component-helper/atmos_options.go @@ -1,7 +1,7 @@ package component_helper import ( -// "strings" + "strings" "testing" "dario.cat/mergo" @@ -25,9 +25,9 @@ func getAtmosOptions(t *testing.T, config *c.Config, componentName string, stack Component: componentName, Stack: stackName, NoColor: true, - // BackendConfig: map[string]interface{}{ - // "workspace_key_prefix": strings.Join([]string{config.RandomIdentifier, stackName}, "-"), - // }, + BackendConfig: map[string]interface{}{ + "workspace_key_prefix": strings.Join([]string{config.RandomIdentifier, stackName}, "-"), + }, Vars: mergedVars, EnvVars: map[string]string{ "ATMOS_BASE_PATH": config.TempDir, From 73491a56240bcb57d3f0ed81e3973cff8e1f68c4 Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Fri, 7 Feb 2025 23:59:49 +0300 Subject: [PATCH 4/4] Update atmos_options.go --- pkg/atmos/component-helper/atmos_options.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/atmos/component-helper/atmos_options.go b/pkg/atmos/component-helper/atmos_options.go index 2c08b0b..23f38a0 100644 --- a/pkg/atmos/component-helper/atmos_options.go +++ b/pkg/atmos/component-helper/atmos_options.go @@ -31,6 +31,7 @@ func getAtmosOptions(t *testing.T, config *c.Config, componentName string, stack Vars: mergedVars, EnvVars: map[string]string{ "ATMOS_BASE_PATH": config.TempDir, + "ATMOS_CLI_CONFIG_PATH": config.TempDir, "COMPONENT_HELPER_STATE_DIR": config.StateDir, }, }