netlify-cli 17.6.0 → 17.8.0

package/src/commands/env/{env-clone.mjs → env-clone.js}

@@ -1,5 +1,5 @@
-import { chalk, error as logError, log } from '../../utils/command-helpers.mjs';
-import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.mjs';
+import { chalk, error as logError, log } from '../../utils/command-helpers.js';
+import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
 const safeGetSite = async (api, siteId) => {
     try {
@@ -11,68 +11,18 @@ const safeGetSite = async (api, siteId) => {
     }
 };
 /**
- * The env:clone command
- * @param {string} siteIdA Site (From)
- * @param {string} siteIdB Site (To)
- * @param {import('commander').OptionValues} options
- * @param {import('../base-command.mjs').default} command
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
-const envClone = async (options, command) => {
-    const { api, site } = command.netlify;
-    if (!site.id && !options.from) {
-        log('Please include the source site Id as the `--from` option, or run `netlify link` to link this folder to a Netlify site');
-        return false;
-    }
-    const siteId = {
-        from: options.from || site.id,
-        to: options.to,
-    };
-    const [{ data: siteFrom, error: errorFrom }, { data: siteTo, error: errorTo }] = await Promise.all([
-        safeGetSite(api, siteId.from),
-        safeGetSite(api, siteId.to),
-    ]);
-    if (errorFrom) {
-        logError(`Can't find site with id ${chalk.bold(siteId.from)}. Please make sure the site exists.`);
-        return false;
-    }
-    if (errorTo) {
-        logError(`Can't find site with id ${chalk.bold(siteId.to)}. Please make sure the site exists.`);
-        return false;
-    }
-    // determine if siteFrom and/or siteTo is on Envelope
-    let method;
-    if (!siteFrom.use_envelope && !siteTo.use_envelope) {
-        method = mongoToMongo;
-    }
-    else if (!siteFrom.use_envelope && siteTo.use_envelope) {
-        method = mongoToEnvelope;
-    }
-    else if (siteFrom.use_envelope && !siteTo.use_envelope) {
-        method = envelopeToMongo;
-    }
-    else {
-        method = envelopeToEnvelope;
-    }
-    const success = await method({ api, siteFrom, siteTo });
-    if (!success) {
-        return false;
-    }
-    log(`Successfully cloned environment variables from ${chalk.green(siteFrom.name)} to ${chalk.green(siteTo.name)}`);
-    return true;
-};
-/**
- * Copies the env from a site not configured with Envelope to a different site not configured with Envelope
+ * Copies the env from a site configured with Envelope to a site not configured with Envelope
  * @returns {Promise<boolean>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
-    const [{ build_settings: { env: envFrom = {} }, }, { build_settings: { env: envTo = {} }, },] = [siteFrom, siteTo];
+const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
+    const envelopeVariables = await api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id });
+    const envFrom = translateFromEnvelopeToMongo(envelopeVariables);
     if (Object.keys(envFrom).length === 0) {
         log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
         return false;
     }
+    const envTo = siteTo.build_settings.env || {};
     // Merge from site A to site B
     const mergedEnv = {
         ...envTo,
@@ -90,29 +40,31 @@ const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
     return true;
 };
 /**
- * Copies the env from a site not configured with Envelope to a site configured with Envelope
+ * Copies the env from a site configured with Envelope to a different site configured with Envelope
  * @returns {Promise<boolean>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
-    const envFrom = siteFrom.build_settings.env || {};
-    const keysFrom = Object.keys(envFrom);
-    if (Object.keys(envFrom).length === 0) {
+const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
+    const [envelopeFrom, envelopeTo] = await Promise.all([
+        api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id }),
+        api.getEnvVars({ accountId: siteTo.account_slug, siteId: siteTo.id }),
+    ]);
+    // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
+    const keysFrom = envelopeFrom.map(({ key }) => key);
+    if (keysFrom.length === 0) {
         log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
         return false;
     }
     const accountId = siteTo.account_slug;
     const siteId = siteTo.id;
-    const envelopeTo = await api.getEnvVars({ accountId, siteId });
     // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
     const envVarsToDelete = envelopeTo.filter(({ key }) => keysFrom.includes(key));
     // delete marked env vars in parallel
     // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
     await Promise.all(envVarsToDelete.map(({ key }) => api.deleteEnvVar({ accountId, siteId, key })));
     // hit create endpoint
-    const body = translateFromMongoToEnvelope(envFrom);
     try {
-        await api.createEnvVars({ accountId, siteId, body });
+        await api.createEnvVars({ accountId, siteId, body: envelopeFrom });
     }
     catch (error) {
         // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
@@ -121,18 +73,16 @@ const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
     return true;
 };
 /**
- * Copies the env from a site configured with Envelope to a site not configured with Envelope
+ * Copies the env from a site not configured with Envelope to a different site not configured with Envelope
  * @returns {Promise<boolean>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
-    const envelopeVariables = await api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id });
-    const envFrom = translateFromEnvelopeToMongo(envelopeVariables);
+const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
+    const [{ build_settings: { env: envFrom = {} }, }, { build_settings: { env: envTo = {} }, },] = [siteFrom, siteTo];
     if (Object.keys(envFrom).length === 0) {
         log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
         return false;
     }
-    const envTo = siteTo.build_settings.env || {};
     // Merge from site A to site B
     const mergedEnv = {
         ...envTo,
@@ -150,31 +100,29 @@ const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
     return true;
 };
 /**
- * Copies the env from a site configured with Envelope to a different site configured with Envelope
+ * Copies the env from a site not configured with Envelope to a site configured with Envelope
  * @returns {Promise<boolean>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
-    const [envelopeFrom, envelopeTo] = await Promise.all([
-        api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id }),
-        api.getEnvVars({ accountId: siteTo.account_slug, siteId: siteTo.id }),
-    ]);
-    // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
-    const keysFrom = envelopeFrom.map(({ key }) => key);
-    if (keysFrom.length === 0) {
+const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
+    const envFrom = siteFrom.build_settings.env || {};
+    const keysFrom = Object.keys(envFrom);
+    if (Object.keys(envFrom).length === 0) {
         log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`);
         return false;
     }
     const accountId = siteTo.account_slug;
     const siteId = siteTo.id;
+    const envelopeTo = await api.getEnvVars({ accountId, siteId });
     // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
     const envVarsToDelete = envelopeTo.filter(({ key }) => keysFrom.includes(key));
     // delete marked env vars in parallel
     // @ts-expect-error TS(7031) FIXME: Binding element 'key' implicitly has an 'any' type... Remove this comment to see the full error message
     await Promise.all(envVarsToDelete.map(({ key }) => api.deleteEnvVar({ accountId, siteId, key })));
     // hit create endpoint
+    const body = translateFromMongoToEnvelope(envFrom);
     try {
-        await api.createEnvVars({ accountId, siteId, body: envelopeFrom });
+        await api.createEnvVars({ accountId, siteId, body });
     }
     catch (error) {
         // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
@@ -182,17 +130,46 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
     }
     return true;
 };
-/**
- * Creates the `netlify env:clone` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createEnvCloneCommand = (program) => program
-    .command('env:clone')
-    .alias('env:migrate')
-    .option('-f, --from <from>', 'Site ID (From)')
-    .requiredOption('-t, --to <to>', 'Site ID (To)')
-    .description(`Clone environment variables from one site to another`)
-    .addExamples(['netlify env:clone --to <to-site-id>', 'netlify env:clone --to <to-site-id> --from <from-site-id>'])
-    .action(envClone);
+export const envClone = async (options, command) => {
+    const { api, site } = command.netlify;
+    if (!site.id && !options.from) {
+        log('Please include the source site Id as the `--from` option, or run `netlify link` to link this folder to a Netlify site');
+        return false;
+    }
+    const siteId = {
+        from: options.from || site.id,
+        to: options.to,
+    };
+    const [{ data: siteFrom, error: errorFrom }, { data: siteTo, error: errorTo }] = await Promise.all([
+        safeGetSite(api, siteId.from),
+        safeGetSite(api, siteId.to),
+    ]);
+    if (errorFrom) {
+        logError(`Can't find site with id ${chalk.bold(siteId.from)}. Please make sure the site exists.`);
+        return false;
+    }
+    if (errorTo) {
+        logError(`Can't find site with id ${chalk.bold(siteId.to)}. Please make sure the site exists.`);
+        return false;
+    }
+    // determine if siteFrom and/or siteTo is on Envelope
+    let method;
+    if (!siteFrom.use_envelope && !siteTo.use_envelope) {
+        method = mongoToMongo;
+    }
+    else if (!siteFrom.use_envelope && siteTo.use_envelope) {
+        method = mongoToEnvelope;
+    }
+    else if (siteFrom.use_envelope && !siteTo.use_envelope) {
+        method = envelopeToMongo;
+    }
+    else {
+        method = envelopeToEnvelope;
+    }
+    const success = await method({ api, siteFrom, siteTo });
+    if (!success) {
+        return false;
+    }
+    log(`Successfully cloned environment variables from ${chalk.green(siteFrom.name)} to ${chalk.green(siteTo.name)}`);
+    return true;
+};

package/src/commands/env/env-get.js

@@ -0,0 +1,34 @@
+import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
+import { AVAILABLE_CONTEXTS, getEnvelopeEnv } from '../../utils/env/index.js';
+export const envGet = async (name, options, command) => {
+    const { context, scope } = options;
+    const { api, cachedConfig, site } = command.netlify;
+    const siteId = site.id;
+    if (!siteId) {
+        log('No site id found, please run inside a site folder or `netlify link`');
+        return false;
+    }
+    const { siteInfo } = cachedConfig;
+    let { env } = cachedConfig;
+    if (siteInfo.use_envelope) {
+        env = await getEnvelopeEnv({ api, context, env, key: name, scope, siteInfo });
+    }
+    else if (context !== 'dev' || scope !== 'any') {
+        error(`To specify a context or scope, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
+        return false;
+    }
+    const { value } = env[name] || {};
+    // Return json response for piping commands
+    if (options.json) {
+        logJson(value ? { [name]: value } : {});
+        return false;
+    }
+    if (!value) {
+        const contextType = AVAILABLE_CONTEXTS.includes(context) ? 'context' : 'branch';
+        const withContext = `in the ${chalk.magenta(context)} ${contextType}`;
+        const withScope = scope === 'any' ? '' : ` and the ${chalk.magenta(scope)} scope`;
+        log(`No value set ${withContext}${withScope} for environment variable ${chalk.yellow(name)}`);
+        return false;
+    }
+    log(value);
+};

package/src/commands/env/{env-import.mjs → env-import.js}

@@ -1,53 +1,8 @@
 import { readFile } from 'fs/promises';
 import AsciiTable from 'ascii-table';
-import { Option } from 'commander';
 import dotenv from 'dotenv';
-import { exit, log, logJson } from '../../utils/command-helpers.mjs';
-import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.mjs';
-/**
- * The env:import command
- * @param {string} fileName .env file to import
- * @param {import('commander').OptionValues} options
- * @param {import('../base-command.mjs').default} command
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'fileName' implicitly has an 'any' type.
-const envImport = async (fileName, options, command) => {
-    const { api, cachedConfig, site } = command.netlify;
-    const siteId = site.id;
-    if (!siteId) {
-        log('No site id found, please run inside a site folder or `netlify link`');
-        return false;
-    }
-    let importedEnv = {};
-    try {
-        const envFileContents = await readFile(fileName, 'utf-8');
-        importedEnv = dotenv.parse(envFileContents);
-    }
-    catch (error) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        log(error.message);
-        exit(1);
-    }
-    if (Object.keys(importedEnv).length === 0) {
-        log(`No environment variables found in file ${fileName} to import`);
-        return false;
-    }
-    const { siteInfo } = cachedConfig;
-    const importIntoService = siteInfo.use_envelope ? importIntoEnvelope : importIntoMongo;
-    const finalEnv = await importIntoService({ api, importedEnv, options, siteInfo });
-    // Return new environment variables of site if using json flag
-    if (options.json) {
-        logJson(finalEnv);
-        return false;
-    }
-    // List newly imported environment variables in a table
-    log(`site: ${siteInfo.name}`);
-    const table = new AsciiTable(`Imported environment variables`);
-    table.setHeading('Key', 'Value');
-    table.addRowMatrix(Object.entries(importedEnv));
-    log(table.toString());
-};
+import { exit, log, logJson } from '../../utils/command-helpers.js';
+import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.js';
 /**
  * Updates the imported env in the site record
  * @returns {Promise<object>}
@@ -107,21 +62,39 @@ const importIntoEnvelope = async ({ api, importedEnv, options, siteInfo }) => {
         ...importedEnv,
     };
 };
-/**
- * Creates the `netlify env:import` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createEnvImportCommand = (program) => program
-    .command('env:import')
-    .argument('<fileName>', '.env file to import')
-    .addOption(new Option('-r --replaceExisting', 'Old, prefer --replace-existing. Replace all existing variables instead of merging them with the current ones')
-    .default(false)
-    .hideHelp(true))
-    .option('-r, --replace-existing', 'Replace all existing variables instead of merging them with the current ones', false)
-    .description('Import and set environment variables from .env file')
-    // @ts-expect-error TS(7006) FIXME: Parameter 'fileName' implicitly has an 'any' type.
-    .action(async (fileName, options, command) => {
-    await envImport(fileName, options, command);
-});
+export const envImport = async (fileName, options, command) => {
+    const { api, cachedConfig, site } = command.netlify;
+    const siteId = site.id;
+    if (!siteId) {
+        log('No site id found, please run inside a site folder or `netlify link`');
+        return false;
+    }
+    let importedEnv = {};
+    try {
+        const envFileContents = await readFile(fileName, 'utf-8');
+        importedEnv = dotenv.parse(envFileContents);
+    }
+    catch (error) {
+        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+        log(error.message);
+        exit(1);
+    }
+    if (Object.keys(importedEnv).length === 0) {
+        log(`No environment variables found in file ${fileName} to import`);
+        return false;
+    }
+    const { siteInfo } = cachedConfig;
+    const importIntoService = siteInfo.use_envelope ? importIntoEnvelope : importIntoMongo;
+    const finalEnv = await importIntoService({ api, importedEnv, options, siteInfo });
+    // Return new environment variables of site if using json flag
+    if (options.json) {
+        logJson(finalEnv);
+        return false;
+    }
+    // List newly imported environment variables in a table
+    log(`site: ${siteInfo.name}`);
+    const table = new AsciiTable(`Imported environment variables`);
+    table.setHeading('Key', 'Value');
+    table.addRowMatrix(Object.entries(importedEnv));
+    log(table.toString());
+};

package/src/commands/env/{env-list.mjs → env-list.js}

@@ -1,11 +1,10 @@
 import ansiEscapes from 'ansi-escapes';
 import AsciiTable from 'ascii-table';
 import { isCI } from 'ci-info';
-import { Option } from 'commander';
 import inquirer from 'inquirer';
 import logUpdate from 'log-update';
-import { chalk, error, log, logJson } from '../../utils/command-helpers.mjs';
-import { AVAILABLE_CONTEXTS, getEnvelopeEnv, getHumanReadableScopes, normalizeContext } from '../../utils/env/index.mjs';
+import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
+import { AVAILABLE_CONTEXTS, getEnvelopeEnv, getHumanReadableScopes } from '../../utils/env/index.js';
 const MASK_LENGTH = 50;
 const MASK = '*'.repeat(MASK_LENGTH);
 // @ts-expect-error TS(7031) FIXME: Binding element 'environment' implicitly has an 'a... Remove this comment to see the full error message
@@ -25,14 +24,7 @@ const getTable = ({ environment, hideValues, scopesColumn }) => {
     ].filter(Boolean)));
     return table.toString();
 };
-/**
- * The env:list command
- * @param {import('commander').OptionValues} options
- * @param {import('../base-command.mjs').default} command
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
-const envList = async (options, command) => {
+export const envList = async (options, command) => {
     const { context, scope } = options;
     const { api, cachedConfig, site } = command.netlify;
     const siteId = site.id;
@@ -101,29 +93,3 @@ const envList = async (options, command) => {
         log(`${chalk.cyan('?')} Show values? ${chalk.cyan('Yes')}`);
     }
 };
-/**
- * Creates the `netlify env:list` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createEnvListCommand = (program) => program
-    .command('env:list')
-    .option('-c, --context <context>', 'Specify a deploy context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev")', normalizeContext, 'dev')
-    .option('--json', 'Output environment variables as JSON')
-    .addOption(new Option('--plain', 'Output environment variables as plaintext').conflicts('json'))
-    .addOption(new Option('-s, --scope <scope>', 'Specify a scope')
-    .choices(['builds', 'functions', 'post-processing', 'runtime', 'any'])
-    .default('any'))
-    .addExamples([
-    'netlify env:list # list variables with values in the dev context and with any scope',
-    'netlify env:list --context production',
-    'netlify env:list --context branch:staging',
-    'netlify env:list --scope functions',
-    'netlify env:list --plain',
-])
-    .description('Lists resolved environment variables for site (includes netlify.toml)')
-    // @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
-    .action(async (options, command) => {
-    await envList(options, command);
-});

package/src/commands/env/{env-set.mjs → env-set.js}

@@ -1,49 +1,5 @@
-import { Option } from 'commander';
-import { chalk, error, log, logJson } from '../../utils/command-helpers.mjs';
-import { AVAILABLE_CONTEXTS, AVAILABLE_SCOPES, normalizeContext, translateFromEnvelopeToMongo, } from '../../utils/env/index.mjs';
-/**
- * The env:set command
- * @param {string} key Environment variable key
- * @param {string} value Value to set to
- * @param {import('commander').OptionValues} options
- * @param {import('../base-command.mjs').default} command
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
-const envSet = async (key, value, options, command) => {
-    const { context, scope, secret } = options;
-    const { api, cachedConfig, site } = command.netlify;
-    const siteId = site.id;
-    if (!siteId) {
-        log('No site id found, please run inside a site folder or `netlify link`');
-        return false;
-    }
-    const { siteInfo } = cachedConfig;
-    let finalEnv;
-    // Get current environment variables set in the UI
-    if (siteInfo.use_envelope) {
-        finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope, secret });
-    }
-    else if (context || scope) {
-        error(`To specify a context or scope, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
-        return false;
-    }
-    else {
-        finalEnv = await setInMongo({ api, siteInfo, key, value });
-    }
-    if (!finalEnv) {
-        return false;
-    }
-    // Return new environment variables of site if using json flag
-    if (options.json) {
-        logJson(finalEnv);
-        return false;
-    }
-    const withScope = scope ? ` scoped to ${chalk.white(scope)}` : '';
-    const withSecret = secret ? ` as a ${chalk.blue('secret')}` : '';
-    const contextType = AVAILABLE_CONTEXTS.includes(context || 'all') ? 'context' : 'branch';
-    log(`Set environment variable ${chalk.yellow(`${key}${value && !secret ? `=${value}` : ''}`)}${withScope}${withSecret} in the ${chalk.magenta(context || 'all')} ${contextType}`);
-};
+import { chalk, error, log, logJson } from '../../utils/command-helpers.js';
+import { AVAILABLE_CONTEXTS, AVAILABLE_SCOPES, translateFromEnvelopeToMongo } from '../../utils/env/index.js';
 /**
  * Updates the env for a site record with a new key/value pair
  * @returns {Promise<object>}
@@ -157,38 +113,37 @@ const setInEnvelope = async ({ api, context, key, scope, secret, siteInfo, value
         [key]: value || env[key],
     };
 };
-/**
- * Creates the `netlify env:set` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createEnvSetCommand = (program) => program
-    .command('env:set')
-    .argument('<key>', 'Environment variable key')
-    .argument('[value]', 'Value to set to', '')
-    .option('-c, --context <context...>', 'Specify a deploy context or branch (contexts: "production", "deploy-preview", "branch-deploy", "dev") (default: all contexts)', 
-// spread over an array for variadic options
-// @ts-expect-error TS(7006) FIXME: Parameter 'context' implicitly has an 'any' type.
-(context, previous = []) => [...previous, normalizeContext(context)])
-    .addOption(new Option('-s, --scope <scope...>', 'Specify a scope (default: all scopes)').choices([
-    'builds',
-    'functions',
-    'post-processing',
-    'runtime',
-]))
-    .option('--secret', 'Indicate whether the environment variable value can be read again.')
-    .description('Set value of environment variable')
-    .addExamples([
-    'netlify env:set VAR_NAME value # set in all contexts and scopes',
-    'netlify env:set VAR_NAME value --context production',
-    'netlify env:set VAR_NAME value --context production deploy-preview',
-    'netlify env:set VAR_NAME value --context production --secret',
-    'netlify env:set VAR_NAME value --scope builds',
-    'netlify env:set VAR_NAME value --scope builds functions',
-    'netlify env:set VAR_NAME --secret # convert existing variable to secret',
-])
-    // @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
-    .action(async (key, value, options, command) => {
-    await envSet(key, value, options, command);
-});
+export const envSet = async (key, value, options, command) => {
+    const { context, scope, secret } = options;
+    const { api, cachedConfig, site } = command.netlify;
+    const siteId = site.id;
+    if (!siteId) {
+        log('No site id found, please run inside a site folder or `netlify link`');
+        return false;
+    }
+    const { siteInfo } = cachedConfig;
+    let finalEnv;
+    // Get current environment variables set in the UI
+    if (siteInfo.use_envelope) {
+        finalEnv = await setInEnvelope({ api, siteInfo, key, value, context, scope, secret });
+    }
+    else if (context || scope) {
+        error(`To specify a context or scope, please run ${chalk.yellow('netlify open:admin')} to open the Netlify UI and opt in to the new environment variables experience from Site settings`);
+        return false;
+    }
+    else {
+        finalEnv = await setInMongo({ api, siteInfo, key, value });
+    }
+    if (!finalEnv) {
+        return false;
+    }
+    // Return new environment variables of site if using json flag
+    if (options.json) {
+        logJson(finalEnv);
+        return false;
+    }
+    const withScope = scope ? ` scoped to ${chalk.white(scope)}` : '';
+    const withSecret = secret ? ` as a ${chalk.blue('secret')}` : '';
+    const contextType = AVAILABLE_CONTEXTS.includes(context || 'all') ? 'context' : 'branch';
+    log(`Set environment variable ${chalk.yellow(`${key}${value && !secret ? `=${value}` : ''}`)}${withScope}${withSecret} in the ${chalk.magenta(context || 'all')} ${contextType}`);
+};