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

refactor: clean smelly code

Browse Source
This commit is contained in:
Mahyar Mirrashed
2025-03-13 11:43:00 -07:00
parent 7600a86dfc
commit c04b97c689
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/run.go
-1
View File
@@ -172,7 +172,6 @@ var runCmd = &cobra.Command{
} }
} }
} }
}, },
} }
cli/packages/util/secrets.go
+17 -18
View File
@@ -101,7 +101,7 @@ func GetPlainTextSecretsV3(accessToken string, workspaceId string, environmentNa
return models.PlaintextSecretResult{}, err return models.PlaintextSecretResult{}, err
} }
plainTextSecrets := []models.SingleEnvironmentVariable{} var plainTextSecrets []models.SingleEnvironmentVariable
for _, secret := range rawSecrets.Secrets { for _, secret := range rawSecrets.Secrets {
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SecretPath: secret.SecretPath}) plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SecretPath: secret.SecretPath})
@@ -292,7 +292,7 @@ func GetAllEnvironmentVariables(params models.GetAllSecretsParameters, projectCo
if err != nil { if err != nil {
return nil, err return nil, err
} }
WriteBackupSecrets(infisicalDotJson.WorkspaceId, params.Environment, params.SecretsPath, backupEncryptionKey, res.Secrets) _ = WriteBackupSecrets(infisicalDotJson.WorkspaceId, params.Environment, params.SecretsPath, backupEncryptionKey, res.Secrets)
} }
secretsToReturn = res.Secrets secretsToReturn = res.Secrets
@@ -309,23 +309,22 @@ func GetAllEnvironmentVariables(params models.GetAllSecretsParameters, projectCo
} }
} }
} }
} else if params.InfisicalToken != "" {
} else { log.Debug().Msg("Trying to fetch secrets using service token")
if params.InfisicalToken != "" { secretsToReturn, errorToReturn = GetPlainTextSecretsViaServiceToken(params.InfisicalToken, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences)
log.Debug().Msg("Trying to fetch secrets using service token") } else if params.UniversalAuthAccessToken != "" {
secretsToReturn, errorToReturn = GetPlainTextSecretsViaServiceToken(params.InfisicalToken, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences) if params.WorkspaceId == "" {
} else if params.UniversalAuthAccessToken != "" { PrintErrorMessageAndExit("Project ID is required when using machine identity")
if params.WorkspaceId == "" {
PrintErrorMessageAndExit("Project ID is required when using machine identity")
}
log.Debug().Msg("Trying to fetch secrets using universal auth")
res, err := GetPlainTextSecretsV3(params.UniversalAuthAccessToken, params.WorkspaceId, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences)
errorToReturn = err
secretsToReturn = res.Secrets
} }
log.Debug().Msg("Trying to fetch secrets using universal auth")
res, err := GetPlainTextSecretsV3(params.UniversalAuthAccessToken, params.WorkspaceId, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences)
if err != nil {
return nil, err
}
errorToReturn = err
secretsToReturn = res.Secrets
} }
return secretsToReturn, errorToReturn return secretsToReturn, errorToReturn