netlify-cli 8.4.3 → 8.6.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.4.3",
+  "version": "8.6.2",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -78,7 +78,7 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{js,md,yml,json,html}\" \"*.{js,yml,json,html}\" \".*.{js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^26.0.2",
+    "@netlify/build": "^26.1.0",
     "@netlify/config": "^17.0.2",
     "@netlify/framework-info": "^7.0.0",
     "@netlify/local-functions-proxy": "^1.1.1",
@@ -88,6 +88,7 @@
     "@netlify/zip-it-and-ship-it": "5.3.1",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
+    "ansi-escapes": "^5.0.0",
     "ansi-styles": "^5.0.0",
     "ascii-table": "0.0.9",
     "backoff": "^2.5.0",
@@ -140,6 +141,7 @@
     "locate-path": "^6.0.0",
     "lodash": "^4.17.20",
     "log-symbols": "^4.0.0",
+    "log-update": "^5.0.0",
     "make-dir": "^3.0.0",
     "memoize-one": "^6.0.0",
     "minimist": "^1.2.5",
@@ -192,7 +194,7 @@
     "@babel/preset-react": "^7.12.13",
     "@commitlint/cli": "^16.0.0",
     "@commitlint/config-conventional": "^16.0.0",
-    "@netlify/eslint-config-node": "^4.0.4",
+    "@netlify/eslint-config-node": "^4.0.5",
     "ava": "^3.15.0",
     "eslint-plugin-sort-destructure-keys": "^1.3.5",
     "fast-glob": "^3.2.7",

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

@@ -1,8 +1,22 @@
 // @ts-check
 const AsciiTable = require('ascii-table')
+const { isCI } = require('ci-info')
+const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
-const { log, logJson } = require('../../utils')
+const { chalk, log, logJson } = require('../../utils')
+
+const [logUpdatePromise, ansiEscapesPromise] = [import('log-update'), import('ansi-escapes')]
+
+const MASK_LENGTH = 50
+const MASK = '*'.repeat(MASK_LENGTH)
+
+const getTable = ({ environment, hideValues }) => {
+  const table = new AsciiTable(`Environment variables`)
+  table.setHeading('Key', 'Value')
+  table.addRowMatrix(Object.entries(environment).map(([key, value]) => [key, hideValues ? MASK : value]))
+  return table.toString()
+}
 
 /**
  * The env:list command
@@ -34,17 +48,37 @@ const envList = async (options, command) => {
   }
 
   if (isEmpty(environment)) {
-    log(`No environment variables set for site ${siteData.name}`)
+    log(`No environment variables set for site ${chalk.greenBright(siteData.name)}`)
     return false
   }
 
-  // List environment variables using a table
-  log(`site: ${siteData.name}`)
-  const table = new AsciiTable(`Environment variables`)
+  // List environment in a table
+  log(`Listing environment variables for site: ${chalk.greenBright(siteData.name)}`)
 
-  table.setHeading('Key', 'Value')
-  table.addRowMatrix(Object.entries(environment))
-  log(table.toString())
+  if (isCI) {
+    log(getTable({ environment, hideValues: false }))
+    return false
+  }
+
+  const { default: logUpdate } = await logUpdatePromise
+
+  logUpdate(getTable({ environment, hideValues: true }))
+  const { showValues } = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'showValues',
+      message: 'Show values?',
+      default: false,
+    },
+  ])
+
+  if (showValues) {
+    const { default: ansiEscapes } = await ansiEscapesPromise
+    // since inquirer adds a prompt, we need to account for it when printing the table again
+    log(ansiEscapes.eraseLines(3))
+    logUpdate(getTable({ environment, hideValues: false }))
+    log(`${chalk.cyan('?')} Show values? ${chalk.cyan('Yes')}`)
+  }
 }
 
 /**

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

@@ -0,0 +1,108 @@
+// @ts-check
+
+const { isEmpty } = require('lodash')
+
+const { chalk, error: logError, log } = require('../../utils')
+
+const safeGetSite = async (api, siteId) => {
+  try {
+    const data = await api.getSite({ siteId })
+    return { data }
+  } catch (error) {
+    return { error }
+  }
+}
+
+/**
+ * The env:migrate command
+ * @param {string} siteIdA Site (From)
+ * @param {string} siteIdB Site (To)
+ * @param {import('commander').OptionValues} options
+ * @param {import('../base-command').BaseCommand} command
+ * @returns {Promise<boolean>}
+ */
+const envMigrate = 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
+  }
+
+  const [
+    {
+      build_settings: { env: envFrom = {} },
+    },
+    {
+      build_settings: { env: envTo = {} },
+    },
+  ] = [siteFrom, siteTo]
+
+  if (isEmpty(envFrom)) {
+    log(`${chalk.greenBright(siteFrom.name)} has no environment variables, nothing to migrate`)
+    return false
+  }
+
+  // Merge from site A to site B
+  const mergedEnv = {
+    ...envTo,
+    ...envFrom,
+  }
+
+  // Apply environment variable updates
+  await api.updateSite({
+    siteId: siteId.to,
+    body: {
+      build_settings: {
+        env: mergedEnv,
+      },
+    },
+  })
+
+  log(
+    `Successfully migrated environment variables from ${chalk.greenBright(siteFrom.name)} to ${chalk.greenBright(
+      siteTo.name,
+    )}`,
+  )
+}
+
+/**
+ * Creates the `netlify env:migrate` command
+ * @param {import('../base-command').BaseCommand} program
+ * @returns
+ */
+const createEnvMigrateCommand = (program) =>
+  program
+    .command('env:migrate')
+    .option('-f, --from <from>', 'Site ID (From)')
+    .requiredOption('-t, --to <to>', 'Site ID (To)')
+    .description(`Migrate environment variables from one site to another`)
+    .addExamples([
+      'netlify env:migrate --to <to-site-id>',
+      'netlify env:migrate --to <to-site-id> --from <from-site-id>',
+    ])
+    .action(envMigrate)
+
+module.exports = { createEnvMigrateCommand }

package/src/commands/env/env.js

@@ -2,6 +2,7 @@
 const { createEnvGetCommand } = require('./env-get')
 const { createEnvImportCommand } = require('./env-import')
 const { createEnvListCommand } = require('./env-list')
+const { createEnvMigrateCommand } = require('./env-migrate')
 const { createEnvSetCommand } = require('./env-set')
 const { createEnvUnsetCommand } = require('./env-unset')
 
@@ -25,6 +26,7 @@ const createEnvCommand = (program) => {
   createEnvListCommand(program)
   createEnvSetCommand(program)
   createEnvUnsetCommand(program)
+  createEnvMigrateCommand(program)
 
   return program
     .command('env')
@@ -35,6 +37,7 @@ const createEnvCommand = (program) => {
       'netlify env:set VAR_NAME value',
       'netlify env:unset VAR_NAME',
       'netlify env:import fileName',
+      'netlify env:migrate --to <to-site-id>',
     ])
     .action(env)
 }

package/src/functions-templates/rust/hello-world/Cargo.toml

@@ -7,7 +7,7 @@ version = "0.1.0"
 
 [dependencies]
 aws_lambda_events = "0.5.0"
-http = "0.2.5"
+http = "0.2.6"
 lambda_runtime = "0.4.1"
 log = "0.4.14"
 simple_logger = "1.16.0"

package/src/functions-templates/typescript/hello-world/package-lock.json

@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@netlify/functions": "^0.10.0",
-        "@types/node": "^14.18.3",
+        "@types/node": "^14.18.4",
         "typescript": "^4.0.0"
       }
     },
@@ -26,9 +26,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.3.tgz",
-      "integrity": "sha512-GtTH2crF4MtOIrrAa+jgTV9JX/PfoUCYr6MiZw7O/dkZu5b6gm5dc1nAL0jwGo4ortSBBtGyeVaxdC8X6V+pLg=="
+      "version": "14.18.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.4.tgz",
+      "integrity": "sha512-swe3lD4izOJWHuxvsZdDFRq6S9i6koJsXOnQKYekhSO5JTizMVirUFgY/bUsaOJQj8oSD4oxmRYPBM/0b6jpdw=="
     },
     "node_modules/is-promise": {
       "version": "4.0.0",
@@ -58,9 +58,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.3.tgz",
-      "integrity": "sha512-GtTH2crF4MtOIrrAa+jgTV9JX/PfoUCYr6MiZw7O/dkZu5b6gm5dc1nAL0jwGo4ortSBBtGyeVaxdC8X6V+pLg=="
+      "version": "14.18.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.4.tgz",
+      "integrity": "sha512-swe3lD4izOJWHuxvsZdDFRq6S9i6koJsXOnQKYekhSO5JTizMVirUFgY/bUsaOJQj8oSD4oxmRYPBM/0b6jpdw=="
     },
     "is-promise": {
       "version": "4.0.0",

package/src/utils/deploy/upload-files.js

@@ -105,7 +105,7 @@ const retryUpload = (uploadFn, maxRetry) =>
       reject(lastError)
     })
 
-    tryUpload(0, 0)
+    tryUpload()
   })
 
 module.exports = { uploadFiles }

package/src/utils/rules-proxy.js

@@ -73,7 +73,7 @@ const createRewriter = async function ({ configPath, distDir, jwtRoleClaim, jwtS
     const cookieValues = cookie.parse(req.headers.cookie || '')
     const headers = {
       'x-language': cookieValues.nf_lang || getLanguage(req.headers),
-      'x-country': cookieValues.nf_country || getCountry(req),
+      'x-country': cookieValues.nf_country || getCountry(),
       ...req.headers,
     }