@automattic/vip 2.7.0-dev1 → 2.7.0-dev2

package/dist/bin/vip-logs.js

@@ -18,7 +18,7 @@ var _rollbar = require("../lib/rollbar");
 
 var _tracker = require("../lib/tracker");
 
-var logsLib = _interopRequireWildcard(require("../lib/logs/logs"));
+var logsLib = _interopRequireWildcard(require("../lib/app-logs/app-logs"));
 
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 

package/dist/lib/app-logs/app-logs.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getRecentLogs = getRecentLogs;
+
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+
+var _api = _interopRequireDefault(require("../api"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+const QUERY_ENVIRONMENT_LOGS = (0, _graphqlTag.default)`
+	query GetAppLogs( $appId: Int, $envId: Int, $type: AppEnvironmentLogType, $limit: Int ) {
+		app( id: $appId ) {
+			environments( id: $envId ) {
+				id
+				logs( type: $type, limit: $limit ) {
+					nodes {
+						timestamp
+						message
+					}
+				}
+			}
+		}
+	}
+`;
+
+async function getRecentLogs(appId, envId, type, limit) {
+  var _response$data, _response$data$app, _response$data$app$en, _response$data$app$en2;
+
+  const api = await (0, _api.default)();
+  const response = await api.query({
+    query: QUERY_ENVIRONMENT_LOGS,
+    variables: {
+      appId,
+      envId,
+      type,
+      limit
+    }
+  });
+  const logs = response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$app = _response$data.app) === null || _response$data$app === void 0 ? void 0 : (_response$data$app$en = _response$data$app.environments[0]) === null || _response$data$app$en === void 0 ? void 0 : (_response$data$app$en2 = _response$data$app$en.logs) === null || _response$data$app$en2 === void 0 ? void 0 : _response$data$app$en2.nodes;
+
+  if (!logs) {
+    throw new Error('Unable to query logs');
+  }
+
+  return logs;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.7.0-dev1",
+  "version": "2.7.0-dev2",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {

package/dist/bin/vip-dev-environment-start.js

@@ -1,41 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * 
- * @fomat
- */
-
-/**
- * External dependencies
- */
-"use strict";
-
-var _debug = _interopRequireDefault(require("debug"));
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _command = _interopRequireDefault(require("../lib/cli/command"));
-
-var _devEnvironment = require("../lib/dev-environment");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Internal dependencies
- */
-const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment'); // Command examples
-
-const examples = [{
-  usage: 'vip dev-environment start',
-  description: 'Starts local dev environment\n' + '       * If the environment isn\'t built yet it will build it as well'
-}];
-(0, _command.default)().option('slug', `Custom name of the dev environment (default: "${_devEnvironment.defaults.environmentSlug}")`).option('title', 'Title for the WordPress site (default: "VIP Dev")').option('multisite', 'Enable multisite install').option('php', 'Use a specific PHP version').option('wordpress', 'Use a specific WordPress version or local directory (default: last stable)').option('mu-plugins', 'Use a specific mu-plugins changeset or local directory (default: "auto": last commit in master)').option('jetpack', 'Use a specific Jetpack from a local directory (default: "mu": use the version in mu-plugins)').option('client-code', 'Use the client code from a local directory or VIP skeleton (default: use the VIP skeleton)').examples(examples).argv(process.argv, async (arg, opt) => {
-  const slug = opt.slug || _devEnvironment.defaults.environmentSlug;
-  debug('Args: ', arg, 'Options: ', opt);
-
-  try {
-    await (0, _devEnvironment.startEnvironment)(slug, opt);
-  } catch (e) {
-    console.log(_chalk.default.red('Error:'), e.message);
-  }
-});

package/dist/bin/vip-dev-environment.js

@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * 
- * @fomat
- */
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
-"use strict";
-
-var _command = _interopRequireDefault(require("../lib/cli/command"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-(0, _command.default)({
-  requiredArgs: 1
-}).command('start', 'Start the local dev environment').argv(process.argv);

package/dist/lib/dev-environment.js

@@ -1,194 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.startEnvironment = startEnvironment;
-exports.generateInstanceData = generateInstanceData;
-exports.getEnvironmentPath = getEnvironmentPath;
-exports.defaults = void 0;
-
-var _debug = _interopRequireDefault(require("debug"));
-
-var _xdgBasedir = _interopRequireDefault(require("xdg-basedir"));
-
-var _os = _interopRequireDefault(require("os"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-var _ejs = _interopRequireDefault(require("ejs"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _lando = _interopRequireDefault(require("lando/lib/lando"));
-
-var _utils = _interopRequireDefault(require("lando/plugins/lando-core/lib/utils"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * 
- * @format
- */
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
-const debug = (0, _debug.default)('@automattic/vip:bin:dev-environment');
-const containerImages = {
-  wordpress: {
-    image: 'wpvipdev/wordpress',
-    tag: '5.6'
-  },
-  jetpack: {
-    image: 'wpvipdev/jetpack'
-  },
-  muPlugins: {
-    image: 'wpvipdev/mu-plugins',
-    tag: 'auto'
-  },
-  clientCode: {
-    image: 'wpvipdev/skeleton',
-    tag: '181a17d9aedf7da73730d65ccef3d8dbf172a5c5'
-  }
-};
-const defaults = {
-  environmentSlug: 'vip-local',
-  title: 'VIP Dev',
-  multisite: false,
-  phpVersion: '7.3',
-  jetpack: {
-    mode: 'inherit'
-  },
-  wordpress: {},
-  muPlugins: {},
-  clientCode: {}
-};
-exports.defaults = defaults;
-['wordpress', 'muPlugins', 'clientCode'].forEach(type => {
-  defaults[type] = {
-    mode: 'image',
-    image: containerImages[type].image,
-    tag: containerImages[type].tag
-  };
-});
-const landoFileTemplatePath = 'assets/dev-environment.lando.template.yml.ejs';
-const landoFileName = '.lando.yml';
-
-async function startEnvironment(slug, options) {
-  debug('Will start an environment', slug, 'with options: ', options);
-  const instancePath = getEnvironmentPath(slug);
-
-  const alreadyExists = _fs.default.existsSync(instancePath);
-
-  if (alreadyExists) {
-    const parameters = Object.keys(options || {}).filter(key => key !== 'slug');
-
-    if (parameters && parameters.length) {
-      throw new Error(`The environment ${slug} already exists and we can not change its configuration` + ` ( configuration parameters - ${parameters.join(', ')} found ).` + ' Destroy the environment first if you would like to recreate it.');
-    }
-  } else {
-    const instanceData = generateInstanceData(slug, options);
-    debug('Instance data to create a new environment:', instanceData);
-    await prepareLandoEnv(instanceData, instancePath);
-  }
-
-  await landoStart(instancePath);
-}
-
-function getLandoConfig() {
-  const landoPath = _path.default.join(__dirname, '..', '..', 'node_modules', 'lando');
-
-  debug(`Getting lando config, using path '${landoPath}' for plugins`);
-  return {
-    logLevelConsole: 'warn',
-    landoFile: '.lando.yml',
-    preLandoFiles: ['.lando.base.yml', '.lando.dist.yml', '.lando.upstream.yml'],
-    postLandoFiles: ['.lando.local.yml'],
-    pluginDirs: [landoPath, {
-      path: _path.default.join(landoPath, 'integrations'),
-      subdir: '.'
-    }]
-  };
-}
-
-async function landoStart(instancePath) {
-  debug('Will start lando app on path:', instancePath);
-  const lando = new _lando.default(getLandoConfig());
-  await lando.bootstrap();
-  const app = lando.getApp(instancePath);
-  await app.init();
-  await app.start();
-  console.log(lando.cli.formatData(_utils.default.startTable(app), {
-    format: 'table'
-  }, {
-    border: false
-  }));
-}
-
-async function prepareLandoEnv(instanceData, instancePath) {
-  const landoFile = await _ejs.default.renderFile(landoFileTemplatePath, instanceData);
-
-  const landoFileTargetPath = _path.default.join(instancePath, landoFileName);
-
-  _fs.default.mkdirSync(instancePath, {
-    recursive: true
-  });
-
-  _fs.default.writeFileSync(landoFileTargetPath, landoFile);
-
-  debug(`Lando file created in ${landoFileTargetPath}`);
-}
-
-function generateInstanceData(slug, options) {
-  const instanceData = {
-    siteSlug: slug,
-    wpTitle: options.title || defaults.title,
-    multisite: options.multisite || defaults.multisite,
-    phpVersion: options.phpVersion || defaults.phpVersion,
-    wordpress: getParamInstanceData(options.wordpress, 'wordpress'),
-    muPlugins: getParamInstanceData(options.muPlugins, 'muPlugins'),
-    jetpack: getParamInstanceData(options.jetpack, 'jetpack'),
-    clientCode: getParamInstanceData(options.clientCode, 'clientCode')
-  };
-  return instanceData;
-}
-
-function getParamInstanceData(param, type) {
-  if (param) {
-    if (param.includes('/')) {
-      return {
-        mode: 'local',
-        dir: param
-      };
-    }
-
-    if (type === 'jetpack' && param === 'mu') {
-      return {
-        mode: 'inherit'
-      };
-    }
-
-    return {
-      mode: 'image',
-      image: containerImages[type].image,
-      tag: param
-    };
-  }
-
-  return defaults[type];
-}
-
-function getEnvironmentPath(name) {
-  if (!name) {
-    throw new Error('Name was not provided');
-  }
-
-  const mainEnvironmentPath = _xdgBasedir.default.data || _os.default.tmpdir();
-
-  return _path.default.join(mainEnvironmentPath, 'vip', 'dev-environment', name);
-}