@netlify/config 20.21.6 → 20.22.0

package/lib/api/site_info.d.ts

@@ -10,6 +10,7 @@ type GetSiteInfoOpts = {
     featureFlags?: Record<string, boolean>;
     testOpts?: TestOptions;
     siteFeatureFlagPrefix: string;
+    token: string;
 };
 /**
  * Retrieve Netlify Site information, if available.
@@ -20,7 +21,7 @@ type GetSiteInfoOpts = {
  * Silently ignore API errors. For example the network connection might be down,
  * but local builds should still work regardless.
  */
-export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, siteFeatureFlagPrefix, featureFlags, }: GetSiteInfoOpts) => Promise<{
+export declare const getSiteInfo: ({ api, siteId, accountId, mode, context, offline, testOpts, siteFeatureFlagPrefix, token, featureFlags, }: GetSiteInfoOpts) => Promise<{
     siteInfo: any;
     accounts: any;
     addons: any;

package/lib/api/site_info.js

@@ -11,9 +11,8 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
  * Silently ignore API errors. For example the network connection might be down,
  * but local builds should still work regardless.
  */
-export const getSiteInfo = async function ({ api, siteId, accountId, mode, context, offline = false, testOpts = {}, siteFeatureFlagPrefix, featureFlags = {}, }) {
+export const getSiteInfo = async function ({ api, siteId, accountId, mode, context, offline = false, testOpts = {}, siteFeatureFlagPrefix, token, featureFlags = {}, }) {
     const { env: testEnv = false } = testOpts;
-    const errorOnExtensionFetchFail = featureFlags.error_builds_on_extension_fetch_fail;
     if (api === undefined || mode === 'buildbot' || testEnv) {
         const siteInfo = {};
         if (siteId !== undefined)
@@ -21,7 +20,7 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
         if (accountId !== undefined)
             siteInfo.account_id = accountId;
         const integrations = mode === 'buildbot' && !offline
-            ? await getIntegrations({ siteId, testOpts, offline, accountId, errorOnExtensionFetchFail })
+            ? await getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags })
             : [];
         return { siteInfo, accounts: [], addons: [], integrations };
     }
@@ -29,7 +28,7 @@ export const getSiteInfo = async function ({ api, siteId, accountId, mode, conte
         getSite(api, siteId, siteFeatureFlagPrefix),
         getAccounts(api),
         getAddons(api, siteId),
-        getIntegrations({ siteId, testOpts, offline, accountId, errorOnExtensionFetchFail }),
+        getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags }),
     ];
     const [siteInfo, accounts, addons, integrations] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
@@ -71,39 +70,36 @@ const getAddons = async function (api, siteId) {
         throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
-const getIntegrations = async function ({ siteId, accountId, testOpts, offline, errorOnExtensionFetchFail, }) {
+const getIntegrations = async function ({ siteId, accountId, testOpts, offline, token, featureFlags, }) {
     if (!siteId || offline) {
         return [];
     }
+    const sendBuildBotTokenToJigsaw = featureFlags?.send_build_bot_token_to_jigsaw;
     const { host } = testOpts;
     const baseUrl = new URL(host ? `http://${host}` : `https://api.netlifysdk.com`);
     // if accountId isn't present, use safe v1 endpoint
     const url = accountId
         ? `${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 : [];
+    try {
+        const requestOptions = {};
+        if (sendBuildBotTokenToJigsaw && token) {
+            requestOptions.headers = {
+                'netlify-sdk-build-bot-token': token,
+            };
         }
-        catch (error) {
-            return throwUserError(`Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
+        const response = await fetch(url, requestOptions);
+        if (!response.ok) {
+            throw new Error(`Unexpected status code ${response.status} from fetching extensions`);
         }
-    }
-    try {
-        const response = await fetch(url);
-        const integrations = await response.json();
+        const bodyText = await response.text();
+        if (bodyText === '') {
+            return [];
+        }
+        const integrations = await JSON.parse(bodyText);
         return Array.isArray(integrations) ? integrations : [];
     }
     catch (error) {
-        return [];
+        return throwUserError(`Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };

package/lib/main.js

@@ -45,6 +45,7 @@ export const resolveConfig = async function (opts) {
         offline,
         featureFlags,
         testOpts,
+        token,
     });
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
         defaultConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.21.6",
+  "version": "20.22.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -74,7 +74,7 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.3.2",
+    "netlify": "^13.3.3",
     "node-fetch": "^3.3.1",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
@@ -95,5 +95,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "269e3fe56ea6a36062302df981793e9fe12db324"
+  "gitHead": "b1de419113daee962ab37b1e75bcfc0d32f778e7"
 }