awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-14 22:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(integrations/circle-ci): Refactored Circle CI integration

Browse Source 
The integration seemingly never worked in the first place due to inpropper project slugs. This PR resolves it.
This commit is contained in:
Daniel Hougaard
2024-09-05 13:30:20 +04:00
parent 302e068c74
commit b7d683ee1b
5 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/integration-auth/integration-app-list.ts
+13 -8
View File
@@ -459,17 +459,22 @@ const getAppsFlyio = async ({ accessToken }: { accessToken: string }) => {
* Return list of projects for CircleCI integration
*/
const getAppsCircleCI = async ({ accessToken }: { accessToken: string }) => {
const res = (
await request.get<{ reponame: string }[]>(`${IntegrationUrls.CIRCLECI_API_URL}/v1.1/projects`, {
headers: {
"Circle-Token": accessToken,
"Accept-Encoding": "application/json"
// Fetch collaborations (v2 API)
const collaborations = (
await request.get<{ id: string; name: string; slug: string }[]>(
`${IntegrationUrls.CIRCLECI_API_URL}/v2/me/collaborations`,
{
headers: {
"Circle-Token": accessToken,
"Accept-Encoding": "application/json"
}
}
})
)
).data;
const apps = res?.map((a) => ({
name: a?.reponame
const apps = collaborations.map((a) => ({
name: a.name,
appId: a.id
}));
return apps;
backend/src/services/integration-auth/integration-auth-types.ts
+6
View File
@@ -143,6 +143,12 @@ export type TBitbucketWorkspace = {
updated_on: string;
};
export enum CircleCiVcsType {
GitHub = "GitHub",
CircleCI = "CircleCI",
BitBucket = "BitBucket"
}
export type TNorthflankSecretGroup = {
id: string;
name: string;
backend/src/services/integration-auth/integration-sync-secret.ts
+38 -14
View File
@@ -35,7 +35,7 @@ import { TCreateManySecretsRawFn, TUpdateManySecretsRawFn } from "@app/services/
import { TIntegrationDALFactory } from "../integration/integration-dal";
import { IntegrationMetadataSchema } from "../integration/integration-schema";
import { TIntegrationsWithEnvironment } from "./integration-auth-types";
import { CircleCiVcsType, TIntegrationsWithEnvironment } from "./integration-auth-types";
import {
IntegrationInitialSyncBehavior,
IntegrationMappingBehavior,
@@ -1930,21 +1930,48 @@ const syncSecretsCircleCI = async ({
accessToken: string;
}) => {
const circleciOrganizationDetail = (
await request.get(`${IntegrationUrls.CIRCLECI_API_URL}/v2/me/collaborations`, {
await request.get<{ slug: string; name: string }[]>(`${IntegrationUrls.CIRCLECI_API_URL}/v2/me/collaborations`, {
headers: {
"Circle-Token": accessToken,
"Accept-Encoding": "application/json"
}
})
).data[0];
).data;
const { slug } = circleciOrganizationDetail;
let orgSlug: string | null = null;
if (!integration.owner) {
orgSlug = `${circleciOrganizationDetail[0].slug}/${integration.app}`;
} else {
const projectDetails = (
await request.get<{ vcs_info: { provider: CircleCiVcsType } }>(
`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${integration.app}`,
{
headers: {
"Circle-Token": accessToken,
"Accept-Encoding": "application/json"
}
}
)
).data;
const vcsProviderMap: Record<CircleCiVcsType, string> = {
[CircleCiVcsType.GitHub]: "gh",
[CircleCiVcsType.BitBucket]: "bb",
[CircleCiVcsType.CircleCI]: "circleci"
};
orgSlug = `${vcsProviderMap[projectDetails.vcs_info.provider]}/${integration.owner}/${integration.app}`;
if (!orgSlug) {
throw new Error("CircleCI: Organization not found");
}
}
// sync secrets to CircleCI
await Promise.all(
Object.keys(secrets).map(async (key) =>
request.post(
`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${slug}/${integration.app}/envvar`,
`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${orgSlug}/envvar`,
{
name: key,
value: secrets[key].value
@@ -1962,7 +1989,7 @@ const syncSecretsCircleCI = async ({
// get secrets from CircleCI
const getSecretsRes = (
await request.get<{ items: { name: string }[] }>(
`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${slug}/${integration.app}/envvar`,
`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${orgSlug}/envvar`,
{
headers: {
"Circle-Token": accessToken,
@@ -1976,15 +2003,12 @@ const syncSecretsCircleCI = async ({
await Promise.all(
getSecretsRes.map(async (sec) => {
if (!(sec.name in secrets)) {
return request.delete(
`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${slug}/${integration.app}/envvar/${sec.name}`,
{
headers: {
"Circle-Token": accessToken,
"Content-Type": "application/json"
}
return request.delete(`${IntegrationUrls.CIRCLECI_API_URL}/v2/project/${orgSlug}/envvar/${sec.name}`, {
headers: {
"Circle-Token": accessToken,
"Content-Type": "application/json"
}
);
});
}
})
);