awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 15:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into feat/windmill-integration

Browse Source
This commit is contained in:
Sunil Kumar
2023-07-20 19:20:38 +05:30
parent b3baaac5c8 df25657715
commit ce08512ab5
17 changed files with 563 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/integrations/apps.ts
+64 -25
View File
@@ -32,6 +32,8 @@ import {
INTEGRATION_TRAVISCI_API_URL, INTEGRATION_TRAVISCI_API_URL,
INTEGRATION_VERCEL, INTEGRATION_VERCEL,
INTEGRATION_VERCEL_API_URL, INTEGRATION_VERCEL_API_URL,
INTEGRATION_CODEFRESH,
INTEGRATION_CODEFRESH_API_URL,
INTEGRATION_WINDMILL, INTEGRATION_WINDMILL,
INTEGRATION_WINDMILL_API_URL, INTEGRATION_WINDMILL_API_URL,
} from "../variables"; } from "../variables";
@@ -147,6 +149,11 @@ const getApps = async ({
accountId: accessId accountId: accessId
}) })
break; break;
case INTEGRATION_CODEFRESH:
apps = await getAppsCodefresh({
accessToken,
});
break;
case INTEGRATION_WINDMILL: case INTEGRATION_WINDMILL:
apps = await getAppsWindmill({ apps = await getAppsWindmill({
accessToken, accessToken,
@@ -203,10 +210,10 @@ const getAppsVercel = async ({
}, },
...(integrationAuth?.teamId ...(integrationAuth?.teamId
? { ? {
params: { params: {
teamId: integrationAuth.teamId, teamId: integrationAuth.teamId,
}, },
} }
: {}), : {}),
}) })
).data; ).data;
@@ -702,32 +709,64 @@ const getAppsCheckly = async ({ accessToken }: { accessToken: string }) => {
* @returns {Object[]} apps - Cloudflare Pages projects * @returns {Object[]} apps - Cloudflare Pages projects
* @returns {String} apps.name - name of Cloudflare Pages project * @returns {String} apps.name - name of Cloudflare Pages project
*/ */
const getAppsCloudflarePages = async ({ const getAppsCloudflarePages = async ({
accessToken, accessToken,
accountId accountId
}: { }: {
accessToken: string; accessToken: string;
accountId?: string; accountId?: string;
}) => { }) => {
const { data } = await standardRequest.get( const { data } = await standardRequest.get(
`${INTEGRATION_CLOUDFLARE_PAGES_API_URL}/client/v4/accounts/${accountId}/pages/projects`, `${INTEGRATION_CLOUDFLARE_PAGES_API_URL}/client/v4/accounts/${accountId}/pages/projects`,
{ {
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept": "application/json", "Accept": "application/json",
}, },
} }
); );
const apps = data.result.map((a: any) => { const apps = data.result.map((a: any) => {
return { return {
name: a.name, name: a.name,
appId: a.id, appId: a.id,
}; };
}); });
return apps; return apps;
} }
/**
* Return list of projects for Supabase integration
* @param {Object} obj
* @param {String} obj.accessToken - access token for Supabase API
* @returns {Object[]} apps - names of Supabase apps
* @returns {String} apps.name - name of Supabase app
*/
const getAppsCodefresh = async ({
accessToken,
}: {
accessToken: string;
}) => {
const res = (
await standardRequest.get(`${INTEGRATION_CODEFRESH_API_URL}/projects`, {
headers: {
Authorization: `Bearer ${accessToken}`,
"Accept-Encoding": "application/json",
},
})
).data;
const apps = res.projects.map((a: any) => ({
name: a.projectName,
appId: a.id,
}));
return apps;
};
/** /**
* Return list of projects for Windmill integration * Return list of projects for Windmill integration
* @param {Object} obj * @param {Object} obj
backend/src/integrations/sync.ts
+231 -161
View File
@@ -1,7 +1,7 @@
import _ from "lodash"; import _ from "lodash";
import AWS from "aws-sdk"; import AWS from "aws-sdk";
import { import {
CreateSecretCommand, CreateSecretCommand,
GetSecretValueCommand, GetSecretValueCommand,
ResourceNotFoundException, ResourceNotFoundException,
SecretsManagerClient, SecretsManagerClient,
@@ -42,10 +42,12 @@ import {
INTEGRATION_TRAVISCI_API_URL, INTEGRATION_TRAVISCI_API_URL,
INTEGRATION_VERCEL, INTEGRATION_VERCEL,
INTEGRATION_VERCEL_API_URL, INTEGRATION_VERCEL_API_URL,
INTEGRATION_CODEFRESH,
INTEGRATION_CODEFRESH_API_URL,
INTEGRATION_WINDMILL, INTEGRATION_WINDMILL,
INTEGRATION_WINDMILL_API_URL, INTEGRATION_WINDMILL_API_URL,
} from "../variables"; } from "../variables";
import { standardRequest} from "../config/request"; import { standardRequest } from "../config/request";
/** /**
* Sync/push [secrets] to [app] in integration named [integration] * Sync/push [secrets] to [app] in integration named [integration]
@@ -178,11 +180,39 @@ const syncSecrets = async ({
break; break;
case INTEGRATION_SUPABASE: case INTEGRATION_SUPABASE:
await syncSecretsSupabase({ await syncSecretsSupabase({
integration, integration,
secrets, secrets,
accessToken, accessToken,
}); });
break; break;
case INTEGRATION_FLYIO:
await syncSecretsFlyio({
integration,
secrets,
accessToken,
});
break;
case INTEGRATION_CIRCLECI:
await syncSecretsCircleCI({
integration,
secrets,
accessToken,
});
break;
case INTEGRATION_TRAVISCI:
await syncSecretsTravisCI({
integration,
secrets,
accessToken,
});
break;
case INTEGRATION_SUPABASE:
await syncSecretsSupabase({
integration,
secrets,
accessToken,
});
break;
case INTEGRATION_CHECKLY: case INTEGRATION_CHECKLY:
await syncSecretsCheckly({ await syncSecretsCheckly({
integration, integration,
@@ -201,10 +231,17 @@ const syncSecrets = async ({
break; break;
case INTEGRATION_CLOUDFLARE_PAGES: case INTEGRATION_CLOUDFLARE_PAGES:
await syncSecretsCloudflarePages({ await syncSecretsCloudflarePages({
integration, integration,
secrets, secrets,
accessId, accessId,
accessToken accessToken
});
break;
case INTEGRATION_CODEFRESH:
await syncSecretsCodefresh({
integration,
secrets,
accessToken,
}); });
break; break;
case INTEGRATION_WINDMILL: case INTEGRATION_WINDMILL:
@@ -244,11 +281,11 @@ const syncSecretsAzureKeyVault = async ({
recoverableDays: number; recoverableDays: number;
} }
} }
interface AzureKeyVaultSecret extends GetAzureKeyVaultSecret { interface AzureKeyVaultSecret extends GetAzureKeyVaultSecret {
key: string; key: string;
} }
/** /**
* Return all secrets from Azure Key Vault by paginating through URL [url] * Return all secrets from Azure Key Vault by paginating through URL [url]
* @param {String} url - pagination URL to get next set of secrets from Azure Key Vault * @param {String} url - pagination URL to get next set of secrets from Azure Key Vault
@@ -262,23 +299,23 @@ const syncSecretsAzureKeyVault = async ({
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
}, },
}); });
result = result.concat(res.data.value); result = result.concat(res.data.value);
url = res.data.nextLink; url = res.data.nextLink;
} }
return result; return result;
} }
const getAzureKeyVaultSecrets = await paginateAzureKeyVaultSecrets(`${integration.app}/secrets?api-version=7.3`); const getAzureKeyVaultSecrets = await paginateAzureKeyVaultSecrets(`${integration.app}/secrets?api-version=7.3`);
let lastSlashIndex: number; let lastSlashIndex: number;
const res = (await Promise.all(getAzureKeyVaultSecrets.map(async (getAzureKeyVaultSecret) => { const res = (await Promise.all(getAzureKeyVaultSecrets.map(async (getAzureKeyVaultSecret) => {
if (!lastSlashIndex) { if (!lastSlashIndex) {
lastSlashIndex = getAzureKeyVaultSecret.id.lastIndexOf("/"); lastSlashIndex = getAzureKeyVaultSecret.id.lastIndexOf("/");
} }
const azureKeyVaultSecret = await standardRequest.get(`${getAzureKeyVaultSecret.id}?api-version=7.3`, { const azureKeyVaultSecret = await standardRequest.get(`${getAzureKeyVaultSecret.id}?api-version=7.3`, {
headers: { headers: {
"Authorization": `Bearer ${accessToken}`, "Authorization": `Bearer ${accessToken}`,
@@ -290,11 +327,11 @@ const syncSecretsAzureKeyVault = async ({
key: getAzureKeyVaultSecret.id.substring(lastSlashIndex + 1), key: getAzureKeyVaultSecret.id.substring(lastSlashIndex + 1),
}); });
}))) })))
.reduce((obj: any, secret: any) => ({ .reduce((obj: any, secret: any) => ({
...obj, ...obj,
[secret.key]: secret, [secret.key]: secret,
}), {}); }), {});
const setSecrets: { const setSecrets: {
key: string; key: string;
value: string; value: string;
@@ -318,9 +355,9 @@ const syncSecretsAzureKeyVault = async ({
} }
} }
}); });
const deleteSecrets: AzureKeyVaultSecret[] = []; const deleteSecrets: AzureKeyVaultSecret[] = [];
Object.keys(res).forEach((key) => { Object.keys(res).forEach((key) => {
const underscoredKey = key.replace(/-/g, "_"); const underscoredKey = key.replace(/-/g, "_");
if (!(underscoredKey in secrets)) { if (!(underscoredKey in secrets)) {
@@ -341,7 +378,7 @@ const syncSecretsAzureKeyVault = async ({
}) => { }) => {
let isSecretSet = false; let isSecretSet = false;
let maxTries = 6; let maxTries = 6;
while (!isSecretSet && maxTries > 0) { while (!isSecretSet && maxTries > 0) {
// try to set secret // try to set secret
try { try {
@@ -358,7 +395,7 @@ const syncSecretsAzureKeyVault = async ({
); );
isSecretSet = true; isSecretSet = true;
} catch (err) { } catch (err) {
const error: any = err; const error: any = err;
if (error?.response?.data?.error?.innererror?.code === "ObjectIsDeletedButRecoverable") { if (error?.response?.data?.error?.innererror?.code === "ObjectIsDeletedButRecoverable") {
@@ -378,7 +415,7 @@ const syncSecretsAzureKeyVault = async ({
} }
} }
} }
// Sync/push set secrets // Sync/push set secrets
for await (const setSecret of setSecrets) { for await (const setSecret of setSecrets) {
const { key, value } = setSecret; const { key, value } = setSecret;
@@ -389,7 +426,7 @@ const syncSecretsAzureKeyVault = async ({
accessToken, accessToken,
}); });
} }
for await (const deleteSecret of deleteSecrets) { for await (const deleteSecret of deleteSecrets) {
const { key } = deleteSecret; const { key } = deleteSecret;
await standardRequest.delete(`${integration.app}/secrets/${key}?api-version=7.3`, { await standardRequest.delete(`${integration.app}/secrets/${key}?api-version=7.3`, {
@@ -431,7 +468,7 @@ const syncSecretsAWSParameterStore = async ({
apiVersion: "2014-11-06", apiVersion: "2014-11-06",
region: integration.region, region: integration.region,
}); });
const params = { const params = {
Path: integration.path, Path: integration.path,
Recursive: true, Recursive: true,
@@ -439,61 +476,61 @@ const syncSecretsAWSParameterStore = async ({
}; };
const parameterList = (await ssm.getParametersByPath(params).promise()).Parameters const parameterList = (await ssm.getParametersByPath(params).promise()).Parameters
let awsParameterStoreSecretsObj: { let awsParameterStoreSecretsObj: {
[key: string]: any // TODO: fix type [key: string]: any // TODO: fix type
} = {}; } = {};
if (parameterList) { if (parameterList) {
awsParameterStoreSecretsObj = parameterList.reduce((obj: any, secret: any) => ({ awsParameterStoreSecretsObj = parameterList.reduce((obj: any, secret: any) => ({
...obj, ...obj,
[secret.Name.split("/").pop()]: secret, [secret.Name.split("/").pop()]: secret,
}), {}); }), {});
} }
// Identify secrets to create // Identify secrets to create
Object.keys(secrets).map(async (key) => { Object.keys(secrets).map(async (key) => {
if (!(key in awsParameterStoreSecretsObj)) { if (!(key in awsParameterStoreSecretsObj)) {
// case: secret does not exist in AWS parameter store // case: secret does not exist in AWS parameter store
// -> create secret // -> create secret
await ssm.putParameter({
Name: `${integration.path}${key}`,
Type: "SecureString",
Value: secrets[key],
Overwrite: true,
}).promise();
} else {
// case: secret exists in AWS parameter store
if (awsParameterStoreSecretsObj[key].Value !== secrets[key]) {
// case: secret value doesn't match one in AWS parameter store
// -> update secret
await ssm.putParameter({ await ssm.putParameter({
Name: `${integration.path}${key}`, Name: `${integration.path}${key}`,
Type: "SecureString", Type: "SecureString",
Value: secrets[key], Value: secrets[key],
Overwrite: true, Overwrite: true,
}).promise(); }).promise();
} else {
// case: secret exists in AWS parameter store
if (awsParameterStoreSecretsObj[key].Value !== secrets[key]) {
// case: secret value doesn't match one in AWS parameter store
// -> update secret
await ssm.putParameter({
Name: `${integration.path}${key}`,
Type: "SecureString",
Value: secrets[key],
Overwrite: true,
}).promise();
}
} }
}
}); });
// Identify secrets to delete // Identify secrets to delete
Object.keys(awsParameterStoreSecretsObj).map(async (key) => { Object.keys(awsParameterStoreSecretsObj).map(async (key) => {
if (!(key in secrets)) { if (!(key in secrets)) {
// case: // case:
// -> delete secret // -> delete secret
await ssm.deleteParameter({ await ssm.deleteParameter({
Name: awsParameterStoreSecretsObj[key].Name, Name: awsParameterStoreSecretsObj[key].Name,
}).promise(); }).promise();
} }
}); });
AWS.config.update({ AWS.config.update({
region: undefined, region: undefined,
accessKeyId: undefined, accessKeyId: undefined,
secretAccessKey: undefined, secretAccessKey: undefined,
}); });
} }
/** /**
@@ -524,7 +561,7 @@ const syncSecretsAWSSecretManager = async ({
accessKeyId: accessId, accessKeyId: accessId,
secretAccessKey: accessToken, secretAccessKey: accessToken,
}); });
secretsManager = new SecretsManagerClient({ secretsManager = new SecretsManagerClient({
region: integration.region, region: integration.region,
credentials: { credentials: {
@@ -538,13 +575,13 @@ const syncSecretsAWSSecretManager = async ({
SecretId: integration.app, SecretId: integration.app,
}) })
); );
let awsSecretManagerSecretObj: { [key: string]: any } = {}; let awsSecretManagerSecretObj: { [key: string]: any } = {};
if (awsSecretManagerSecret?.SecretString) { if (awsSecretManagerSecret?.SecretString) {
awsSecretManagerSecretObj = JSON.parse(awsSecretManagerSecret.SecretString); awsSecretManagerSecretObj = JSON.parse(awsSecretManagerSecret.SecretString);
} }
if (!_.isEqual(awsSecretManagerSecretObj, secrets)) { if (!_.isEqual(awsSecretManagerSecretObj, secrets)) {
await secretsManager.send(new UpdateSecretCommand({ await secretsManager.send(new UpdateSecretCommand({
SecretId: integration.app, SecretId: integration.app,
@@ -556,19 +593,19 @@ const syncSecretsAWSSecretManager = async ({
region: undefined, region: undefined,
accessKeyId: undefined, accessKeyId: undefined,
secretAccessKey: undefined, secretAccessKey: undefined,
}); });
} catch (err) { } catch (err) {
if (err instanceof ResourceNotFoundException && secretsManager) { if (err instanceof ResourceNotFoundException && secretsManager) {
await secretsManager.send(new CreateSecretCommand({ await secretsManager.send(new CreateSecretCommand({
Name: integration.app, Name: integration.app,
SecretString: JSON.stringify(secrets), SecretString: JSON.stringify(secrets),
})); }));
} }
AWS.config.update({ AWS.config.update({
region: undefined, region: undefined,
accessKeyId: undefined, accessKeyId: undefined,
secretAccessKey: undefined, secretAccessKey: undefined,
}); });
} }
} }
@@ -651,36 +688,36 @@ const syncSecretsVercel = async ({
decrypt: "true", decrypt: "true",
...(integrationAuth?.teamId ...(integrationAuth?.teamId
? { ? {
teamId: integrationAuth.teamId, teamId: integrationAuth.teamId,
} }
: {}), : {}),
}; };
const vercelSecrets: VercelSecret[] = (await standardRequest.get( const vercelSecrets: VercelSecret[] = (await standardRequest.get(
`${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env`, `${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env`,
{ {
params, params,
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept-Encoding": "application/json", "Accept-Encoding": "application/json",
}, },
} }
)) ))
.data .data
.envs .envs
.filter((secret: VercelSecret) => { .filter((secret: VercelSecret) => {
if (!secret.target.includes(integration.targetEnvironment)) { if (!secret.target.includes(integration.targetEnvironment)) {
// case: secret does not have the same target environment // case: secret does not have the same target environment
return false; return false;
} }
if (integration.targetEnvironment === "preview" && integration.path && integration.path !== secret.gitBranch) { if (integration.targetEnvironment === "preview" && integration.path && integration.path !== secret.gitBranch) {
// case: secret on preview environment does not have same target git branch // case: secret on preview environment does not have same target git branch
return false; return false;
} }
return true; return true;
}); });
// return secret.target.includes(integration.targetEnvironment); // return secret.target.includes(integration.targetEnvironment);
@@ -690,14 +727,14 @@ const syncSecretsVercel = async ({
if (vercelSecret.type === "encrypted") { if (vercelSecret.type === "encrypted") {
// case: secret is encrypted -> need to decrypt // case: secret is encrypted -> need to decrypt
const decryptedSecret = (await standardRequest.get( const decryptedSecret = (await standardRequest.get(
`${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env/${vercelSecret.id}`, `${INTEGRATION_VERCEL_API_URL}/v9/projects/${integration.app}/env/${vercelSecret.id}`,
{ {
params, params,
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept-Encoding": "application/json", "Accept-Encoding": "application/json",
}, },
} }
)).data; )).data;
res[vercelSecret.key] = decryptedSecret; res[vercelSecret.key] = decryptedSecret;
@@ -705,7 +742,7 @@ const syncSecretsVercel = async ({
res[vercelSecret.key] = vercelSecret; res[vercelSecret.key] = vercelSecret;
} }
} }
const updateSecrets: VercelSecret[] = []; const updateSecrets: VercelSecret[] = [];
const deleteSecrets: VercelSecret[] = []; const deleteSecrets: VercelSecret[] = [];
const newSecrets: VercelSecret[] = []; const newSecrets: VercelSecret[] = [];
@@ -736,9 +773,9 @@ const syncSecretsVercel = async ({
key: key, key: key,
value: secrets[key], value: secrets[key],
type: res[key].type, type: res[key].type,
target: res[key].target.includes(integration.targetEnvironment) target: res[key].target.includes(integration.targetEnvironment)
? [...res[key].target] ? [...res[key].target]
: [...res[key].target, integration.targetEnvironment], : [...res[key].target, integration.targetEnvironment],
...(integration.path ? { ...(integration.path ? {
gitBranch: integration.path, gitBranch: integration.path,
} : {}), } : {}),
@@ -788,7 +825,7 @@ const syncSecretsVercel = async ({
}, },
} }
); );
} }
} }
for await (const secret of deleteSecrets) { for await (const secret of deleteSecrets) {
@@ -801,7 +838,7 @@ const syncSecretsVercel = async ({
"Accept-Encoding": "application/json", "Accept-Encoding": "application/json",
}, },
} }
); );
} }
}; };
@@ -1388,7 +1425,7 @@ const syncSecretsCircleCI = async ({
integration: IIntegration; integration: IIntegration;
secrets: any; secrets: any;
accessToken: string; accessToken: string;
}) => { }) => {
const circleciOrganizationDetail = ( const circleciOrganizationDetail = (
await standardRequest.get(`${INTEGRATION_CIRCLECI_API_URL}/v2/me/collaborations`, { await standardRequest.get(`${INTEGRATION_CIRCLECI_API_URL}/v2/me/collaborations`, {
headers: { headers: {
@@ -1475,13 +1512,13 @@ const syncSecretsTravisCI = async ({
} }
) )
) )
.data .data
?.env_vars ?.env_vars
.reduce((obj: any, secret: any) => ({ .reduce((obj: any, secret: any) => ({
...obj, ...obj,
[secret.name]: secret, [secret.name]: secret,
}), {}); }), {});
// add secrets // add secrets
for await (const key of Object.keys(secrets)) { for await (const key of Object.keys(secrets)) {
if (!(key in getSecretsRes)) { if (!(key in getSecretsRes)) {
@@ -1526,7 +1563,7 @@ const syncSecretsTravisCI = async ({
} }
for await (const key of Object.keys(getSecretsRes)) { for await (const key of Object.keys(getSecretsRes)) {
if (!(key in secrets)){ if (!(key in secrets)) {
// delete secret // delete secret
await standardRequest.delete( await standardRequest.delete(
`${INTEGRATION_TRAVISCI_API_URL}/settings/env_vars/${getSecretsRes[key].id}?repository_id=${getSecretsRes[key].repository_id}`, `${INTEGRATION_TRAVISCI_API_URL}/settings/env_vars/${getSecretsRes[key].id}?repository_id=${getSecretsRes[key].repository_id}`,
@@ -1571,29 +1608,29 @@ const syncSecretsGitLab = async ({
"Authorization": `Bearer ${accessToken}`, "Authorization": `Bearer ${accessToken}`,
"Accept-Encoding": "application/json", "Accept-Encoding": "application/json",
}; };
let allEnvVariables: GitLabSecret[] = []; let allEnvVariables: GitLabSecret[] = [];
let url: string | null = `${gitLabApiUrl}?per_page=100`; let url: string | null = `${gitLabApiUrl}?per_page=100`;
while (url) { while (url) {
const response: any = await standardRequest.get(url, { headers }); const response: any = await standardRequest.get(url, { headers });
allEnvVariables = [...allEnvVariables, ...response.data]; allEnvVariables = [...allEnvVariables, ...response.data];
const linkHeader = response.headers.link; const linkHeader = response.headers.link;
const nextLink = linkHeader?.split(",").find((part: string) => part.includes('rel="next"')); const nextLink = linkHeader?.split(",").find((part: string) => part.includes('rel="next"'));
if (nextLink) { if (nextLink) {
url = nextLink.trim().split(";")[0].slice(1, -1); url = nextLink.trim().split(";")[0].slice(1, -1);
} else { } else {
url = null; url = null;
} }
} }
return allEnvVariables; return allEnvVariables;
}; };
const allEnvVariables = await getAllEnvVariables(integration?.appId, accessToken); const allEnvVariables = await getAllEnvVariables(integration?.appId, accessToken);
const getSecretsRes: GitLabSecret[] = allEnvVariables.filter((secret: GitLabSecret) => const getSecretsRes: GitLabSecret[] = allEnvVariables.filter((secret: GitLabSecret) =>
secret.environment_scope === integration.targetEnvironment secret.environment_scope === integration.targetEnvironment
); );
@@ -1675,8 +1712,8 @@ const syncSecretsSupabase = async ({
`${INTEGRATION_SUPABASE_API_URL}/v1/projects/${integration.appId}/secrets`, `${INTEGRATION_SUPABASE_API_URL}/v1/projects/${integration.appId}/secrets`,
{ {
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept-Encoding": "application/json", "Accept-Encoding": "application/json",
}, },
} }
); );
@@ -1685,8 +1722,8 @@ const syncSecretsSupabase = async ({
const modifiedFormatForSecretInjection = Object.keys(secrets).map( const modifiedFormatForSecretInjection = Object.keys(secrets).map(
(key) => { (key) => {
return { return {
name: key, name: key,
value: secrets[key], value: secrets[key],
}; };
} }
); );
@@ -1696,8 +1733,8 @@ const syncSecretsSupabase = async ({
modifiedFormatForSecretInjection, modifiedFormatForSecretInjection,
{ {
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept-Encoding": "application/json", "Accept-Encoding": "application/json",
}, },
} }
); );
@@ -1705,7 +1742,7 @@ 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)) {
secretsToDelete.push(secretObj.name); secretsToDelete.push(secretObj.name);
} }
}); });
@@ -1752,18 +1789,18 @@ const syncSecretsCheckly = async ({
} }
) )
) )
.data .data
.reduce((obj: any, secret: any) => ({ .reduce((obj: any, secret: any) => ({
...obj, ...obj,
[secret.key]: secret.value, [secret.key]: secret.value,
}), {}); }), {});
// add secrets // add secrets
for await (const key of Object.keys(secrets)) { for await (const key of Object.keys(secrets)) {
if (!(key in getSecretsRes)) { if (!(key in getSecretsRes)) {
// case: secret does not exist in checkly // case: secret does not exist in checkly
// -> add secret // -> add secret
await standardRequest.post( await standardRequest.post(
`${INTEGRATION_CHECKLY_API_URL}/v1/variables`, `${INTEGRATION_CHECKLY_API_URL}/v1/variables`,
{ {
@@ -1782,7 +1819,7 @@ const syncSecretsCheckly = async ({
} else { } else {
// case: secret exists in checkly // case: secret exists in checkly
// -> update/set secret // -> update/set secret
if (secrets[key] !== getSecretsRes[key]) { if (secrets[key] !== getSecretsRes[key]) {
await standardRequest.put( await standardRequest.put(
`${INTEGRATION_CHECKLY_API_URL}/v1/variables/${key}`, `${INTEGRATION_CHECKLY_API_URL}/v1/variables/${key}`,
@@ -1803,7 +1840,7 @@ const syncSecretsCheckly = async ({
} }
for await (const key of Object.keys(getSecretsRes)) { for await (const key of Object.keys(getSecretsRes)) {
if (!(key in secrets)){ if (!(key in secrets)) {
// delete secret // delete secret
await standardRequest.delete( await standardRequest.delete(
`${INTEGRATION_CHECKLY_API_URL}/v1/variables/${key}`, `${INTEGRATION_CHECKLY_API_URL}/v1/variables/${key}`,
@@ -1840,13 +1877,13 @@ const syncSecretsHashiCorpVault = async ({
accessToken: string; accessToken: string;
}) => { }) => {
if (!accessId) return; if (!accessId) return;
interface LoginAppRoleRes { interface LoginAppRoleRes {
auth: { auth: {
client_token: string; client_token: string;
} }
} }
// get Vault client token (could be optimized) // get Vault client token (could be optimized)
const { data }: { data: LoginAppRoleRes } = await standardRequest.post( const { data }: { data: LoginAppRoleRes } = await standardRequest.post(
`${integrationAuth.url}/v1/auth/approle/login`, `${integrationAuth.url}/v1/auth/approle/login`,
@@ -1860,7 +1897,7 @@ const syncSecretsHashiCorpVault = async ({
}, },
} }
); );
const clientToken = data.auth.client_token; const clientToken = data.auth.client_token;
await standardRequest.post( await standardRequest.post(
@@ -1888,46 +1925,46 @@ const syncSecretsHashiCorpVault = async ({
* @param {String} obj.accessToken - API token for Cloudflare * @param {String} obj.accessToken - API token for Cloudflare
*/ */
const syncSecretsCloudflarePages = async ({ const syncSecretsCloudflarePages = async ({
integration, integration,
secrets, secrets,
accessId, accessId,
accessToken, accessToken,
}: { }: {
integration: IIntegration; integration: IIntegration;
secrets: any; secrets: any;
accessId: string | null; accessId: string | null;
accessToken: string; accessToken: string;
}) => { }) => {
// get secrets from cloudflare pages // get secrets from cloudflare pages
const getSecretsRes = ( const getSecretsRes = (
await standardRequest.get( await standardRequest.get(
`${INTEGRATION_CLOUDFLARE_PAGES_API_URL}/client/v4/accounts/${accessId}/pages/projects/${integration.app}`, `${INTEGRATION_CLOUDFLARE_PAGES_API_URL}/client/v4/accounts/${accessId}/pages/projects/${integration.app}`,
{ {
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept": "application/json", "Accept": "application/json",
}, },
} }
) )
) )
.data.result["deployment_configs"][integration.targetEnvironment]["env_vars"]; .data.result['deployment_configs'][integration.targetEnvironment]['env_vars'];
// copy the secrets object, so we can set deleted keys to null // copy the secrets object, so we can set deleted keys to null
const secretsObj: any = {...secrets}; const secretsObj: any = { ...secrets };
for (const [key, val] of Object.entries(secretsObj)) { for (const [key, val] of Object.entries(secretsObj)) {
secretsObj[key] = { type: "secret_text", value: val }; secretsObj[key] = { type: "secret_text", value: val };
} }
if (getSecretsRes) { if (getSecretsRes) {
for await (const key of Object.keys(getSecretsRes)) { for await (const key of Object.keys(getSecretsRes)) {
if (!(key in secrets)) { if (!(key in secrets)) {
// case: secret does not exist in infisical // case: secret does not exist in infisical
// -> delete secret from cloudflare pages // -> delete secret from cloudflare pages
secretsObj[key] = null; secretsObj[key] = null;
}
} }
}
} }
const data = { const data = {
@@ -1939,19 +1976,52 @@ const syncSecretsCloudflarePages = async ({
}; };
await standardRequest.patch( await standardRequest.patch(
`${INTEGRATION_CLOUDFLARE_PAGES_API_URL}/client/v4/accounts/${accessId}/pages/projects/${integration.app}`, `${INTEGRATION_CLOUDFLARE_PAGES_API_URL}/client/v4/accounts/${accessId}/pages/projects/${integration.app}`,
data, data,
{ {
headers: { headers: {
Authorization: `Bearer ${accessToken}`, Authorization: `Bearer ${accessToken}`,
"Accept": "application/json", "Accept": "application/json",
}, },
} }
); );
} }
/** /**
* Sync/push [secrets] to Windmil with name [integration.app] * Sync/push [secrets] to Codefresh with name [integration.app]
* @param {Object} obj
* @param {IIntegration} obj.integration - integration details
* @param {Object} obj.secrets - secrets to push to integration (object where keys are secret keys and values are secret values)
* @param {String} obj.accessToken - access token for Codefresh integration
*/
const syncSecretsCodefresh = async ({
integration,
secrets,
accessToken,
}: {
integration: IIntegration;
secrets: any;
accessToken: string;
}) => {
await standardRequest.patch(
`${INTEGRATION_CODEFRESH_API_URL}/projects/${integration.appId}`,
{
variables: Object.keys(secrets).map((key) => ({
key,
value: secrets[key]
}))
},
{
headers: {
Authorization: `Bearer ${accessToken}`,
"Accept": "application/json",
},
}
);
};
/**
* Sync/push [secrets] to Windmill with name [integration.app]
* @param {Object} obj * @param {Object} obj
* @param {IIntegration} obj.integration - integration details * @param {IIntegration} obj.integration - integration details
* @param {IIntegrationAuth} obj.integrationAuth - integration auth details * @param {IIntegrationAuth} obj.integrationAuth - integration auth details
backend/src/models/integration.ts
+3
View File
@@ -18,6 +18,7 @@ import {
INTEGRATION_SUPABASE, INTEGRATION_SUPABASE,
INTEGRATION_TRAVISCI, INTEGRATION_TRAVISCI,
INTEGRATION_VERCEL, INTEGRATION_VERCEL,
INTEGRATION_CODEFRESH,
INTEGRATION_WINDMILL, INTEGRATION_WINDMILL,
} from "../variables"; } from "../variables";
@@ -56,6 +57,7 @@ export interface IIntegration {
| "checkly" | "checkly"
| "hashicorp-vault" | "hashicorp-vault"
| "cloudflare-pages" | "cloudflare-pages"
| "codefresh"
| "windmill"; | "windmill";
integrationAuth: Types.ObjectId; integrationAuth: Types.ObjectId;
} }
@@ -146,6 +148,7 @@ const integrationSchema = new Schema<IIntegration>(
INTEGRATION_CHECKLY, INTEGRATION_CHECKLY,
INTEGRATION_HASHICORP_VAULT, INTEGRATION_HASHICORP_VAULT,
INTEGRATION_CLOUDFLARE_PAGES, INTEGRATION_CLOUDFLARE_PAGES,
INTEGRATION_CODEFRESH,
INTEGRATION_WINDMILL, INTEGRATION_WINDMILL,
], ],
required: true, required: true,
backend/src/models/integrationAuth.ts
+3 -1
View File
@@ -20,13 +20,14 @@ import {
INTEGRATION_SUPABASE, INTEGRATION_SUPABASE,
INTEGRATION_TRAVISCI, INTEGRATION_TRAVISCI,
INTEGRATION_VERCEL, INTEGRATION_VERCEL,
INTEGRATION_CODEFRESH,
INTEGRATION_WINDMILL INTEGRATION_WINDMILL
} from "../variables"; } from "../variables";
export interface IIntegrationAuth extends Document { export interface IIntegrationAuth extends Document {
_id: Types.ObjectId; _id: Types.ObjectId;
workspace: Types.ObjectId; workspace: Types.ObjectId;
integration: "heroku" | "vercel" | "netlify" | "github" | "gitlab" | "render" | "railway" | "flyio" | "azure-key-vault" | "laravel-forge" | "circleci" | "travisci" | "supabase" | "aws-parameter-store" | "aws-secret-manager" | "checkly" | "cloudflare-pages" | "windmill"; integration: 'heroku' | 'vercel' | 'netlify' | 'github' | 'gitlab' | 'render' | 'railway' | 'flyio' | 'azure-key-vault' | 'laravel-forge' | 'circleci' | 'travisci' | 'supabase' | 'aws-parameter-store' | 'aws-secret-manager' | 'checkly' | 'cloudflare-pages' | 'windmill' | 'codefresh';
teamId: string; teamId: string;
accountId: string; accountId: string;
url: string; url: string;
@@ -72,6 +73,7 @@ const integrationAuthSchema = new Schema<IIntegrationAuth>(
INTEGRATION_SUPABASE, INTEGRATION_SUPABASE,
INTEGRATION_HASHICORP_VAULT, INTEGRATION_HASHICORP_VAULT,
INTEGRATION_CLOUDFLARE_PAGES, INTEGRATION_CLOUDFLARE_PAGES,
INTEGRATION_CODEFRESH,
INTEGRATION_WINDMILL, INTEGRATION_WINDMILL,
], ],
required: true, required: true,
backend/src/services/SecretImportService.ts
+5
View File
@@ -38,6 +38,11 @@ export const getAllImportedSecrets = async (
folderId: secPathFolder.id, folderId: secPathFolder.id,
secretPath: el.secretPath secretPath: el.secretPath
}); });
} else {
if (el.secretPath === "/") {
// this happens when importing with a fresh env without any folders
importedSecByFid.push({ environment: el.environment, folderId: "root", secretPath: "/" });
}
} }
}); });
if (importedSecByFid.length === 0) return []; if (importedSecByFid.length === 0) return [];
backend/src/variables/integration.ts
+12
View File
@@ -26,6 +26,7 @@ export const INTEGRATION_SUPABASE = "supabase";
export const INTEGRATION_CHECKLY = "checkly"; export const INTEGRATION_CHECKLY = "checkly";
export const INTEGRATION_HASHICORP_VAULT = "hashicorp-vault"; export const INTEGRATION_HASHICORP_VAULT = "hashicorp-vault";
export const INTEGRATION_CLOUDFLARE_PAGES = "cloudflare-pages"; export const INTEGRATION_CLOUDFLARE_PAGES = "cloudflare-pages";
export const INTEGRATION_CODEFRESH = "codefresh";
export const INTEGRATION_WINDMILL = "windmill"; export const INTEGRATION_WINDMILL = "windmill";
export const INTEGRATION_SET = new Set([ export const INTEGRATION_SET = new Set([
INTEGRATION_AZURE_KEY_VAULT, INTEGRATION_AZURE_KEY_VAULT,
@@ -43,6 +44,7 @@ export const INTEGRATION_SET = new Set([
INTEGRATION_CHECKLY, INTEGRATION_CHECKLY,
INTEGRATION_HASHICORP_VAULT, INTEGRATION_HASHICORP_VAULT,
INTEGRATION_CLOUDFLARE_PAGES, INTEGRATION_CLOUDFLARE_PAGES,
INTEGRATION_CODEFRESH,
INTEGRATION_WINDMILL INTEGRATION_WINDMILL
]); ]);
@@ -73,6 +75,7 @@ export const INTEGRATION_SUPABASE_API_URL = "https://api.supabase.com";
export const INTEGRATION_LARAVELFORGE_API_URL = "https://forge.laravel.com"; export const INTEGRATION_LARAVELFORGE_API_URL = "https://forge.laravel.com";
export const INTEGRATION_CHECKLY_API_URL = "https://api.checklyhq.com"; export const INTEGRATION_CHECKLY_API_URL = "https://api.checklyhq.com";
export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = "https://api.cloudflare.com"; export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = "https://api.cloudflare.com";
export const INTEGRATION_CODEFRESH_API_URL = "https://g.codefresh.io/api";
export const INTEGRATION_WINDMILL_API_URL = "https://app.windmill.dev/api"; export const INTEGRATION_WINDMILL_API_URL = "https://app.windmill.dev/api";
export const getIntegrationOptions = async () => { export const getIntegrationOptions = async () => {
@@ -249,6 +252,15 @@ export const getIntegrationOptions = async () => {
clientId: "", clientId: "",
docsLink: "" docsLink: ""
}, },
{
name: "Codefresh",
slug: "codefresh",
image: "Codefresh.png",
isAvailable: true,
type: "pat",
clientId: "",
docsLink: "",
},
{ {
name: "Windmill", name: "Windmill",
slug: "windmill", slug: "windmill",
frontend/public/data/frequentConstants.ts
+1
View File
@@ -21,6 +21,7 @@ const integrationSlugNameMapping: Mapping = {
'checkly': 'Checkly', 'checkly': 'Checkly',
'hashicorp-vault': 'Vault', 'hashicorp-vault': 'Vault',
'cloudflare-pages': 'Cloudflare Pages', 'cloudflare-pages': 'Cloudflare Pages',
'codefresh': 'Codefresh',
'windmill': 'windmill' 'windmill': 'windmill'
} }
frontend/public/images/integrations/codefresh.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

frontend/src/hooks/api/integrationAuth/index.tsx
+1 -1
View File
@@ -5,5 +5,5 @@ export {
useGetIntegrationAuthRailwayEnvironments, useGetIntegrationAuthRailwayEnvironments,
useGetIntegrationAuthRailwayServices, useGetIntegrationAuthRailwayServices,
useGetIntegrationAuthTeams, useGetIntegrationAuthTeams,
useGetIntegrationAuthVercelBranches useGetIntegrationAuthVercelBranches,
} from "./queries"; } from "./queries";
frontend/src/hooks/api/integrationAuth/queries.tsx
+4
View File
@@ -19,6 +19,7 @@ const integrationAuthKeys = {
integrationAuthId: string; integrationAuthId: string;
appId: string; appId: string;
}) => [{ integrationAuthId, appId }, "integrationAuthVercelBranches"] as const, }) => [{ integrationAuthId, appId }, "integrationAuthVercelBranches"] as const,
getIntegrationAuthRailwayEnvironments: ({ getIntegrationAuthRailwayEnvironments: ({
integrationAuthId, integrationAuthId,
appId appId
@@ -64,6 +65,7 @@ const fetchIntegrationAuthTeams = async (integrationAuthId: string) => {
return data.teams; return data.teams;
}; };
const fetchIntegrationAuthVercelBranches = async ({ const fetchIntegrationAuthVercelBranches = async ({
integrationAuthId, integrationAuthId,
appId appId
@@ -224,6 +226,7 @@ export const useGetIntegrationAuthRailwayServices = ({
}); });
}; };
export const useDeleteIntegrationAuth = () => { export const useDeleteIntegrationAuth = () => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@@ -235,3 +238,4 @@ export const useDeleteIntegrationAuth = () => {
} }
}); });
}; };
frontend/src/pages/integrations/codefresh/authorize.tsx
+64
View File
@@ -0,0 +1,64 @@
import { useState } from "react";
import { useRouter } from "next/router";
import { Button, Card, CardTitle, FormControl, Input } from "../../../components/v2";
import saveIntegrationAccessToken from "../../api/integrations/saveIntegrationAccessToken";
export default function CodefreshCreateIntegrationPage() {
const router = useRouter();
const [apiKey, setApiKey] = useState("");
const [apiKeyErrorText, setApiKeyErrorText] = useState("");
const [isLoading, setIsLoading] = useState(false);
const handleButtonClick = async () => {
try {
setApiKeyErrorText("");
if (apiKey.length === 0) {
setApiKeyErrorText("API Key cannot be blank");
return;
}
setIsLoading(true);
const integrationAuth = await saveIntegrationAccessToken({
workspaceId: localStorage.getItem("projectData.id"),
integration: "codefresh",
accessId: null,
accessToken: apiKey,
url: null,
namespace: null
});
setIsLoading(false);
router.push(`/integrations/codefresh/create?integrationAuthId=${integrationAuth._id}`);
} catch (err) {
console.error(err);
}
};
return (
<div className="flex h-full w-full items-center justify-center">
<Card className="max-w-md rounded-md p-8">
<CardTitle className="text-center">Codefresh Integration</CardTitle>
<FormControl
label="Codefresh API Key"
errorText={apiKeyErrorText}
isError={apiKeyErrorText !== "" ?? false}
>
<Input placeholder="" value={apiKey} onChange={(e) => setApiKey(e.target.value)} />
</FormControl>
<Button
onClick={handleButtonClick}
color="mineshaft"
className="mt-4"
isLoading={isLoading}
>
Connect to Codefresh
</Button>
</Card>
</div>
);
}
CodefreshCreateIntegrationPage.requireAuth = true;
frontend/src/pages/integrations/codefresh/create.tsx
+155
View File
@@ -0,0 +1,155 @@
import { useEffect, useState } from "react";
import { useRouter } from "next/router";
import queryString from "query-string";
import {
Button,
Card,
CardTitle,
FormControl,
Input,
Select,
SelectItem
} from "../../../components/v2";
import {
useGetIntegrationAuthApps,
useGetIntegrationAuthById
} from "../../../hooks/api/integrationAuth";
import { useGetWorkspaceById } from "../../../hooks/api/workspace";
import createIntegration from "../../api/integrations/createIntegration";
export default function CodefreshCreateIntegrationPage() {
const router = useRouter();
const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]);
const { data: workspace } = useGetWorkspaceById(localStorage.getItem("projectData.id") ?? "");
const { data: integrationAuth } = useGetIntegrationAuthById((integrationAuthId as string) ?? "");
const { data: integrationAuthApps } = useGetIntegrationAuthApps({
integrationAuthId: (integrationAuthId as string) ?? ""
});
const [selectedSourceEnvironment, setSelectedSourceEnvironment] = useState("");
const [targetApp, setTargetApp] = useState("");
const [secretPath, setSecretPath] = useState("/");
const [isLoading, setIsLoading] = useState(false);
useEffect(() => {
if (workspace) {
setSelectedSourceEnvironment(workspace.environments[0].slug);
}
}, [workspace]);
useEffect(() => {
if (integrationAuthApps) {
if (integrationAuthApps.length > 0) {
setTargetApp(integrationAuthApps[0].name);
} else {
setTargetApp("none");
}
}
}, [integrationAuthApps]);
const handleButtonClick = async () => {
try {
if (!integrationAuth?._id) return;
setIsLoading(true);
await createIntegration({
integrationAuthId: integrationAuth?._id,
isActive: true,
app: targetApp,
appId:
integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
?.appId ?? null,
sourceEnvironment: selectedSourceEnvironment,
targetEnvironment: null,
targetEnvironmentId: null,
targetService: null,
targetServiceId: null,
owner: null,
path: null,
region: null,
secretPath
});
setIsLoading(false);
router.push(`/integrations/${localStorage.getItem("projectData.id")}`);
} catch (err) {
console.error(err);
}
};
return integrationAuth &&
workspace &&
selectedSourceEnvironment &&
integrationAuthApps &&
targetApp ? (
<div className="flex h-full w-full items-center justify-center">
<Card className="max-w-md rounded-md p-8">
<CardTitle className="text-center">Codefresh Integration</CardTitle>
<FormControl label="Project Environment" className="mt-4">
<Select
value={selectedSourceEnvironment}
onValueChange={(val) => setSelectedSourceEnvironment(val)}
className="w-full border border-mineshaft-500"
>
{workspace?.environments.map((sourceEnvironment) => (
<SelectItem
value={sourceEnvironment.slug}
key={`source-environment-${sourceEnvironment.slug}`}
>
{sourceEnvironment.name}
</SelectItem>
))}
</Select>
</FormControl>
<FormControl label="Secrets Path">
<Input
value={secretPath}
onChange={(evt) => setSecretPath(evt.target.value)}
placeholder="Provide a path, default is /"
/>
</FormControl>
<FormControl label="Codefresh Service" className="mt-4">
<Select
value={targetApp}
onValueChange={(val) => setTargetApp(val)}
className="w-full border border-mineshaft-500"
isDisabled={integrationAuthApps.length === 0}
>
{integrationAuthApps.length > 0 ? (
integrationAuthApps.map((integrationAuthApp) => (
<SelectItem
value={integrationAuthApp.name}
key={`target-app-${integrationAuthApp.name}`}
>
{integrationAuthApp.name}
</SelectItem>
))
) : (
<SelectItem value="none" key="target-app-none">
No services found
</SelectItem>
)}
</Select>
</FormControl>
<Button
onClick={handleButtonClick}
color="mineshaft"
className="mt-4"
isLoading={isLoading}
isDisabled={integrationAuthApps.length === 0}
>
Create Integration
</Button>
</Card>
</div>
) : (
<div />
);
}
CodefreshCreateIntegrationPage.requireAuth = true;
frontend/src/views/DashboardPage/DashboardPage.tsx
+1 -1
View File
@@ -676,7 +676,7 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
const isSnapshotSecretEmtpy = const isSnapshotSecretEmtpy =
isRollbackMode && !isSnapshotSecretsLoading && !snapshotSecret?.secrets?.length; isRollbackMode && !isSnapshotSecretsLoading && !snapshotSecret?.secrets?.length;
const isSecretEmpty = (!isRollbackMode && isDashboardSecretEmpty) || isSnapshotSecretEmtpy; const isSecretEmpty = (!isRollbackMode && isDashboardSecretEmpty) || isSnapshotSecretEmtpy;
const isSecretImportEmpty = !importedSecrets?.length; const isSecretImportEmpty = !secretImportCfg?.imports?.length;
const isEmptyPage = isFoldersEmpty && isSecretEmpty && isSecretImportEmpty; const isEmptyPage = isFoldersEmpty && isSecretEmpty && isSecretImportEmpty;
if (isSecretsLoading || isEnvListLoading) { if (isSecretsLoading || isEnvListLoading) {
frontend/src/views/DashboardPage/components/SecretImportSection/SecretImportItem.tsx
+15 -2
View File
@@ -1,9 +1,15 @@
import { useEffect } from "react"; import { useEffect } from "react";
import { useSortable } from "@dnd-kit/sortable"; import { useSortable } from "@dnd-kit/sortable";
import { faFileImport, faFolder, faUpDown, faXmark } from "@fortawesome/free-solid-svg-icons"; import {
faFileImport,
faFolder,
faKey,
faUpDown,
faXmark
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { IconButton, TableContainer, Tooltip } from "@app/components/v2"; import { EmptyState, IconButton, TableContainer, Tooltip } from "@app/components/v2";
import { useWorkspace } from "@app/context"; import { useWorkspace } from "@app/context";
import { useToggle } from "@app/hooks/useToggle"; import { useToggle } from "@app/hooks/useToggle";
@@ -119,6 +125,13 @@ export const SecretImportItem = ({
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{importedSecrets?.length === 0 && (
<tr>
<td colSpan={3}>
<EmptyState title="No secrets found" icon={faKey} />
</td>
</tr>
)}
{importedSecrets.map(({ key, value, overriden }, index) => ( {importedSecrets.map(({ key, value, overriden }, index) => (
<tr key={`${importedEnv}-${importedSecPath}-${key}-${index + 1}`}> <tr key={`${importedEnv}-${importedSecPath}-${key}-${index + 1}`}>
<td className="h-10" style={{ padding: "0.25rem 1rem" }}> <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx
+3
View File
@@ -92,6 +92,9 @@ export const redirectForProviderAuth = (integrationOption: TCloudIntegration) =>
case "cloudflare-pages": case "cloudflare-pages":
link = `${window.location.origin}/integrations/cloudflare-pages/authorize`; link = `${window.location.origin}/integrations/cloudflare-pages/authorize`;
break; break;
case "codefresh":
link = `${window.location.origin}/integrations/codefresh/authorize`;
break;
case "windmill": case "windmill":
link = `${window.location.origin}/integrations/windmill/authorize`; link = `${window.location.origin}/integrations/windmill/authorize`;
break; break;
frontend/src/views/IntegrationsPage/IntegrationsPage.tsx
+1
View File
@@ -48,6 +48,7 @@ export const IntegrationsPage = ({ frameworkIntegrations }: Props) => {
const { data: cloudIntegrations, isLoading: isCloudIntegrationsLoading } = const { data: cloudIntegrations, isLoading: isCloudIntegrationsLoading } =
useGetCloudIntegrations(); useGetCloudIntegrations();
const { data: integrationAuths, isLoading: isIntegrationAuthLoading } = const { data: integrationAuths, isLoading: isIntegrationAuthLoading } =
useGetWorkspaceAuthorizations( useGetWorkspaceAuthorizations(
workspaceId, workspaceId,
frontend/src/views/IntegrationsPage/components/IntegrationsSection/IntegrationsSection.tsx
-1
View File
@@ -32,7 +32,6 @@ export const IntegrationsSection = ({
const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([ const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
"deleteConfirmation" "deleteConfirmation"
] as const); ] as const);
return ( return (
<div className="mb-8"> <div className="mb-8">
<div className="mx-4 mb-4 mt-6 flex flex-col items-start justify-between px-2 text-xl"> <div className="mx-4 mb-4 mt-6 flex flex-col items-start justify-between px-2 text-xl">