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

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

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

@@ -88,75 +88,38 @@ 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
}
secrets, err := util.GetAllEnvironmentVariables(request, "")
if err != nil {
util.HandleError(err)
}
if secretOverriding {
secrets = util.OverrideSecrets(secrets, util.SECRET_TYPE_PERSONAL)
} else { } else {
// user session secrets = util.OverrideSecrets(secrets, util.SECRET_TYPE_SHARED)
isUserSession = true
loggedInUserDetails, err := util.GetCurrentLoggedInUserDetails()
if err != nil {
util.HandleError(err)
}
isConnected := util.CheckIsConnectedToInfisicalAPI()
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 { if shouldExpandSecrets {
secrets, err = util.GetAllEnvironmentVariables(request, "")
if err != nil { authParams := models.ExpandSecretsAuthentication{}
util.HandleError(err) if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
authParams.InfisicalToken = token.Token
} else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER {
authParams.UniversalAuthAccessToken = token.Token
} }
if secretOverriding { secrets = util.ExpandSecrets(secrets, authParams, "")
secrets = util.OverrideSecrets(secrets, util.SECRET_TYPE_PERSONAL)
} else {
secrets = util.OverrideSecrets(secrets, util.SECRET_TYPE_SHARED)
}
if shouldExpandSecrets {
authParams := models.ExpandSecretsAuthentication{}
if token != nil && token.Type == util.SERVICE_TOKEN_IDENTIFIER {
authParams.InfisicalToken = token.Token
} else if token != nil && token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER {
authParams.UniversalAuthAccessToken = token.Token
}
secrets = util.ExpandSecrets(secrets, authParams, "")
}
// Sort the secrets by key so we can create a consistent output
secrets = util.SortSecretsByKeys(secrets)
if isUserSession {
util.WriteBackupSecrets(infisicalDotJson.WorkspaceId, environmentName, userBackupSecretsEncryptionKey, secrets)
}
} }
// Sort the secrets by key so we can create a consistent output
secrets = util.SortSecretsByKeys(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))
}, },