From 92d4d7e181a2cd6ed2707797e2a827676e7e1561 Mon Sep 17 00:00:00 2001
From: Yujohn Nattrass <yujohn.natt@gmail.com>
Date: Mon, 3 Feb 2025 11:23:24 -0800
Subject: [PATCH] chore: remove feature flag to error builds if failed to fetch
 extensions

---
 packages/config/src/api/site_info.ts          |  44 +++++----------
 .../config/tests/api/snapshots/tests.js.md    |  52 +-----------------
 .../config/tests/api/snapshots/tests.js.snap  | Bin 2355 -> 2286 bytes
 packages/config/tests/api/tests.js            |  25 +--------
 4 files changed, 15 insertions(+), 106 deletions(-)

diff --git a/packages/config/src/api/site_info.ts b/packages/config/src/api/site_info.ts
index 173384bfb7..e0612918d1 100644
--- a/packages/config/src/api/site_info.ts
+++ b/packages/config/src/api/site_info.ts
@@ -36,10 +36,8 @@ export const getSiteInfo = async function ({
   offline = false,
   testOpts = {},
   siteFeatureFlagPrefix,
-  featureFlags = {},
 }: GetSiteInfoOpts) {
   const { env: testEnv = false } = testOpts
-  const errorOnExtensionFetchFail = featureFlags.error_builds_on_extension_fetch_fail
 
   if (api === undefined || mode === 'buildbot' || testEnv) {
     const siteInfo: { id?: string; account_id?: string } = {}
@@ -48,9 +46,7 @@ export const getSiteInfo = async function ({
     if (accountId !== undefined) siteInfo.account_id = accountId
 
     const integrations =
-      mode === 'buildbot' && !offline
-        ? await getIntegrations({ siteId, testOpts, offline, accountId, errorOnExtensionFetchFail })
-        : []
+      mode === 'buildbot' && !offline ? await getIntegrations({ siteId, testOpts, offline, accountId }) : []
 
     return { siteInfo, accounts: [], addons: [], integrations }
   }
@@ -59,7 +55,7 @@ export const getSiteInfo = async function ({
     getSite(api, siteId, siteFeatureFlagPrefix),
     getAccounts(api),
     getAddons(api, siteId),
-    getIntegrations({ siteId, testOpts, offline, accountId, errorOnExtensionFetchFail }),
+    getIntegrations({ siteId, testOpts, offline, accountId }),
   ]
 
   const [siteInfo, accounts, addons, integrations] = await Promise.all(promises)
@@ -113,7 +109,6 @@ type GetIntegrationsOpts = {
   accountId?: string
   testOpts: TestOptions
   offline: boolean
-  errorOnExtensionFetchFail?: boolean
 }
 
 const getIntegrations = async function ({
@@ -121,7 +116,6 @@ const getIntegrations = async function ({
   accountId,
   testOpts,
   offline,
-  errorOnExtensionFetchFail,
 }: GetIntegrationsOpts): Promise<IntegrationResponse[]> {
   if (!siteId || offline) {
     return []
@@ -136,31 +130,19 @@ const getIntegrations = async function ({
     ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}`
     : `${baseUrl}site/${siteId}/integrations/safe`
 
-  if (errorOnExtensionFetchFail) {
-    try {
-      const response = await fetch(url)
-      if (!response.ok) {
-        throw new Error(`Unexpected status code ${response.status} from fetching extensions`)
-      }
-      const bodyText = await response.text()
-      if (bodyText === '') {
-        return []
-      }
-
-      const integrations = await JSON.parse(bodyText)
-      return Array.isArray(integrations) ? integrations : []
-    } catch (error) {
-      return throwUserError(
-        `Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`,
-      )
-    }
-  }
-
   try {
     const response = await fetch(url)
-    const integrations = await response.json()
+    if (!response.ok) {
+      throw new Error(`Unexpected status code ${response.status} from fetching extensions`)
+    }
+    const bodyText = await response.text()
+    if (bodyText === '') {
+      return []
+    }
+
+    const integrations = await JSON.parse(bodyText)
     return Array.isArray(integrations) ? integrations : []
-  } catch {
-    return []
+  } catch (error) {
+    return throwUserError(`Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`)
   }
 }
diff --git a/packages/config/tests/api/snapshots/tests.js.md b/packages/config/tests/api/snapshots/tests.js.md
index 76282a01b6..929e7dc6f1 100644
--- a/packages/config/tests/api/snapshots/tests.js.md
+++ b/packages/config/tests/api/snapshots/tests.js.md
@@ -2250,56 +2250,12 @@ Generated by [AVA](https://avajs.dev).
       "token": "test"␊
     }`
 
-## Integrations are not returned if failed to fetch integrations and if flag is true
+## Integrations are not returned if failed to fetch integrations
 
 > Snapshot 1
 
     'Failed retrieving extensions for site test: Unexpected status code 500 from fetching extensions. Double-check your login status with \'netlify status\' or contact support with details of your error.'
 
-## Empty array of integrations are returned if failed to fetch integrations and if flag is false
-
-> Snapshot 1
-
-    `{␊
-      "accounts": [],␊
-      "addons": [],␊
-      "branch": "branch",␊
-      "buildDir": "packages/config/tests/api/fixtures/base",␊
-      "config": {␊
-        "build": {␊
-          "environment": {},␊
-          "processing": {␊
-            "css": {},␊
-            "html": {},␊
-            "images": {},␊
-            "js": {}␊
-          },␊
-          "publish": "packages/config/tests/api/fixtures/base",␊
-          "publishOrigin": "default",␊
-          "services": {}␊
-        },␊
-        "functions": {␊
-          "*": {}␊
-        },␊
-        "headers": [],␊
-        "plugins": [],␊
-        "redirects": []␊
-      },␊
-      "configPath": "packages/config/tests/api/fixtures/base/netlify.toml",␊
-      "context": "production",␊
-      "env": {},␊
-      "hasApi": true,␊
-      "headersPath": "packages/config/tests/api/fixtures/base/_headers",␊
-      "integrations": [],␊
-      "redirectsPath": "packages/config/tests/api/fixtures/base/_redirects",␊
-      "repositoryRoot": "packages/config/tests/api/fixtures/base",␊
-      "siteInfo": {␊
-        "account_id": "account1",␊
-        "id": "test"␊
-      },␊
-      "token": "test"␊
-    }`
-
 ## baseRelDir is true if build.base is overridden
 
 > Snapshot 1
@@ -2463,9 +2419,3 @@ Generated by [AVA](https://avajs.dev).
       },␊
       "token": "test"␊
     }`
-
-## Integrations are not returned if failed to fetch integrations
-
-> Snapshot 1
-
-    'Failed retrieving extensions for site test: Unexpected status code 500 from fetching extensions. Double-check your login status with \'netlify status\' or contact support with details of your error.'
diff --git a/packages/config/tests/api/snapshots/tests.js.snap b/packages/config/tests/api/snapshots/tests.js.snap
index fcd3582afbf02483f58189a5f0e0f0f3bd13e9b6..4cf9ceda68c58fcf87590926e1e14d48aaacbb41 100644
GIT binary patch
literal 2286
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

literal 2355
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
Li2R<f0f2u18lI3N

diff --git a/packages/config/tests/api/tests.js b/packages/config/tests/api/tests.js
index 1517273c59..e235c0bbeb 100644
--- a/packages/config/tests/api/tests.js
+++ b/packages/config/tests/api/tests.js
@@ -419,36 +419,13 @@ test('Integrations are returned if accountId is present and mode is dev', async
   t.assert(config.integrations[0].has_build === true)
 })
 
-test('Integrations are not returned if failed to fetch integrations and if flag is true', async (t) => {
+test('Integrations are not returned if failed to fetch integrations', async (t) => {
   const { output } = await new Fixture('./fixtures/base')
     .withFlags({
       siteId: 'test',
       mode: 'buildbot',
       accountId: 'account1',
       token: 'test',
-      featureFlags: {
-        error_builds_on_extension_fetch_fail: true,
-      },
-    })
-    .runConfigServer([
-      SITE_INFO_DATA,
-      TEAM_INSTALLATIONS_META_RESPONSE_INTERNAL_SERVER_ERROR,
-      FETCH_INTEGRATIONS_EMPTY_RESPONSE,
-    ])
-
-  t.snapshot(normalizeOutput(output))
-})
-
-test('Empty array of integrations are returned if failed to fetch integrations and if flag is false', async (t) => {
-  const { output } = await new Fixture('./fixtures/base')
-    .withFlags({
-      siteId: 'test',
-      mode: 'buildbot',
-      accountId: 'account1',
-      token: 'test',
-      featureFlags: {
-        error_builds_on_extension_fetch_fail: false,
-      },
     })
     .runConfigServer([
       SITE_INFO_DATA,