awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 10:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Use constant identifiers

Browse Source
This commit is contained in:
Daniel Hougaard
2024-04-16 10:15:07 +02:00
parent a4a961996b
commit 3a6ec3717b
6 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/export.go
+4 -4
View File
@@ -87,9 +87,9 @@ var exportCmd = &cobra.Command{
IncludeImport: includeImports, IncludeImport: includeImports,
} }
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token 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 request.UniversalAuthAccessToken = token.Token
} }
@@ -109,9 +109,9 @@ var exportCmd = &cobra.Command{
authParams := models.ExpandSecretsAuthentication{} authParams := models.ExpandSecretsAuthentication{}
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
authParams.InfisicalToken = token.Token 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 authParams.UniversalAuthAccessToken = token.Token
} }
cli/packages/cmd/folder.go
+2 -2
View File
@@ -56,9 +56,9 @@ var getCmd = &cobra.Command{
FoldersPath: foldersPath, FoldersPath: foldersPath,
} }
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token 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 request.UniversalAuthAccessToken = token.Token
} }
cli/packages/cmd/run.go
+6 -6
View File
@@ -116,9 +116,9 @@ var runCmd = &cobra.Command{
Recursive: recursive, Recursive: recursive,
} }
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token 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 request.UniversalAuthAccessToken = token.Token
} }
@@ -138,9 +138,9 @@ var runCmd = &cobra.Command{
authParams := models.ExpandSecretsAuthentication{} authParams := models.ExpandSecretsAuthentication{}
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
authParams.InfisicalToken = token.Token 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 authParams.UniversalAuthAccessToken = token.Token
} }
@@ -179,8 +179,8 @@ var runCmd = &cobra.Command{
posthog.NewProperties(). posthog.NewProperties().
Set("secretsCount", len(secrets)). Set("secretsCount", len(secrets)).
Set("environment", environmentName). Set("environment", environmentName).
Set("isUsingServiceToken", token.Type == "service-token"). Set("isUsingServiceToken", token.Type == util.SERVICE_TOKEN_IDENTIFIER).
Set("isUsingUniversalAuthToken", token.Type == "universal-auth-token"). Set("isUsingUniversalAuthToken", token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER).
Set("single-command", strings.Join(args, " ")). Set("single-command", strings.Join(args, " ")).
Set("multi-command", cmd.Flag("command").Value.String()). Set("multi-command", cmd.Flag("command").Value.String()).
Set("version", util.CLI_VERSION)) Set("version", util.CLI_VERSION))
cli/packages/cmd/secrets.go
+10 -10
View File
@@ -87,9 +87,9 @@ var secretsCmd = &cobra.Command{
Recursive: recursive, Recursive: recursive,
} }
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token 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 request.UniversalAuthAccessToken = token.Token
} }
@@ -107,9 +107,9 @@ var secretsCmd = &cobra.Command{
if shouldExpandSecrets { if shouldExpandSecrets {
authParams := models.ExpandSecretsAuthentication{} authParams := models.ExpandSecretsAuthentication{}
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
authParams.InfisicalToken = token.Token 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 authParams.UniversalAuthAccessToken = token.Token
} }
@@ -467,9 +467,9 @@ func getSecretsByNames(cmd *cobra.Command, args []string) {
Recursive: recursive, Recursive: recursive,
} }
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token 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 request.UniversalAuthAccessToken = token.Token
} }
@@ -480,9 +480,9 @@ func getSecretsByNames(cmd *cobra.Command, args []string) {
if shouldExpand { if shouldExpand {
authParams := models.ExpandSecretsAuthentication{} authParams := models.ExpandSecretsAuthentication{}
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
authParams.InfisicalToken = token.Token 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 authParams.UniversalAuthAccessToken = token.Token
} }
@@ -554,9 +554,9 @@ func generateExampleEnv(cmd *cobra.Command, args []string) {
IncludeImport: true, IncludeImport: true,
} }
if token != nil && token.Type == "service-token" { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token 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 request.UniversalAuthAccessToken = token.Token
} }
cli/packages/util/constants.go
+3
View File
@@ -15,6 +15,9 @@ const (
KEYRING_SERVICE_NAME = "infisical" KEYRING_SERVICE_NAME = "infisical"
PERSONAL_SECRET_TYPE_NAME = "personal" PERSONAL_SECRET_TYPE_NAME = "personal"
SHARED_SECRET_TYPE_NAME = "shared" SHARED_SECRET_TYPE_NAME = "shared"
SERVICE_TOKEN_IDENTIFIER = "service-token"
UNIVERSAL_AUTH_TOKEN_IDENTIFIER = "universal-auth-token"
) )
var ( var (
cli/packages/util/helper.go
+2 -2
View File
@@ -90,13 +90,13 @@ func GetInfisicalToken(cmd *cobra.Command) (token *models.TokenDetails, err erro
if strings.HasPrefix(infisicalToken, "st.") { if strings.HasPrefix(infisicalToken, "st.") {
return &models.TokenDetails{ return &models.TokenDetails{
Type: "service-token", Type: SERVICE_TOKEN_IDENTIFIER,
Token: infisicalToken, Token: infisicalToken,
}, nil }, nil
} }
return &models.TokenDetails{ return &models.TokenDetails{
Type: "universal-auth-token", Type: UNIVERSAL_AUTH_TOKEN_IDENTIFIER,
Token: infisicalToken, Token: infisicalToken,
}, nil }, nil