@netlify/config 20.5.1 → 20.6.0

package/lib/api/site_info.js

@@ -1,3 +1,4 @@
+import fetch from 'node-fetch';
 import { getEnvelope } from '../env/envelope.js';
 import { throwUserError } from '../error.js';
 import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
@@ -8,21 +9,22 @@ import { ERROR_CALL_TO_ACTION } from '../log/messages.js';
 // Requires knowing the `siteId` and having the access `token`.
 // 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, mode, siteFeatureFlagPrefix, testOpts: { env: testEnv = true } = {}, }) {
+export const getSiteInfo = async function ({ api, siteId, mode, siteFeatureFlagPrefix, featureFlags = {}, testOpts: { env: testEnv = true } = {}, }) {
     if (api === undefined || mode === 'buildbot' || !testEnv) {
         const siteInfo = siteId === undefined ? {} : { id: siteId };
         return { siteInfo, accounts: [], addons: [] };
     }
-    const [siteInfo, accounts, addons] = await Promise.all([
-        getSite(api, siteId, siteFeatureFlagPrefix),
-        getAccounts(api),
-        getAddons(api, siteId),
-    ]);
+    const fetchIntegrations = featureFlags.buildbot_fetch_integrations;
+    const promises = [getSite(api, siteId, siteFeatureFlagPrefix), getAccounts(api), getAddons(api, siteId)];
+    if (fetchIntegrations) {
+        promises.push(getIntegrations({ api, ownerType: 'site', ownerId: siteId }));
+    }
+    const [siteInfo, accounts, addons, integrations = []] = await Promise.all(promises);
     if (siteInfo.use_envelope) {
         const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId });
         siteInfo.build_settings.env = envelope;
     }
-    return { siteInfo, accounts, addons };
+    return { siteInfo, accounts, addons, integrations: integrations ?? [] };
 };
 const getSite = async function (api, siteId, siteFeatureFlagPrefix = null) {
     if (siteId === undefined) {
@@ -57,3 +59,22 @@ const getAddons = async function (api, siteId) {
         throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`);
     }
 };
+const getIntegrations = async function ({ api, ownerType, ownerId }) {
+    if (ownerId === undefined) {
+        return [];
+    }
+    try {
+        const token = api.accessToken();
+        const response = await fetch(`https://api.netlifysdk.com/${ownerType}/${ownerId}/integrations`, {
+            headers: {
+                Authorization: `Bearer ${token}`,
+            },
+        });
+        const integrations = await response.json();
+        return Array.isArray(integrations) ? integrations : [];
+    }
+    catch (error) {
+        // for now, we'll just ignore errors, as this is early days
+        return [];
+    }
+};

package/lib/edge_functions.js

@@ -3,13 +3,19 @@ const cacheValues = ['manual', 'off'];
 export const validations = [
     {
         property: 'edge_functions.*',
-        ...validProperties(['path', 'function', 'cache'], []),
+        ...validProperties(['path', 'excludedPath', 'pattern', 'excludedPattern', 'function', 'cache'], []),
         example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
     },
     {
         property: 'edge_functions.*',
-        check: (edgeFunction) => edgeFunction.path !== undefined,
-        message: '"path" property is required.',
+        check: (edgeFunction) => edgeFunction.path !== undefined || edgeFunction.pattern !== undefined,
+        message: 'either "path" or "pattern" is required.',
+        example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
+    },
+    {
+        property: 'edge_functions.*',
+        check: (edgeFunction) => !(edgeFunction.path !== undefined && edgeFunction.pattern !== undefined),
+        message: '"path" and "pattern" are mutually exclusive.',
         example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
     },
     {
@@ -24,6 +30,44 @@ export const validations = [
         message: 'must be a string.',
         example: () => ({ edge_functions: [{ path: '/hello', function: 'hello' }] }),
     },
+    {
+        property: 'edge_functions.*.excludedPath',
+        check: (value) => isString(value) || (Array.isArray(value) && value.every(isString)),
+        message: 'must be a string or array of strings.',
+        example: () => ({
+            edge_functions: [{ path: '/products/*', excludedPath: ['/products/*.jpg'], function: 'customise' }],
+        }),
+    },
+    {
+        property: 'edge_functions.*',
+        check: (value) => value.excludedPath === undefined || value.path !== undefined,
+        message: '"excludedPath" can only be specified together with "path".',
+        example: () => ({
+            edge_functions: [{ path: '/products/*', excludedPath: ['/products/*.jpg'], function: 'customise' }],
+        }),
+    },
+    {
+        property: 'edge_functions.*.pattern',
+        check: isString,
+        message: 'must be a string.',
+        example: () => ({ edge_functions: [{ pattern: '/hello/(.*)', function: 'hello' }] }),
+    },
+    {
+        property: 'edge_functions.*.excludedPattern',
+        check: (value) => isString(value) || (Array.isArray(value) && value.every(isString)),
+        message: 'must be a string or array of strings.',
+        example: () => ({
+            edge_functions: [{ path: '/products/(.*)', excludedPath: ['/products/(.*)\\.jpg'], function: 'customise' }],
+        }),
+    },
+    {
+        property: 'edge_functions.*.excludedPattern',
+        check: (value) => value.excludedPattern === undefined || value.pattern !== undefined,
+        message: '"excludedPattern" can only be specified together with "pattern".',
+        example: () => ({
+            edge_functions: [{ path: '/products/(.*)', excludedPath: ['/products/(.*)\\.jpg'], function: 'customise' }],
+        }),
+    },
     {
         property: 'edge_functions.*.function',
         check: isString,

package/lib/main.js

@@ -29,7 +29,14 @@ export const resolveConfig = async function (opts) {
         return parsedCachedConfig;
     }
     const { config: configOpt, defaultConfig, inlineConfig, configMutations, cwd, context, repositoryRoot, base, branch, siteId, deployId, buildId, baseRelDir, mode, debug, logs, featureFlags, } = await normalizeOpts(optsA);
-    const { siteInfo, accounts, addons } = await getSiteInfo({ api, siteId, mode, testOpts, siteFeatureFlagPrefix });
+    const { siteInfo, accounts, addons, integrations } = await getSiteInfo({
+        api,
+        siteId,
+        mode,
+        testOpts,
+        siteFeatureFlagPrefix,
+        featureFlags,
+    });
     const { defaultConfig: defaultConfigA, baseRelDir: baseRelDirA } = parseDefaultConfig({
         defaultConfig,
         base,
@@ -68,6 +75,7 @@ export const resolveConfig = async function (opts) {
     const configA = addLegacyFunctionsDirectory(config);
     const result = {
         siteInfo,
+        integrations,
         accounts,
         addons,
         env,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/config",
-  "version": "20.5.1",
+  "version": "20.6.0",
   "description": "Netlify config module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -70,9 +70,10 @@
     "is-plain-obj": "^4.0.0",
     "js-yaml": "^4.0.0",
     "map-obj": "^5.0.0",
-    "netlify": "^13.1.9",
+    "netlify": "^13.1.10",
     "netlify-headers-parser": "^7.1.2",
     "netlify-redirect-parser": "^14.1.3",
+    "node-fetch": "^3.3.1",
     "omit.js": "^2.0.2",
     "p-locate": "^6.0.0",
     "path-type": "^5.0.0",
@@ -82,7 +83,7 @@
     "yargs": "^17.6.0"
   },
   "devDependencies": {
-    "@types/node": "^18.14.2",
+    "@types/node": "^14.18.53",
     "ava": "^4.0.0",
     "c8": "^7.12.0",
     "has-ansi": "^5.0.0",
@@ -93,5 +94,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "a6c1b829ea47b4600dae206cdc5df2dda7296eed"
+  "gitHead": "34f833bce745039add76a082f8dcfd682f9f7de0"
 }