awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(run): compare environment slug to environment slug

Browse Source
This commit is contained in:
Mahyar Mirrashed
2025-03-13 13:21:12 -07:00
parent ad207786e2
commit a500f00a49
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/packages/cmd/run.go
View File

@@ -59,11 +59,11 @@ var runCmd = &cobra.Command{
return nil return nil
}, },
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
environmentName, _ := cmd.Flags().GetString("env") environmentSlug, _ := cmd.Flags().GetString("env")
if !cmd.Flags().Changed("env") { if !cmd.Flags().Changed("env") {
environmentFromWorkspace := util.GetEnvFromWorkspaceFile() environmentFromWorkspace := util.GetEnvFromWorkspaceFile()
if environmentFromWorkspace != "" { if environmentFromWorkspace != "" {
environmentName = environmentFromWorkspace environmentSlug = environmentFromWorkspace
} }
} }
@@ -136,21 +136,21 @@ var runCmd = &cobra.Command{
util.HandleError(err, "Unable to parse flag") util.HandleError(err, "Unable to parse flag")
} }
log.Debug().Msgf("Confirming selected environment is valid: %s", environmentName) log.Debug().Msgf("Confirming selected environment is valid: %s", environmentSlug)
var hasEnvironment bool var hasEnvironment bool
hasEnvironment, err = confirmProjectHasEnvironment(environmentName, projectId, token) hasEnvironment, err = confirmProjectHasEnvironment(environmentSlug, projectId, token)
if err != nil { if err != nil {
util.HandleError(err, "Could not confirm project has environment") util.HandleError(err, "Could not confirm project has environment")
} }
if !hasEnvironment { if !hasEnvironment {
util.HandleError(fmt.Errorf("project does not have environment '%s'", environmentName)) util.HandleError(fmt.Errorf("project does not have environment '%s'", environmentSlug))
} }
log.Debug().Msgf("Project '%s' has environment '%s'", projectId, environmentName) log.Debug().Msgf("Project '%s' has environment '%s'", projectId, environmentSlug)
request := models.GetAllSecretsParameters{ request := models.GetAllSecretsParameters{
Environment: environmentName, Environment: environmentSlug,
WorkspaceId: projectId, WorkspaceId: projectId,
TagSlugs: tagSlugs, TagSlugs: tagSlugs,
SecretsPath: secretsPath, SecretsPath: secretsPath,
@@ -450,7 +450,7 @@ func executeCommandWithWatchMode(commandFlag string, args []string, watchModeInt
} }
} }
func confirmProjectHasEnvironment(environmentName, projectId string, token *models.TokenDetails) (bool, error) { func confirmProjectHasEnvironment(environmentSlug, projectId string, token *models.TokenDetails) (bool, error) {
var accessToken string var accessToken string
if token != nil && (token.Type == util.SERVICE_TOKEN_IDENTIFIER || token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER) { if token != nil && (token.Type == util.SERVICE_TOKEN_IDENTIFIER || token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER) {
@@ -485,7 +485,7 @@ func confirmProjectHasEnvironment(environmentName, projectId string, token *mode
} }
for _, env := range project.Environments { for _, env := range project.Environments {
if env.Name == environmentName { if env.Slug == environmentSlug {
return true, nil return true, nil
} }
} }