Skip to content

Commit 81aefde

Browse files
committed
fix: switch ws cache lookup func for root env searches
1 parent 756d8c8 commit 81aefde

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

cmd/internal/exec.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,16 @@ func execFunc(ctx *context.Context, cmd *cobra.Command, verb executable.Verb, ar
143143

144144
envMap := make(map[string]string)
145145
// add workspace env variables to the env map
146-
if wsCfg, ok := ctx.WorkspacesCache.GetData().Workspaces[e.Workspace()]; !ok {
147-
logger.Log().Warnf("workspace %s not found in cache, skipping env file resolution", e.Workspace())
146+
if wsData, err := ctx.WorkspacesCache.GetWorkspaceConfigList(); err != nil {
147+
logger.Log().Errorf("failed to get workspace cache data, skipping env file resolution: %v", err)
148148
} else {
149-
applyWorkspaceParameterOverrides(wsCfg, envMap)
149+
if wsCfg := wsData.FindByName(e.Workspace()); wsCfg == nil {
150+
logger.Log().Warnf("workspace %s not found in cache, skipping env file resolution", e.Workspace())
151+
} else {
152+
applyWorkspaceParameterOverrides(wsCfg, envMap)
153+
}
150154
}
155+
151156
// add --param overrides to the env map
152157
paramOverrides := flags.ValueFor[[]string](cmd, *flags.ParameterValueFlag, false)
153158
applyParameterOverrides(paramOverrides, envMap)

internal/utils/env/params.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func resolveSecretValue(
4141
currentVault string,
4242
secretRef string,
4343
) (string, error) {
44-
4544
rVault, key, err := vault.RefToParts(vault.SecretRef(secretRef))
4645
if err != nil {
4746
return "", err

0 commit comments

Comments
 (0)