From b434511c408a1769307c3f0a44241e779f6abbaa Mon Sep 17 00:00:00 2001 From: mohsenari Date: Wed, 30 Aug 2023 18:52:08 -0400 Subject: [PATCH 1/3] Fixed envname case mismatch --- envsec/internal/envcli/exec.go | 2 +- envsec/internal/envcli/ls.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/envsec/internal/envcli/exec.go b/envsec/internal/envcli/exec.go index d8c93b1f..b499f439 100644 --- a/envsec/internal/envcli/exec.go +++ b/envsec/internal/envcli/exec.go @@ -37,7 +37,7 @@ func execCmd() *cobra.Command { envNames := []string{"DEV"} // If a specific environment was set by the user, then just use that one. if cmd.Flags().Changed(environmentFlagName) { - envNames = []string{cmdCfg.EnvId.EnvName} + envNames = []string{strings.ToLower(cmdCfg.EnvId.EnvName)} } envId := envsec.EnvId{ OrgId: cmdCfg.EnvId.OrgId, diff --git a/envsec/internal/envcli/ls.go b/envsec/internal/envcli/ls.go index 98591f4e..206cf342 100644 --- a/envsec/internal/envcli/ls.go +++ b/envsec/internal/envcli/ls.go @@ -4,6 +4,8 @@ package envcli import ( + "strings" + "github.com/pkg/errors" "github.com/spf13/cobra" "go.jetpack.io/envsec" @@ -35,7 +37,7 @@ func listCmd() *cobra.Command { envNames := []string{"DEV", "PROD", "STAGING"} // If a specific environment was set by the user, then just use that one. if cmd.Flags().Changed(environmentFlagName) { - envNames = []string{cmdCfg.EnvId.EnvName} + envNames = []string{strings.ToLower(cmdCfg.EnvId.EnvName)} } // TODO: parallelize From f3bfc25700e1a7a83e370431168413d50562ebf2 Mon Sep 17 00:00:00 2001 From: mohsenari Date: Wed, 30 Aug 2023 18:59:44 -0400 Subject: [PATCH 2/3] Updated missed envName --- envsec/internal/envcli/ls.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envsec/internal/envcli/ls.go b/envsec/internal/envcli/ls.go index 206cf342..4582582d 100644 --- a/envsec/internal/envcli/ls.go +++ b/envsec/internal/envcli/ls.go @@ -45,7 +45,7 @@ func listCmd() *cobra.Command { envId := envsec.EnvId{ OrgId: cmdCfg.EnvId.OrgId, ProjectId: cmdCfg.EnvId.ProjectId, - EnvName: envName, + EnvName: strings.ToLower(envName), } envVars, err := cmdCfg.Store.List(cmd.Context(), envId) if err != nil { From 0c0e0acc4aa67dc67b2a089b9c6168d7b6c8bd65 Mon Sep 17 00:00:00 2001 From: mohsenari Date: Thu, 31 Aug 2023 11:20:49 -0400 Subject: [PATCH 3/3] Changed hardcoded env names to lowercase --- envsec/internal/envcli/exec.go | 2 +- envsec/internal/envcli/ls.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/envsec/internal/envcli/exec.go b/envsec/internal/envcli/exec.go index b499f439..a7d82367 100644 --- a/envsec/internal/envcli/exec.go +++ b/envsec/internal/envcli/exec.go @@ -34,7 +34,7 @@ func execCmd() *cobra.Command { commandToRun := exec.Command("/bin/sh", "-c", commandString) // Default environment to fetch values from is DEV - envNames := []string{"DEV"} + envNames := []string{"dev"} // If a specific environment was set by the user, then just use that one. if cmd.Flags().Changed(environmentFlagName) { envNames = []string{strings.ToLower(cmdCfg.EnvId.EnvName)} diff --git a/envsec/internal/envcli/ls.go b/envsec/internal/envcli/ls.go index 4582582d..bb39b4c4 100644 --- a/envsec/internal/envcli/ls.go +++ b/envsec/internal/envcli/ls.go @@ -34,7 +34,7 @@ func listCmd() *cobra.Command { return err } // Populate the valid Environments - envNames := []string{"DEV", "PROD", "STAGING"} + envNames := []string{"dev", "prod", "staging"} // If a specific environment was set by the user, then just use that one. if cmd.Flags().Changed(environmentFlagName) { envNames = []string{strings.ToLower(cmdCfg.EnvId.EnvName)}