Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
Address claude comment
Carlos Monastyrskif10fdae5fec9
diff --git a/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.test.ts b/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.test.tsindex b0a516f3a2..370c542cdf 100644--- a/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.test.ts+++ b/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.test.ts@@ -102,4 +102,23 @@ describe("AWS Secrets Manager PKI sync destination ownership", () => {expect(events).toEqual([`claim:${SECRET_NAME}`, `UpdateSecretCommand:${SECRET_NAME}`]);});++ test("removes the pre-renewal secret when preserve on renewal is off", async () => {+ const renewedCertId = "660e8400-e29b-41d4-a716-446655440000";+ const renewedSecretName = "infisical-660e8400e29b41d4a716446655440000";+ existingSecretNames.push(SECRET_NAME);++ await makeFactory([], {+ certificate: { id: renewedCertId, renewedFromCertificateId: CERT_ID },+ syncRecords: [{ certificateId: renewedCertId, externalIdentifier: SECRET_NAME }]+ }).syncCertificates({ ...pkiSync, syncOptions: { ...pkiSync.syncOptions, preserveSecretOnRenewal: false } }, {+ [renewedSecretName]: { cert: "CERT", privateKey: "KEY", certificateId: renewedCertId }+ } as never);++ expect(events).toEqual([+ `claim:${renewedSecretName}`,+ `CreateSecretCommand:${renewedSecretName}`,+ `DeleteSecretCommand:${SECRET_NAME}`+ ]);+ });});diff --git a/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.ts b/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.tsindex 5c3c3c6547..7d0a827464 100644--- a/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.ts+++ b/backend/src/services/pki-sync/aws-secrets-manager/aws-secrets-manager-pki-sync-fns.ts@@ -281,8 +281,8 @@ export const awsSecretsManagerPkiSyncFactory = ({}const existingRecord =- (certificate?.renewedFromCertificateId && syncRecordsByCertId.get(certificate.renewedFromCertificateId)) ||- syncRecordsByCertId.get(certificateId);+ syncRecordsByCertId.get(certificate?.renewedFromCertificateId || certificateId) ??+ (preserveSecretOnRenewal ? syncRecordsByCertId.get(certificateId) : undefined);let shouldProcess = true;let isUpdate = false;diff --git a/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts b/backend/src/services/pki-sync/chef/chef-pki-sync-fns.tsindex a3959c5834..aecc82c7ae 100644--- a/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts+++ b/backend/src/services/pki-sync/chef/chef-pki-sync-fns.ts@@ -233,8 +233,8 @@ export const chefPkiSyncFactory = ({}const existingSyncRecord =- (certificate?.renewedFromCertificateId && syncRecordsByCertId.get(certificate.renewedFromCertificateId)) ||- syncRecordsByCertId.get(certificateId);+ syncRecordsByCertId.get(certificate?.renewedFromCertificateId || certificateId) ??+ (preserveItemOnRenewal ? syncRecordsByCertId.get(certificateId) : undefined);let shouldProcess = true;let isUpdate = false;diff --git a/backend/src/services/pki-sync/gcp-certificate-manager/gcp-certificate-manager-pki-sync-fns.ts b/backend/src/services/pki-sync/gcp-certificate-manager/gcp-certificate-manager-pki-sync-fns.tsindex 7a8686cf8e..d047ff1ba4 100644--- a/backend/src/services/pki-sync/gcp-certificate-manager/gcp-certificate-manager-pki-sync-fns.ts+++ b/backend/src/services/pki-sync/gcp-certificate-manager/gcp-certificate-manager-pki-sync-fns.ts@@ -405,9 +405,10 @@ export const gcpCertificateManagerPkiSyncFactory = ({return { skipReason: error instanceof Error ? error.message : "Unsupported key algorithm" };}+ const syncRecordLookupId = renewedFromCertificateId || certificateId;const existingSyncRecord =- (renewedFromCertificateId && syncRecordsByCertId.get(renewedFromCertificateId)) ||- (typeof certificateId === "string" ? syncRecordsByCertId.get(certificateId) : undefined);+ (typeof syncRecordLookupId === "string" ? syncRecordsByCertId.get(syncRecordLookupId) : undefined) ??+ (preserveItemOnRenewal && typeof certificateId === "string" ? syncRecordsByCertId.get(certificateId) : undefined);const reusableResourceName =preserveItemOnRenewal &&existingSyncRecord?.externalIdentifier &&diff --git a/backend/src/services/pki-sync/kemp-loadmaster/kemp-loadmaster-pki-sync-fns.ts b/backend/src/services/pki-sync/kemp-loadmaster/kemp-loadmaster-pki-sync-fns.tsindex 8520555498..81b55ff604 100644--- a/backend/src/services/pki-sync/kemp-loadmaster/kemp-loadmaster-pki-sync-fns.ts+++ b/backend/src/services/pki-sync/kemp-loadmaster/kemp-loadmaster-pki-sync-fns.ts@@ -398,8 +398,8 @@ export const kempLoadMasterPkiSyncFactory = ({if (typeof certificateId === "string") {const existingSyncRecord =- (certificate?.renewedFromCertificateId && syncRecordsByCertId.get(certificate.renewedFromCertificateId)) ||- syncRecordsByCertId.get(certificateId);+ syncRecordsByCertId.get(certificate?.renewedFromCertificateId || certificateId) ??+ (preserveItemOnRenewal ? syncRecordsByCertId.get(certificateId) : undefined);if (certificate?.renewedFromCertificateId && preserveItemOnRenewal && existingSyncRecord?.externalIdentifier) {targetIdentifier = existingSyncRecord.externalIdentifier;diff --git a/backend/src/services/pki-sync/netscaler/netscaler-pki-sync-fns.ts b/backend/src/services/pki-sync/netscaler/netscaler-pki-sync-fns.tsindex 6fcc9cb0d3..899441ffa5 100644--- a/backend/src/services/pki-sync/netscaler/netscaler-pki-sync-fns.ts+++ b/backend/src/services/pki-sync/netscaler/netscaler-pki-sync-fns.ts@@ -423,9 +423,8 @@ export const netScalerPkiSyncFactory = ({if (typeof certificateId === "string") {const existingSyncRecord =- (certificate?.renewedFromCertificateId &&- syncRecordsByCertId.get(certificate.renewedFromCertificateId)) ||- syncRecordsByCertId.get(certificateId);+ syncRecordsByCertId.get(certificate?.renewedFromCertificateId || certificateId) ??+ (preserveItemOnRenewal ? syncRecordsByCertId.get(certificateId) : undefined);if (certificate?.renewedFromCertificateId &&