Skip to content

fix(util): map ID and comment fields in secret transformation #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YewFence wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(util): map ID and comment fields in secret transformation #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions packages/util/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,17 @@ func GetPlainTextSecretsViaServiceToken(fullServiceToken string, environment str
plainTextSecrets := []models.SingleEnvironmentVariable{}

for _, secret := range rawSecrets.Secrets {
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{Key: secret.SecretKey, Value: secret.SecretValue, Type: secret.Type, WorkspaceId: secret.Workspace, SkipMultilineEncoding: secret.SkipMultilineEncoding, Tags: secret.Tags})
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{
Key: secret.SecretKey,
WorkspaceId: secret.Workspace,
Value: secret.SecretValue,
Type: secret.Type,
ID: secret.ID,
Comment: secret.SecretComment,
SecretPath: secret.SecretPath,
SkipMultilineEncoding: secret.SkipMultilineEncoding,
Tags: secret.Tags,
})
}

if includeImports {
Expand Down Expand Up @@ -110,7 +120,17 @@ func GetPlainTextSecretsV3(accessToken string, workspaceId string, environmentNa
plainTextSecrets := []models.SingleEnvironmentVariable{}

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, SkipMultilineEncoding: secret.SkipMultilineEncoding, Tags: secret.Tags})
plainTextSecrets = append(plainTextSecrets, models.SingleEnvironmentVariable{
Key: secret.SecretKey,
WorkspaceId: secret.Workspace,
Value: secret.SecretValue,
Type: secret.Type,
ID: secret.ID,
Comment: secret.SecretComment,
SecretPath: secret.SecretPath,
SkipMultilineEncoding: secret.SkipMultilineEncoding,
Tags: secret.Tags,
})
}

if includeImports {
Expand Down Expand Up @@ -239,6 +259,8 @@ func InjectRawImportedSecret(secrets []models.SingleEnvironmentVariable, importe
Value: sec.SecretValue,
Type: sec.Type,
ID: sec.ID,
Comment: sec.SecretComment,
SecretPath: importSec.SecretPath,
})
hasOverriden[sec.SecretKey] = true
}
Expand Down