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: 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

8
cli/packages/cmd/export.go
View File

@@ -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
}

4
cli/packages/cmd/folder.go
View File

@@ -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
}

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

@@ -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))

20
cli/packages/cmd/secrets.go
View File

@@ -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
}

3
cli/packages/util/constants.go
View File

@@ -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 (

4
cli/packages/util/helper.go
View File

@@ -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