@automattic/vip 2.16.0 → 2.17.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 
+### 2.17.0 (06 Sep 2022)
+- #1093 [dev-env] use latest proxy image
+- #1091 Extract http helper into standalone function
+- #1090 Add tracking to software update
+- #1083 Software Management: Update
+- #1089 [dev-env] Fix wording in wizard
+
 ### 2.16.0 (29 Aug 2022)
 
 - #1086	Add tracking to config software get

package/CONTRIBUTING.md

@@ -85,7 +85,7 @@ Prepare the release by making sure that:
 
 ```
 export LAST_RELEASE_DATE=2021-08-25T13:40:00+02
-gh pr list --search "is:merged sort:updated-desc closed:>$LAST_RELEASE_DATE" | sed -e 's/\s*\S\+\s*\S\+\s*$//' -e 's/^/- #/'
+gh pr list --search "is:merged sort:updated-desc closed:>$LAST_RELEASE_DATE" | sed -e 's/\s\+\S\+\tMERGED.*$//' -e 's/^/- #/'
 ```
 
 Then, let's publish:

package/dist/bin/vip-config-software-get.js

@@ -22,7 +22,7 @@ var _format = require("../lib/cli/format");
 
 var _software = require("../lib/config/software");
 
-var _userError = _interopRequireDefault(require("../lib/cli/userError"));
+var _userError = _interopRequireDefault(require("../lib/user-error"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

package/dist/bin/vip-config-software-update.js

@@ -0,0 +1,147 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _debug = _interopRequireDefault(require("debug"));
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+
+var _software = require("../lib/config/software");
+
+var _progress = require("../lib/cli/progress");
+
+var _userError = _interopRequireDefault(require("../lib/user-error"));
+
+var _tracker = require("../lib/tracker");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Internal dependencies
+ */
+const debug = (0, _debug.default)('@automattic/vip:bin:config-software');
+const UPDATE_SOFTWARE_PROGRESS_STEPS = [{
+  id: 'trigger',
+  name: 'Trigger software update'
+}, {
+  id: 'process',
+  name: 'Process software update'
+}];
+const cmd = (0, _command.default)({
+  appContext: true,
+  appQuery: _software.appQuery,
+  appQueryFragments: _software.appQueryFragments,
+  envContext: true,
+  wildcardCommand: true,
+  usage: 'vip config software update <wordpress|php|nodejs|muplugins> <version>'
+}).examples([{
+  usage: 'vip config software update wordpress 6.0',
+  description: 'Update WordPress to 6.0.x'
+}, {
+  usage: 'vip config software update nodejs 16',
+  description: 'Update Node.js to v16'
+}]);
+cmd.option('force', 'Auto-confirm update');
+cmd.argv(process.argv, async (arg, opt) => {
+  const {
+    app,
+    env
+  } = opt;
+  const {
+    softwareSettings
+  } = env;
+  const baseTrackingInfo = {
+    environment_id: env === null || env === void 0 ? void 0 : env.id,
+    args: JSON.stringify(arg)
+  };
+  await (0, _tracker.trackEvent)('config_software_update_execute', baseTrackingInfo);
+  let updateData = {};
+
+  try {
+    if (softwareSettings === null) {
+      throw new _userError.default('Software settings are not supported for this environment.');
+    }
+
+    const updateOptions = {
+      force: !!opt.force
+    };
+
+    if (arg.length > 0) {
+      updateOptions.component = arg[0];
+    }
+
+    if (arg.length > 1) {
+      updateOptions.version = arg[1];
+    }
+
+    updateData = await (0, _software.promptForUpdate)(app.typeId, updateOptions, softwareSettings);
+    const hasProcessJob = updateData.component !== 'nodejs';
+    const steps = hasProcessJob ? UPDATE_SOFTWARE_PROGRESS_STEPS : [UPDATE_SOFTWARE_PROGRESS_STEPS[0]];
+    const progressTracker = new _progress.ProgressTracker(steps);
+    progressTracker.startPrinting();
+    progressTracker.stepRunning('trigger');
+    const triggerResult = await (0, _software.triggerUpdate)({
+      appId: app.id,
+      envId: env.id,
+      ...updateData
+    });
+    debug('Triggered update with result', triggerResult);
+    progressTracker.stepSuccess('trigger');
+
+    if (hasProcessJob) {
+      const {
+        ok,
+        errorMessage
+      } = await (0, _software.getUpdateResult)(app.id, env.id);
+
+      if (ok) {
+        progressTracker.stepSuccess('process');
+      } else {
+        progressTracker.stepFailed('process');
+      }
+
+      progressTracker.print();
+      progressTracker.stopPrinting();
+
+      if (ok) {
+        console.log(_chalk.default.green('✓') + ' Software update complete');
+      } else {
+        throw Error(errorMessage);
+      }
+    } else {
+      progressTracker.print();
+      progressTracker.stopPrinting();
+      const deploymentsLink = `https://dashboard.wpvip.com/apps/${app.id}/${env.uniqueLabel}/deploys`;
+      const message = ` A new build of the application code has been initiated and will be deployed using Node.js v${updateData.version} when the build is successful\n` + `View the deployments page in VIP Dashboard for progress updates. - ${deploymentsLink}`;
+      console.log(_chalk.default.green('✓') + message);
+    }
+
+    await (0, _tracker.trackEvent)('config_software_update_success', { ...baseTrackingInfo,
+      ...updateData
+    });
+  } catch (error) {
+    if (error instanceof _userError.default) {
+      await (0, _tracker.trackEvent)('config_software_update_success', { ...baseTrackingInfo,
+        ...updateData,
+        user_error: error === null || error === void 0 ? void 0 : error.message
+      });
+    } else {
+      await (0, _tracker.trackEvent)('config_software_update_error', { ...baseTrackingInfo,
+        ...updateData,
+        error: error === null || error === void 0 ? void 0 : error.message
+      });
+    }
+
+    throw error;
+  }
+});

package/dist/bin/vip-config-software.js

@@ -19,5 +19,9 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 (0, _command.default)({
-  requiredArgs: 1
-}).command('get', 'Read current software settings').argv(process.argv);
+  requiredArgs: 1,
+  usage: 'vip config software <action>'
+}).command('get', 'Read current software settings').command('update', 'Update software settings').examples([{
+  usage: 'vip config software update <wordpress|php|nodejs|muplugins> <version>',
+  description: 'Update <component> to <version>'
+}]).argv(process.argv);

package/dist/lib/analytics/clients/pendo.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _api = _interopRequireDefault(require("../../api"));
+var _http = _interopRequireDefault(require("../../api/http"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -75,10 +75,7 @@ class Pendo {
       visitorId: `${this.context.userId}`
     };
     debug('send()', body);
-    const {
-      apiFetch
-    } = await (0, _api.default)();
-    const response = await apiFetch(Pendo.ENDPOINT, {
+    const response = await (0, _http.default)(Pendo.ENDPOINT, {
       method: 'POST',
       body
     });

package/dist/lib/api/http.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+
+var _token = _interopRequireDefault(require("../token"));
+
+var _env = _interopRequireDefault(require("../env"));
+
+var _proxyAgent = require("../http/proxy-agent");
+
+var _api = require("../api");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+const debug = require('debug')('@automattic/vip:http');
+/**
+ * Call the Public API with an arbitrary path (e.g. to connect to REST endpoints).
+ * This will include the token in an Authorization header so requests are "logged-in."
+ *
+ * This is simply a wrapper around node-fetch
+ *
+ * @param {string} path API path to pass to `fetch` -- will be prefixed by the API_HOST
+ * @param {object} options options to pass to `fetch`
+ * @returns {Promise} Return value of the `fetch` call
+ */
+
+
+var _default = async (path, options = {}) => {
+  let url = path; // For convenience, we support just passing in the path to this function...
+  // but some things (Apollo) always pass the full url
+
+  if (!path.startsWith(_api.API_HOST)) {
+    url = `${_api.API_HOST}${path}`;
+  }
+
+  const authToken = await _token.default.get();
+  const headers = {
+    'User-Agent': _env.default.userAgent,
+    Authorization: authToken ? `Bearer ${authToken.raw}` : null
+  };
+  const proxyAgent = (0, _proxyAgent.createProxyAgent)(url);
+  debug('running fetch', url);
+  return (0, _nodeFetch.default)(url, { ...options,
+    ...{
+      agent: proxyAgent,
+      headers: { ...headers,
+        ...{
+          'Content-Type': 'application/json'
+        },
+        ...options.headers
+      }
+    },
+    ...{
+      body: typeof options.body === 'object' ? JSON.stringify(options.body) : options.body
+    }
+  });
+};
+
+exports.default = _default;

package/dist/lib/api.js

@@ -97,10 +97,13 @@ async function API({
     return forward(operation);
   });
   const proxyAgent = (0, _proxyAgent.createProxyAgent)(API_URL);
+
+  const http = require("./api/http").default;
+
   const httpLink = new _core.HttpLink({
     uri: API_URL,
     headers,
-    fetch: _nodeFetch.default,
+    fetch: http,
     fetchOptions: {
       agent: proxyAgent
     }
@@ -109,28 +112,5 @@ async function API({
     link: _core2.ApolloLink.from([withToken, errorLink, authLink, httpLink]),
     cache: new _core.InMemoryCache()
   });
-  /**
-   * Call the Public API with an arbitrary path (e.g. to connect to REST endpoints).
-   * This will include the token in an Authorization header so requests are "logged-in."
-   * @param {string} path API path to pass to `fetch` -- will be prefixed by the API_HOST
-   * @param {object} options options to pass to `fetch`
-   * @returns {Promise} Return value of the `fetch` call
-   */
-
-  apiClient.apiFetch = (path, options = {}) => (0, _nodeFetch.default)(`${API_HOST}${path}`, { ...options,
-    ...{
-      agent: proxyAgent,
-      headers: { ...headers,
-        ...{
-          'Content-Type': 'application/json'
-        },
-        ...options.headers
-      }
-    },
-    ...{
-      body: typeof options.body === 'object' ? JSON.stringify(options.body) : options.body
-    }
-  });
-
   return apiClient;
 }

package/dist/lib/app.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAppWordPress = isAppWordPress;
+exports.isAppNodejs = isAppNodejs;
+
+var _vipgo = require("./constants/vipgo");
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+
+/**
+ * Is this a WordPress application?
+ * @param       {int} appTypeId application type ID
+ * @constructor
+ */
+function isAppWordPress(appTypeId) {
+  return _vipgo.WORDPRESS_SITE_TYPE_IDS.includes(appTypeId);
+}
+/**
+ * Is this a Nodejs application?
+ * @param       {int} appTypeId application type ID
+ * @constructor
+ */
+
+
+function isAppNodejs(appTypeId) {
+  return _vipgo.NODEJS_SITE_TYPE_IDS.includes(appTypeId);
+}

package/dist/lib/cli/command.js

@@ -39,7 +39,7 @@ var exit = _interopRequireWildcard(require("./exit"));
 
 var _debug = _interopRequireDefault(require("debug"));
 
-var _userError = _interopRequireDefault(require("./userError"));
+var _userError = _interopRequireDefault(require("../user-error"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 

package/dist/lib/config/software.js

@@ -3,17 +3,43 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.appQueryFragments = exports.appQuery = void 0;
+exports.getUpdateResult = exports.triggerUpdate = exports.promptForUpdate = exports.appQueryFragments = exports.appQuery = void 0;
+
+var _enquirer = require("enquirer");
+
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+
+var _debug = _interopRequireDefault(require("debug"));
+
+var _app = require("../app");
+
+var _api = _interopRequireDefault(require("../api"));
+
+var _userError = _interopRequireDefault(require("../user-error"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+const UPDATE_PROGRESS_POLL_INTERVAL = 5;
+const debug = (0, _debug.default)('@automattic/vip:bin:config-software');
 const appQuery = `
 	id,
 	name,
 	type,
+	typeId,
 	organization { id, name },
 	environments{
 		appId
 		id
 		name
 		type
+		uniqueLabel
 		softwareSettings {
 			php {
 			  ...Software
@@ -54,4 +80,266 @@ const appQueryFragments = `fragment Software on AppEnvironmentSoftwareSettingsSo
 		}
 	}
 `;
-exports.appQueryFragments = appQueryFragments;
+exports.appQueryFragments = appQueryFragments;
+const updateSoftwareMutation = (0, _graphqlTag.default)`
+	mutation UpdateSoftwareSettings(
+		$appId: Int!
+		$envId: Int!
+		$component: String!
+		$version: String!
+	) {
+		updateSoftwareSettings(
+			input: {
+				appId: $appId
+				environmentId: $envId
+				softwareName: $component
+				softwareVersion: $version
+			}
+		) {
+			php {
+			...Software
+			}
+			wordpress {
+			...Software
+			}
+			muplugins {
+			...Software
+			}
+			nodejs {
+			...Software
+			}
+		}
+	}
+	${appQueryFragments}
+`;
+const updateJobQuery = (0, _graphqlTag.default)`
+	query UpdateJob($appId: Int!, $envId: Int!) {
+		app(id: $appId ) {
+			environments(id: $envId) {
+				jobs (types:["upgrade_php", "upgrade_wordpress", "upgrade_muplugins", "upgrade_nodejs"]) {
+					type
+					completedAt
+					createdAt
+					inProgressLock
+					progress {
+						status
+						steps {
+							step
+							name
+							status
+						}
+					}
+				}
+			}
+		}
+	}`;
+const COMPONENT_NAMES = {
+  wordpress: 'WordPress',
+  php: 'PHP',
+  muplugins: 'MU Plugins',
+  nodejs: 'Node.js'
+};
+const MANAGED_OPTION_KEY = 'managed_latest';
+
+const _optionsForVersion = softwareSettings => {
+  const {
+    options,
+    current,
+    pinned,
+    slug
+  } = softwareSettings;
+  const versionChoices = {
+    managed: [],
+    supported: [],
+    test: [],
+    deprecated: []
+  };
+
+  for (const option of options) {
+    if (option.deprecated) {
+      versionChoices.deprecated.push({
+        message: `${option.version} (deprecated)`,
+        value: option.version
+      });
+    } else if (option.unstable) {
+      versionChoices.test.push({
+        message: `${option.version} (test)`,
+        value: option.version
+      });
+    } else {
+      versionChoices.supported.push({
+        message: option.version,
+        value: option.version
+      });
+    }
+  }
+
+  if (slug === 'wordpress') {
+    versionChoices.managed.push({
+      message: 'Managed updates',
+      value: MANAGED_OPTION_KEY
+    });
+  }
+
+  const allOptions = [...versionChoices.managed, ...versionChoices.supported, ...versionChoices.test, ...versionChoices.deprecated];
+  return allOptions.map(option => {
+    const isActivePinned = option.value === MANAGED_OPTION_KEY && !pinned;
+    const isActiveVersion = option.value === current.version && pinned;
+
+    if (isActivePinned || isActiveVersion) {
+      return {
+        message: `Active: ${option.message}`,
+        value: option.value,
+        disabled: true
+      };
+    }
+
+    return option;
+  });
+};
+
+const _processComponent = async (appTypeId, userProvidedComponent) => {
+  const validComponents = [];
+
+  if ((0, _app.isAppWordPress)(appTypeId)) {
+    validComponents.push('wordpress', 'php', 'muplugins');
+  } else if ((0, _app.isAppNodejs)(appTypeId)) {
+    validComponents.push('nodejs');
+  }
+
+  if (userProvidedComponent) {
+    if (!validComponents.includes(userProvidedComponent)) {
+      throw new _userError.default(`Component ${userProvidedComponent} is not supported. Use one of: ${validComponents.join(',')}`);
+    }
+
+    return userProvidedComponent;
+  }
+
+  if (validComponents.length === 0) {
+    throw new _userError.default('No components are supported for this application');
+  }
+
+  if (validComponents.length === 1) {
+    return validComponents[0];
+  }
+
+  const choices = validComponents.map(item => ({
+    message: COMPONENT_NAMES[item],
+    value: item
+  }));
+  const select = new _enquirer.Select({
+    message: 'Component to update',
+    choices
+  });
+  return await select.run();
+};
+
+const _processComponentVersion = async (softwareSettings, component, userProvidedVersion) => {
+  const versionChoices = _optionsForVersion(softwareSettings[component]);
+
+  if (userProvidedVersion) {
+    const validValues = versionChoices.map(item => item.value);
+
+    if (!validValues.includes(userProvidedVersion)) {
+      throw new _userError.default(`Version ${userProvidedVersion} is not supported for ${COMPONENT_NAMES[component]}. Use one of: ${validValues.join(',')}`);
+    }
+
+    return userProvidedVersion;
+  }
+
+  const versionSelect = new _enquirer.Select({
+    message: `Version for ${COMPONENT_NAMES[component]} to upgrade to`,
+    choices: versionChoices
+  });
+  return await versionSelect.run();
+};
+
+const promptForUpdate = async (appTypeId, opts, softwareSettings) => {
+  const component = await _processComponent(appTypeId, opts.component);
+  const version = await _processComponentVersion(softwareSettings, component, opts.version);
+  const confirm = opts.force || (await new _enquirer.Confirm({
+    message: `Are you sure you want to upgrade ${COMPONENT_NAMES[component]} to ${version}?`
+  }).run());
+
+  if (confirm) {
+    return {
+      component,
+      version
+    };
+  }
+
+  throw new _userError.default('Update canceled');
+};
+
+exports.promptForUpdate = promptForUpdate;
+
+const triggerUpdate = async variables => {
+  debug('Triggering update', variables);
+  const api = await (0, _api.default)();
+  return await api.mutate({
+    mutation: updateSoftwareMutation,
+    variables
+  });
+};
+
+exports.triggerUpdate = triggerUpdate;
+
+const _getLatestJob = async (appId, envId) => {
+  var _result$data, _result$data$app;
+
+  const api = await (0, _api.default)();
+  const result = await api.query({
+    query: updateJobQuery,
+    variables: {
+      appId,
+      envId
+    },
+    fetchPolicy: 'network-only'
+  });
+  const jobs = (result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : (_result$data$app = _result$data.app) === null || _result$data$app === void 0 ? void 0 : _result$data$app.environments[0].jobs) || [];
+
+  if (jobs.length) {
+    return jobs.reduce((prev, current) => prev.createdAt > current.createdAt ? prev : current);
+  }
+
+  return null;
+};
+
+const _getCompletedJob = async (appId, envId) => {
+  const latestJob = await _getLatestJob(appId, envId);
+  debug('Latest job result:', latestJob);
+
+  if (!latestJob || !latestJob.inProgressLock) {
+    return latestJob;
+  }
+
+  debug(`Sleep for ${UPDATE_PROGRESS_POLL_INTERVAL} seconds`);
+  await new Promise(resolve => setTimeout(resolve, UPDATE_PROGRESS_POLL_INTERVAL * 1000));
+  return _getCompletedJob(appId, envId);
+};
+
+const getUpdateResult = async (appId, envId) => {
+  var _completedJob$progres, _completedJob$progres2, _completedJob$progres3;
+
+  debug('Getting update result', {
+    appId,
+    envId
+  });
+  const completedJob = await _getCompletedJob(appId, envId);
+  const success = !completedJob || (completedJob === null || completedJob === void 0 ? void 0 : (_completedJob$progres = completedJob.progress) === null || _completedJob$progres === void 0 ? void 0 : _completedJob$progres.status) === 'success';
+
+  if (success) {
+    return {
+      ok: true
+    };
+  }
+
+  const failedStep = completedJob === null || completedJob === void 0 ? void 0 : (_completedJob$progres2 = completedJob.progress) === null || _completedJob$progres2 === void 0 ? void 0 : (_completedJob$progres3 = _completedJob$progres2.steps) === null || _completedJob$progres3 === void 0 ? void 0 : _completedJob$progres3.find(step => step.status === 'failed');
+  const error = failedStep ? `Failed during step: ${failedStep.name}` : 'Software update failed';
+  return {
+    ok: false,
+    errorMessage: error
+  };
+};
+
+exports.getUpdateResult = getUpdateResult;

package/dist/lib/constants/vipgo.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NODEJS_SITE_TYPE_IDS = exports.NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = exports.NODEJS_REDIS_APPLICATION_TYPE_ID = exports.NODEJS_MYSQL_APPLICATION_TYPE_ID = exports.NODEJS_APPLICATION_TYPE_ID = exports.WORDPRESS_SITE_TYPE_IDS = exports.WORDPRESS_NON_PROD_APPLICATION_TYPE_ID = exports.WORDPRESS_APPLICATION_TYPE_ID = void 0;
+const WORDPRESS_APPLICATION_TYPE_ID = 2;
+exports.WORDPRESS_APPLICATION_TYPE_ID = WORDPRESS_APPLICATION_TYPE_ID;
+const WORDPRESS_NON_PROD_APPLICATION_TYPE_ID = 6;
+exports.WORDPRESS_NON_PROD_APPLICATION_TYPE_ID = WORDPRESS_NON_PROD_APPLICATION_TYPE_ID;
+const WORDPRESS_SITE_TYPE_IDS = [WORDPRESS_APPLICATION_TYPE_ID, WORDPRESS_NON_PROD_APPLICATION_TYPE_ID];
+exports.WORDPRESS_SITE_TYPE_IDS = WORDPRESS_SITE_TYPE_IDS;
+const NODEJS_APPLICATION_TYPE_ID = 3;
+exports.NODEJS_APPLICATION_TYPE_ID = NODEJS_APPLICATION_TYPE_ID;
+const NODEJS_MYSQL_APPLICATION_TYPE_ID = 5;
+exports.NODEJS_MYSQL_APPLICATION_TYPE_ID = NODEJS_MYSQL_APPLICATION_TYPE_ID;
+const NODEJS_REDIS_APPLICATION_TYPE_ID = 7;
+exports.NODEJS_REDIS_APPLICATION_TYPE_ID = NODEJS_REDIS_APPLICATION_TYPE_ID;
+const NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = 8;
+exports.NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID = NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID;
+const NODEJS_SITE_TYPE_IDS = [NODEJS_APPLICATION_TYPE_ID, NODEJS_MYSQL_APPLICATION_TYPE_ID, NODEJS_REDIS_APPLICATION_TYPE_ID, NODEJS_MYSQL_REDIS_APPLICATION_TYPE_ID];
+exports.NODEJS_SITE_TYPE_IDS = NODEJS_SITE_TYPE_IDS;

package/dist/lib/dev-environment/dev-environment-cli.js

@@ -45,7 +45,7 @@ var _devEnvironmentCore = require("./dev-environment-core");
 
 var _devEnvironmentLando = require("./dev-environment-lando");
 
-var _userError = _interopRequireDefault(require("../cli/userError"));
+var _userError = _interopRequireDefault(require("../user-error"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -421,21 +421,26 @@ const componentDisplayNames = {
   muPlugins: 'vip-go-mu-plugins',
   appCode: 'application code'
 };
+const componentDemoyNames = {
+  muPlugins: 'vip-go-mu-plugins',
+  appCode: 'vip-go-skeleton'
+};
 
 async function promptForComponent(component, allowLocal, defaultObject) {
   debug(`Prompting for ${component} with default:`, defaultObject);
   const componentDisplayName = componentDisplayNames[component] || component;
+  const componentDemoName = componentDemoyNames[component] || component;
   const modChoices = [];
 
   if (allowLocal) {
     modChoices.push({
-      message: `local folder - where you already have ${componentDisplayName} code`,
+      message: `Custom - Path to a locally cloned ${componentDisplayName} directory`,
       value: 'local'
     });
   }
 
   modChoices.push({
-    message: 'demo image - that gets automatically fetched',
+    message: `Demo - Automatically fetched ${componentDemoName}`,
     value: 'image'
   });
   let initialMode = 'image';

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -5501,6 +5501,12 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
           "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="
         },
+        "colors": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+          "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+          "optional": true
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -5642,10 +5648,9 @@
       "dev": true
     },
     "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "optional": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
+      "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="
     },
     "combined-stream": {
       "version": "1.0.8",
@@ -5898,9 +5903,9 @@
       }
     },
     "dayjs": {
-      "version": "1.11.4",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.4.tgz",
-      "integrity": "sha512-Zj/lPM5hOvQ1Bf7uAvewDaUcsJoI6JmNqmHhHl3nyumwe0XHwt8sWdOVAPACJzCebL8gQCi+K49w7iKWnGwX9g=="
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.5.tgz",
+      "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
     },
     "debug": {
       "version": "4.3.3",
@@ -10104,8 +10109,8 @@
       "dev": true
     },
     "lando": {
-      "version": "git+https://github.com/Automattic/lando-cli.git#db79d2c19e110b3dea32120c56eea7a3df100ad3",
-      "from": "git+https://github.com/Automattic/lando-cli.git#v3.5.2-patch2022_08_11",
+      "version": "git+https://github.com/Automattic/lando-cli.git#93b9137e2570025b771fc734fd92e694755917a1",
+      "from": "git+https://github.com/Automattic/lando-cli.git#v3.5.2-patch2022_09_05",
       "requires": {
         "@lando/platformsh": "^0.6.0",
         "axios": "0.21.4",
@@ -10164,11 +10169,6 @@
             "wrap-ansi": "^2.0.0"
           }
         },
-        "colors": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-          "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="
-        },
         "find-up": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -11865,9 +11865,9 @@
       }
     },
     "platformsh-client": {
-      "version": "0.1.205",
-      "resolved": "https://registry.npmjs.org/platformsh-client/-/platformsh-client-0.1.205.tgz",
-      "integrity": "sha512-VxJ6aWQzujv+nhwBsbC7OMWq+yHRHi0m3Z1yQA5mqVAplHHM6PgRrsEmUa+balCXhKksj8Y+YPYCB7epJ7Y0lw==",
+      "version": "0.1.207",
+      "resolved": "https://registry.npmjs.org/platformsh-client/-/platformsh-client-0.1.207.tgz",
+      "integrity": "sha512-Ox32Rpjbiqgap9ilR231eQNCb4BtObeCCbwTlc8o1/3FZqK1R4CfP6E5jVDXpQ3UzyhKMgFT40w7UGo43OaM/g==",
       "requires": {
         "atob": "^2.1.2",
         "basename": "^0.1.2",
@@ -14460,11 +14460,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
           "integrity": "sha512-5mO7DX4CbJzp9zjaFXusQQ4tzKJARjNB1Ih1pVBi8wkbmXy/xzIDgEMXxWePLzt2OdFwaxfneIlT1nCiXubrPQ=="
-        },
-        "colors": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz",
-          "integrity": "sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {
@@ -18,6 +18,7 @@
     "vip-config-envvar-set": "dist/bin/vip-config-envvar-set.js",
     "vip-config-software": "dist/bin/vip-config-software.js",
     "vip-config-software-get": "dist/bin/vip-config-software-get.js",
+    "vip-config-software-update": "dist/bin/vip-config-software-update.js",
     "vip-dev-env": "dist/bin/vip-dev-env.js",
     "vip-dev-env-create": "dist/bin/vip-dev-env-create.js",
     "vip-dev-env-update": "dist/bin/vip-dev-env-update.js",
@@ -126,7 +127,7 @@
     "ini": "2.0.0",
     "json2csv": "5.0.6",
     "jwt-decode": "2.2.0",
-    "lando": "git+https://github.com/Automattic/lando-cli.git#v3.5.2-patch2022_08_11",
+    "lando": "git+https://github.com/Automattic/lando-cli.git#v3.5.2-patch2022_09_05",
     "node-fetch": "^2.6.1",
     "opn": "5.5.0",
     "proxy-from-env": "^1.1.0",