awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-05 21:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: supabase failed integration due to res secret deletion

Browse Source
This commit is contained in:
Akhil Mohan
2023-08-09 14:41:42 +05:30
parent 37d52432d0
commit e993bd048e
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/integrations/sync.ts
+26 -21
View File
@@ -245,7 +245,7 @@ const syncSecrets = async ({
integrationAuth, integrationAuth,
integration, integration,
secrets, secrets,
accessToken, accessToken
}); });
break; break;
case INTEGRATION_BITBUCKET: case INTEGRATION_BITBUCKET:
@@ -1661,7 +1661,8 @@ const syncSecretsGitLab = async ({
const gitLabApiUrl = `${INTEGRATION_GITLAB_API_URL}/v4/projects/${integrationAppId}/variables`; const gitLabApiUrl = `${INTEGRATION_GITLAB_API_URL}/v4/projects/${integrationAppId}/variables`;
const headers = { const headers = {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept-Encoding": "application/json" "Accept-Encoding": "application/json",
"Content-Type": "application/json"
}; };
let allEnvVariables: GitLabSecret[] = []; let allEnvVariables: GitLabSecret[] = [];
@@ -1794,7 +1795,16 @@ const syncSecretsSupabase = async ({
const secretsToDelete: any = []; const secretsToDelete: any = [];
getSecretsRes?.forEach((secretObj: any) => { getSecretsRes?.forEach((secretObj: any) => {
if (!(secretObj.name in secrets)) { if (
!(secretObj.name in secrets) &&
// supbase reserved secret ref: https://supabase.com/docs/guides/functions/secrets#default-secrets
![
"SUPABASE_ANON_KEY",
"SUPABASE_SERVICE_ROLE_KEY",
"SUPABASE_DB_URL",
"SUPABASE_URL"
].includes(secretObj.name)
) {
secretsToDelete.push(secretObj.name); secretsToDelete.push(secretObj.name);
} }
}); });
@@ -2019,7 +2029,7 @@ const syncSecretsTeamCity = async ({
integrationAuth, integrationAuth,
integration, integration,
secrets, secrets,
accessToken, accessToken
}: { }: {
integrationAuth: IIntegrationAuth; integrationAuth: IIntegrationAuth;
integration: IIntegration; integration: IIntegration;
@@ -2034,26 +2044,21 @@ const syncSecretsTeamCity = async ({
// get secrets from Teamcity // get secrets from Teamcity
const res = ( const res = (
await standardRequest.get( await standardRequest.get(
`${integrationAuth.url}/app/rest/projects/id:${integration.appId}/parameters`, `${integrationAuth.url}/app/rest/projects/id:${integration.appId}/parameters`,
{ {
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
Accept: "application/json", Accept: "application/json"
}, }
}) }
) )
.data ).data.property.reduce((obj: any, secret: TeamCitySecret) => {
.property const secretName = secret.name.replace(/^env\./, "");
.reduce( return {
(obj: any, secret: TeamCitySecret) => { ...obj,
const secretName = secret.name.replace(/^env\./, ""); [secretName]: secret.value
return ({ };
...obj, }, {});
[secretName]: secret.value
})
},
{}
);
for await (const key of Object.keys(secrets)) { for await (const key of Object.keys(secrets)) {
if (!(key in res) || (key in res && secrets[key] !== res[key])) { if (!(key in res) || (key in res && secrets[key] !== res[key])) {