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

revert: "refactor: clean smelly code"

Browse Source 
This reverts commit c04b97c689.
This commit is contained in:
Mahyar Mirrashed
2025-03-13 16:33:26 -07:00
parent a500f00a49
commit 81d5f639ae
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/run.go
+1
View File
@@ -185,6 +185,7 @@ var runCmd = &cobra.Command{
} }
} }
} }
}, },
} }
cli/packages/util/secrets.go
+17 -16
View File
@@ -101,7 +101,7 @@ func GetPlainTextSecretsV3(accessToken string, workspaceId string, environmentNa
return models.PlaintextSecretResult{}, err return models.PlaintextSecretResult{}, err
} }
var plainTextSecrets []models.SingleEnvironmentVariable 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})
@@ -291,7 +291,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
@@ -308,22 +308,23 @@ func GetAllEnvironmentVariables(params models.GetAllSecretsParameters, projectCo
} }
} }
} }
} else if params.InfisicalToken != "" {
log.Debug().Msg("Trying to fetch secrets using service token")
secretsToReturn, errorToReturn = GetPlainTextSecretsViaServiceToken(params.InfisicalToken, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences)
} else if params.UniversalAuthAccessToken != "" {
if params.WorkspaceId == "" {
PrintErrorMessageAndExit("Project ID is required when using machine identity")
}
log.Debug().Msg("Trying to fetch secrets using universal auth") } else {
res, err := GetPlainTextSecretsV3(params.UniversalAuthAccessToken, params.WorkspaceId, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences) if params.InfisicalToken != "" {
if err != nil { log.Debug().Msg("Trying to fetch secrets using service token")
return nil, err secretsToReturn, errorToReturn = GetPlainTextSecretsViaServiceToken(params.InfisicalToken, params.Environment, params.SecretsPath, params.IncludeImport, params.Recursive, params.TagSlugs, params.ExpandSecretReferences)
} } else if params.UniversalAuthAccessToken != "" {
errorToReturn = err if params.WorkspaceId == "" {
secretsToReturn = res.Secrets 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
}
} }
return secretsToReturn, errorToReturn return secretsToReturn, errorToReturn