@automattic/vip 2.16.0 → 2.18.0

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/dist/lib/dev-environment/dev-environment-core.js

@@ -100,7 +100,9 @@ async function startEnvironment(slug, options) {
     await (0, _devEnvironmentLando.landoRebuild)(instancePath);
   }
 
-  await printEnvironmentInfo(slug);
+  await printEnvironmentInfo(slug, {
+    extended: false
+  });
 }
 
 async function stopEnvironment(slug) {
@@ -191,18 +193,26 @@ async function destroyEnvironment(slug, removeFiles) {
   }
 }
 
-async function printAllEnvironmentsInfo() {
+async function printAllEnvironmentsInfo(options) {
   const allEnvNames = getAllEnvironmentNames();
   debug('Will print info for all environments. Names found: ', allEnvNames);
   console.log('Found ' + _chalk.default.bold(allEnvNames.length) + ' environments' + (allEnvNames.length ? ':' : '.'));
 
   for (const envName of allEnvNames) {
     console.log('\n');
-    await printEnvironmentInfo(envName);
+    await printEnvironmentInfo(envName, options);
   }
 }
 
-async function printEnvironmentInfo(slug) {
+function parseComponentForInfo(component) {
+  if (component.mode === 'local') {
+    return component.dir || '';
+  }
+
+  return component.tag || '[demo-image]';
+}
+
+async function printEnvironmentInfo(slug, options) {
   debug('Will get info for an environment', slug);
   const instancePath = getEnvironmentPath(slug);
   debug('Instance path for', slug, 'is:', instancePath);
@@ -214,6 +224,21 @@ async function printEnvironmentInfo(slug) {
   }
 
   const appInfo = await (0, _devEnvironmentLando.landoInfo)(instancePath);
+
+  if (options.extended) {
+    const environmentData = readEnvironmentData(slug);
+    appInfo.title = environmentData.wpTitle;
+    appInfo.multisite = !!environmentData.multisite;
+    appInfo.php = environmentData.php.split(':')[1];
+    appInfo.wordpress = parseComponentForInfo(environmentData.wordpress);
+    appInfo['Mu plugins'] = parseComponentForInfo(environmentData.muPlugins);
+    appInfo['App Code'] = parseComponentForInfo(environmentData.appCode);
+
+    if (environmentData.mediaRedirectDomain) {
+      appInfo['Media Redirect'] = environmentData.mediaRedirectDomain;
+    }
+  }
+
   (0, _devEnvironmentCli.printTable)(appInfo);
 }
 

package/dist/lib/http/proxy-agent.js

@@ -4,8 +4,6 @@ var _socksProxyAgent = require("socks-proxy-agent");
 
 var _httpsProxyAgent = require("https-proxy-agent");
 
-var _httpProxyAgent = require("http-proxy-agent");
-
 var _proxyFromEnv = require("proxy-from-env");
 
 var _debug = _interopRequireDefault(require("debug"));
@@ -27,15 +25,13 @@ const debug = (0, _debug.default)('vip:proxy-agent');
 // 2. No applicable variables are set: null is returned (thus, no proxy agent is returned)
 // 3. VIP_USE_SYSTEM_PROXY and SOCKS_PROXY are set: a SOCKS_PROXY is returned
 // 4. VIP_USE_SYSTEM_PROXY and HTTPS_PROXY are set: an HTTPS_PROXY is returned
-// 5. VIP_USE_SYSTEM_PROXY and HTTP_PROXY are set: an HTTP_PROXY is returned
-// 6. NO_PROXY is set along with VIP_USE_SYSTEM_PROXY and any system proxy: null is returned if the no proxy applies, otherwise the first active proxy is used
+// 5. NO_PROXY is set along with VIP_USE_SYSTEM_PROXY and any system proxy: null is returned if the no proxy applies, otherwise the first active proxy is used
 // This allows near full customization by the client of what proxy should be used, instead of making assumptions based on the URL string
 
 function createProxyAgent(url) {
   const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null;
   const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null;
   const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null;
-  const HTTP_PROXY = process.env.HTTP_PROXY || process.env.http_proxy || null;
   const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null; // VIP Socks Proxy should take precedence and should be fully backward compatible
 
   if (VIP_PROXY) {
@@ -54,11 +50,6 @@ function createProxyAgent(url) {
       debug(`Enabling HTTPS proxy support using config: ${HTTPS_PROXY}`);
       return new _httpsProxyAgent.HttpsProxyAgent(HTTPS_PROXY);
     }
-
-    if (HTTP_PROXY) {
-      debug(`Enabling HTTP proxy support using config: ${HTTP_PROXY}`);
-      return new _httpProxyAgent.HttpProxyAgent(HTTP_PROXY);
-    }
   } // If no environment variables are set, the no proxy is in effect, or if the proxy enable is not set return null (equivilant of no Proxy agent)
 
 

package/dist/lib/logout.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _token = _interopRequireDefault(require("./token"));
+
+var _tracker = require("./tracker");
+
+var _http = _interopRequireDefault(require("./api/http"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Internal dependencies
+ */
+var _default = async () => {
+  await (0, _http.default)('/logout', {
+    method: 'post'
+  });
+  await _token.default.purge();
+  await (0, _tracker.trackEvent)('logout_command_execute');
+};
+
+exports.default = _default;