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

misc: revert backup flow modification for run.go

Browse Source
This commit is contained in:
Sheen Capadngan
2024-06-11 00:49:57 +08:00
parent 120e482c6f
commit 6c252b4bfb
1 changed files with 21 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/run.go
+21 -57
View File
@@ -116,71 +116,35 @@ var runCmd = &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)
}
if projectConfigDir == "" {
projectConfig, err := util.GetWorkSpaceFromFile()
if err != nil {
util.HandleError(err)
}
infisicalDotJson = projectConfig
} else {
projectConfig, err := util.GetWorkSpaceFromFilePath(projectConfigDir)
if err != nil {
util.HandleError(err)
}
infisicalDotJson = projectConfig
}
userBackupSecretsEncryptionKey = []byte(loggedInUserDetails.UserCredentials.PrivateKey)[0:32]
secrets = util.GetBackupSecretsIfDisconnected(infisicalDotJson.WorkspaceId, environmentName, userBackupSecretsEncryptionKey)
} }
if len(secrets) == 0 { secrets, err := util.GetAllEnvironmentVariables(request, projectConfigDir)
secrets, err = util.GetAllEnvironmentVariables(request, projectConfigDir)
if err != nil { if err != nil {
util.HandleError(err, "Could not fetch secrets", "If you are using a service token to fetch secrets, please ensure it is valid") util.HandleError(err, "Could not fetch secrets", "If you are using a service token to fetch secrets, please ensure it is valid")
}
if secretOverriding {
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
} }
if secretOverriding { secrets = util.ExpandSecrets(secrets, authParams, projectConfigDir)
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, projectConfigDir)
}
if isUserSession {
util.WriteBackupSecrets(infisicalDotJson.WorkspaceId, environmentName, userBackupSecretsEncryptionKey, secrets)
}
} }
secretsByKey := getSecretsByKeys(secrets) secretsByKey := getSecretsByKeys(secrets)