diff --git a/backend/src/integrations/sync.ts b/backend/src/integrations/sync.ts index 401c7f9a1a..8e44d591df 100644 --- a/backend/src/integrations/sync.ts +++ b/backend/src/integrations/sync.ts @@ -886,8 +886,9 @@ const syncSecretsFlyio = async ({ method: 'post', url: INTEGRATION_FLYIO_API_URL, headers: { - 'Authorization': 'Bearer ' + accessToken, - 'Content-Type': 'application/json' + 'Authorization': 'Bearer ' + accessToken, + 'Content-Type': 'application/json', + 'Accept-Encoding': 'application/json' }, data: { query: GetSecrets, diff --git a/backend/src/variables/integration.ts b/backend/src/variables/integration.ts index 0cac80984a..f084f54b40 100644 --- a/backend/src/variables/integration.ts +++ b/backend/src/variables/integration.ts @@ -47,16 +47,6 @@ const INTEGRATION_RENDER_API_URL = 'https://api.render.com'; const INTEGRATION_FLYIO_API_URL = 'https://api.fly.io/graphql'; const INTEGRATION_OPTIONS = [ - { - name: 'Azure Key Vault', - slug: 'azure-key-vault', - image: 'Microsoft Azure.png', - isAvailable: true, - type: 'oauth', - clientId: CLIENT_ID_AZURE, - tenantId: TENANT_ID_AZURE, - docsLink: '' - }, { name: 'Heroku', slug: 'heroku', @@ -112,6 +102,16 @@ const INTEGRATION_OPTIONS = [ clientId: '', docsLink: '' }, + { + name: 'Azure Key Vault', + slug: 'azure-key-vault', + image: 'Microsoft Azure.png', + isAvailable: false, + type: 'oauth', + clientId: CLIENT_ID_AZURE, + tenantId: TENANT_ID_AZURE, + docsLink: '' + }, { name: 'Google Cloud Platform', slug: 'gcp', diff --git a/frontend/src/pages/integrations/netlify/create.tsx b/frontend/src/pages/integrations/netlify/create.tsx index a8b6bcd05e..7f00394d7f 100644 --- a/frontend/src/pages/integrations/netlify/create.tsx +++ b/frontend/src/pages/integrations/netlify/create.tsx @@ -47,7 +47,6 @@ export default function NetlifyCreateIntegrationPage() { useEffect(() => { // TODO: handle case where apps can be empty if (integrationAuthApps) { - console.log(integrationAuthApps) setTargetApp(integrationAuthApps[0].name); } }, [integrationAuthApps]); diff --git a/frontend/src/pages/integrations/render/create.tsx b/frontend/src/pages/integrations/render/create.tsx index 3429def894..b37319312b 100644 --- a/frontend/src/pages/integrations/render/create.tsx +++ b/frontend/src/pages/integrations/render/create.tsx @@ -38,7 +38,7 @@ export default function RenderCreateIntegrationPage() { useEffect(() => { // TODO: handle case where apps can be empty if (integrationAuthApps) { - setTargetApp(integrationAuthApps[0].name); + setTargetApp(integrationAuthApps[0].name); } }, [integrationAuthApps]); @@ -52,7 +52,7 @@ export default function RenderCreateIntegrationPage() { integrationAuthId: integrationAuth?._id, isActive: true, app: targetApp, - appId: null, + appId: (integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp))?.appId ?? null, sourceEnvironment: selectedSourceEnvironment, targetEnvironment: null, owner: null