From 3a6ec3717bfbd0614237cf4ab1c89a642be6b4f4 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com> Date: Tue, 16 Apr 2024 10:15:07 +0200 Subject: [PATCH] Fix: Use constant identifiers --- cli/packages/cmd/export.go | 8 ++++---- cli/packages/cmd/folder.go | 4 ++-- cli/packages/cmd/run.go | 12 ++++++------ cli/packages/cmd/secrets.go | 20 ++++++++++---------- cli/packages/util/constants.go | 3 +++ cli/packages/util/helper.go | 4 ++-- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/cli/packages/cmd/export.go b/cli/packages/cmd/export.go index c6841a3f2..4e08e5fa8 100644 --- a/cli/packages/cmd/export.go +++ b/cli/packages/cmd/export.go @@ -87,9 +87,9 @@ var exportCmd = &cobra.Command{ IncludeImport: includeImports, } - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { request.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { request.UniversalAuthAccessToken = token.Token } @@ -109,9 +109,9 @@ var exportCmd = &cobra.Command{ authParams := models.ExpandSecretsAuthentication{} - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { authParams.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { authParams.UniversalAuthAccessToken = token.Token } diff --git a/cli/packages/cmd/folder.go b/cli/packages/cmd/folder.go index 247050c90..b306960f4 100644 --- a/cli/packages/cmd/folder.go +++ b/cli/packages/cmd/folder.go @@ -56,9 +56,9 @@ var getCmd = &cobra.Command{ FoldersPath: foldersPath, } - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { request.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { request.UniversalAuthAccessToken = token.Token } diff --git a/cli/packages/cmd/run.go b/cli/packages/cmd/run.go index 8481277e9..3fe151d0b 100644 --- a/cli/packages/cmd/run.go +++ b/cli/packages/cmd/run.go @@ -116,9 +116,9 @@ var runCmd = &cobra.Command{ Recursive: recursive, } - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { request.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { request.UniversalAuthAccessToken = token.Token } @@ -138,9 +138,9 @@ var runCmd = &cobra.Command{ authParams := models.ExpandSecretsAuthentication{} - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { authParams.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { authParams.UniversalAuthAccessToken = token.Token } @@ -179,8 +179,8 @@ var runCmd = &cobra.Command{ posthog.NewProperties(). Set("secretsCount", len(secrets)). Set("environment", environmentName). - Set("isUsingServiceToken", token.Type == "service-token"). - Set("isUsingUniversalAuthToken", token.Type == "universal-auth-token"). + Set("isUsingServiceToken", token.Type == util.SERVICE_TOKEN_IDENTIFIER). + Set("isUsingUniversalAuthToken", token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER). Set("single-command", strings.Join(args, " ")). Set("multi-command", cmd.Flag("command").Value.String()). Set("version", util.CLI_VERSION)) diff --git a/cli/packages/cmd/secrets.go b/cli/packages/cmd/secrets.go index 8175edd76..7ba6e5411 100644 --- a/cli/packages/cmd/secrets.go +++ b/cli/packages/cmd/secrets.go @@ -87,9 +87,9 @@ var secretsCmd = &cobra.Command{ Recursive: recursive, } - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { request.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { request.UniversalAuthAccessToken = token.Token } @@ -107,9 +107,9 @@ var secretsCmd = &cobra.Command{ if shouldExpandSecrets { authParams := models.ExpandSecretsAuthentication{} - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { authParams.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { authParams.UniversalAuthAccessToken = token.Token } @@ -467,9 +467,9 @@ func getSecretsByNames(cmd *cobra.Command, args []string) { Recursive: recursive, } - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { request.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { request.UniversalAuthAccessToken = token.Token } @@ -480,9 +480,9 @@ func getSecretsByNames(cmd *cobra.Command, args []string) { if shouldExpand { authParams := models.ExpandSecretsAuthentication{} - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { authParams.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { authParams.UniversalAuthAccessToken = token.Token } @@ -554,9 +554,9 @@ func generateExampleEnv(cmd *cobra.Command, args []string) { IncludeImport: true, } - if token != nil && token.Type == "service-token" { + if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { request.InfisicalToken = token.Token - } else if token != nil && token.Type == "universal-auth-token" { + } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { request.UniversalAuthAccessToken = token.Token } diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index 120548c10..311a4b0d9 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -15,6 +15,9 @@ const ( KEYRING_SERVICE_NAME = "infisical" PERSONAL_SECRET_TYPE_NAME = "personal" SHARED_SECRET_TYPE_NAME = "shared" + + SERVICE_TOKEN_IDENTIFIER = "service-token" + UNIVERSAL_AUTH_TOKEN_IDENTIFIER = "universal-auth-token" ) var ( diff --git a/cli/packages/util/helper.go b/cli/packages/util/helper.go index 155990d42..e2f003619 100644 --- a/cli/packages/util/helper.go +++ b/cli/packages/util/helper.go @@ -90,13 +90,13 @@ func GetInfisicalToken(cmd *cobra.Command) (token *models.TokenDetails, err erro if strings.HasPrefix(infisicalToken, "st.") { return &models.TokenDetails{ - Type: "service-token", + Type: SERVICE_TOKEN_IDENTIFIER, Token: infisicalToken, }, nil } return &models.TokenDetails{ - Type: "universal-auth-token", + Type: UNIVERSAL_AUTH_TOKEN_IDENTIFIER, Token: infisicalToken, }, nil