Skip to content
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

Jump to bottom

misc: made aws sm mapping one to one plaintext #1869

Merged
merged 1 commit into from
May 23, 2024
Merged

misc: made aws sm mapping one to one plaintext #1869

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
24 changes: 14 additions & 10 deletions backend/src/services/integration-auth/integration-sync-secret.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,25 +587,31 @@ const syncSecretsAWSSecretManager = async ({
}
});

const processAwsSecret = async (secretId: string, keyValuePairs: Record<string, string | null | undefined>) => {
const processAwsSecret = async (
secretId: string,
secretValue: Record<string, string | null | undefined> | string
) => {
try {
const awsSecretManagerSecret = await secretsManager.send(
new GetSecretValueCommand({
SecretId: secretId
})
);

let awsSecretManagerSecretObj: { [key: string]: AWS.SecretsManager } = {};

let secretToCompare;
if (awsSecretManagerSecret?.SecretString) {
awsSecretManagerSecretObj = JSON.parse(awsSecretManagerSecret.SecretString);
if (typeof secretValue === "string") {
secretToCompare = awsSecretManagerSecret.SecretString;
} else {
secretToCompare = JSON.parse(awsSecretManagerSecret.SecretString);
}
}

if (!isEqual(awsSecretManagerSecretObj, keyValuePairs)) {
if (!isEqual(secretToCompare, secretValue)) {
await secretsManager.send(
new UpdateSecretCommand({
SecretId: secretId,
SecretString: JSON.stringify(keyValuePairs)
SecretString: typeof secretValue === "string" ? secretValue : JSON.stringify(secretValue)
})
);
}
Expand Down Expand Up @@ -695,7 +701,7 @@ const syncSecretsAWSSecretManager = async ({
await secretsManager.send(
new CreateSecretCommand({
Name: secretId,
SecretString: JSON.stringify(keyValuePairs),
SecretString: typeof secretValue === "string" ? secretValue : JSON.stringify(secretValue),
...(metadata.kmsKeyId && { KmsKeyId: metadata.kmsKeyId }),
Tags: metadata.secretAWSTag
? metadata.secretAWSTag.map((tag: { key: string; value: string }) => ({ Key: tag.key, Value: tag.value }))
Expand All @@ -708,9 +714,7 @@ const syncSecretsAWSSecretManager = async ({

if (metadata.mappingBehavior === IntegrationMappingBehavior.ONE_TO_ONE) {
for await (const [key, value] of Object.entries(secrets)) {
await processAwsSecret(key, {
[key]: value.value
});
await processAwsSecret(key, value.value);
}
} else {
await processAwsSecret(integration.app as string, getSecretKeyValuePair(secrets));
Expand Down
Loading