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

Revert "adjustment: moved secret backup logic to cmd layer"

Browse Source 
This reverts commit 920b9a7dfa.
This commit is contained in:
Sheen Capadngan
2024-06-11 00:58:36 +08:00
parent a1b41ca454
commit 9db5be1c91
1 changed files with 21 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/secrets.go
+1 -38
View File
@@ -88,46 +88,13 @@ var secretsCmd = &cobra.Command{
Recursive: recursive, Recursive: recursive,
} }
var secrets []models.SingleEnvironmentVariable
var isUserSession bool
var infisicalDotJson models.WorkspaceConfigFile
var userBackupSecretsEncryptionKey []byte
if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER { if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
request.InfisicalToken = token.Token request.InfisicalToken = token.Token
} else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER { } else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER {
request.UniversalAuthAccessToken = token.Token request.UniversalAuthAccessToken = token.Token
} else {
// user session
isUserSession = true
loggedInUserDetails, err := util.GetCurrentLoggedInUserDetails()
if err != nil {
util.HandleError(err)
} }
isConnected := util.CheckIsConnectedToInfisicalAPI() secrets, err := util.GetAllEnvironmentVariables(request, "")
projectConfig, err := util.GetWorkSpaceFromFile()
if err != nil {
util.HandleError(err)
}
infisicalDotJson = projectConfig
userBackupSecretsEncryptionKey = []byte(loggedInUserDetails.UserCredentials.PrivateKey)[0:32]
if !isConnected {
secrets, err = util.ReadBackupSecrets(infisicalDotJson.WorkspaceId, environmentName, userBackupSecretsEncryptionKey)
if err != nil {
util.HandleError(err)
}
if len(secrets) > 0 {
util.PrintWarning("Unable to fetch latest secret(s) due to connection error, serving secrets from last successful fetch. For more info, run with --debug")
}
}
}
if len(secrets) == 0 {
secrets, err = util.GetAllEnvironmentVariables(request, "")
if err != nil { if err != nil {
util.HandleError(err) util.HandleError(err)
} }
@@ -152,10 +119,6 @@ var secretsCmd = &cobra.Command{
// Sort the secrets by key so we can create a consistent output // Sort the secrets by key so we can create a consistent output
secrets = util.SortSecretsByKeys(secrets) secrets = util.SortSecretsByKeys(secrets)
if isUserSession {
util.WriteBackupSecrets(infisicalDotJson.WorkspaceId, environmentName, userBackupSecretsEncryptionKey, secrets)
}
}
visualize.PrintAllSecretDetails(secrets) visualize.PrintAllSecretDetails(secrets)
Telemetry.CaptureEvent("cli-command:secrets", posthog.NewProperties().Set("secretCount", len(secrets)).Set("version", util.CLI_VERSION)) Telemetry.CaptureEvent("cli-command:secrets", posthog.NewProperties().Set("secretCount", len(secrets)).Set("version", util.CLI_VERSION))