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

fix: correct gitlab check order for conflict

Browse Source
This commit is contained in:
Scott Wilson
2025-10-06 19:37:00 -07:00
parent 0292788c2c
commit eb1ae216a6
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/services/secret-sync/secret-sync-maps.ts
View File

@@ -171,6 +171,14 @@ export const DESTINATION_DUPLICATE_CHECK_MAP: Record<SecretSync, DestinationDupl
const newTargetEnv = newConfig.targetEnvironment as string | undefined; const newTargetEnv = newConfig.targetEnvironment as string | undefined;
const wildcardValues = ["*", ""]; const wildcardValues = ["*", ""];
if (
(newConfig.scope as string) === "group"
? existingConfig.groupId !== newConfig.groupId
: existingConfig.projectId !== newConfig.projectId
)
return false;
// If either has wildcard, it conflicts with any targetEnvironment // If either has wildcard, it conflicts with any targetEnvironment
if ( if (
!existingTargetEnv || !existingTargetEnv ||
@@ -181,12 +189,7 @@ export const DESTINATION_DUPLICATE_CHECK_MAP: Record<SecretSync, DestinationDupl
return true; return true;
} }
return ( return existingTargetEnv === newTargetEnv;
existingTargetEnv === newTargetEnv &&
((newConfig.scope as string) === "group"
? existingConfig.groupId === newConfig.groupId
: existingConfig.projectId === newConfig.projectId)
);
}, },
[SecretSync.CloudflarePages]: defaultDuplicateCheck, [SecretSync.CloudflarePages]: defaultDuplicateCheck,
[SecretSync.CloudflareWorkers]: defaultDuplicateCheck, [SecretSync.CloudflareWorkers]: defaultDuplicateCheck,