@automattic/vip 2.27.0-dev7 → 2.28.0-dev

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

@@ -18,4 +18,4 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (0, _command.default)({
   requiredArgs: 0
-}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute a WP-CLI command in local dev environment').command('import', 'Import data into a local WordPress environment').command('shell', 'Spawns a shell in a dev environment').command('logs', 'View logs from a local WordPress environment').command('sync', 'Pull data from production to local development environment').argv(process.argv);
+}).command('create', 'Create a new local dev environment').command('update', 'Update an already created local dev environment').command('start', 'Start a local dev environment').command('stop', 'Stop a local dev environment').command('destroy', 'Remove containers, networks, volumes and configuration files of a local dev environment').command('info', 'Provides basic info about one or multiple local dev environments').command('list', 'Provides basic info about all local dev environments').command('exec', 'Execute a WP-CLI command in local dev environment').command('import', 'Import data into a local WordPress environment').command('shell', 'Spawns a shell in a dev environment').command('logs', 'View logs from a local WordPress environment').argv(process.argv);

package/dist/commands/dev-env-sync-sql.js

@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.DevEnvSyncSQLCommand = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 var _chalk = _interopRequireDefault(require("chalk"));
-var _url = _interopRequireDefault(require("url"));
 var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _clientFileUploader = require("../lib/client-file-uploader");
 var _exportSql = require("./export-sql");
@@ -40,8 +39,8 @@ function findSiteHomeUrl(sql) {
   const regex = "'(siteurl|home)',\\s?'(.*?)'";
   const results = sql.match(regex);
   if (results) {
-    const url = results[2];
-    return _url.default.parse(url).hostname;
+    const domain = results[2].replace(/https?:\/\//, '');
+    return domain;
   }
   return null;
 }
@@ -56,15 +55,15 @@ function findSiteHomeUrl(sql) {
 async function extractSiteUrls(sqlFile) {
   const readInterface = await (0, _lineByLine.getReadInterface)(sqlFile);
   return new Promise((resolve, reject) => {
-    const domains = new Set();
+    const domains = [];
     readInterface.on('line', line => {
       const domain = findSiteHomeUrl(line);
       if (domain) {
-        domains.add('//' + domain);
+        domains.push(domain);
       }
     });
     readInterface.on('close', () => {
-      resolve(Array.from(domains));
+      resolve(domains);
     });
     readInterface.on('error', reject);
   });
@@ -73,20 +72,18 @@ class DevEnvSyncSQLCommand {
   /**
    * Creates a new instance of the command
    *
-   * @param {string}   app       The app object
-   * @param {string}   env       The environment object
-   * @param {string}   slug      The site slug
-   * @param {Function} trackerFn Function to call for tracking
+   * @param {string} app  The app object
+   * @param {string} env  The environment object
+   * @param {string} slug The site slug
    */
-  constructor(app, env, slug, trackerFn = () => {}) {
+  constructor(app, env, slug) {
     this.app = app;
     this.env = env;
     this.slug = slug;
-    this.track = trackerFn;
     this.tmpDir = (0, _utils.makeTempDir)();
   }
   get landoDomain() {
-    return `//${this.slug}.vipdev.lndo.site`;
+    return `${this.slug}.vipdev.lndo.site`;
   }
   get sqlFile() {
     return `${this.tmpDir}/sql-export.sql`;
@@ -102,7 +99,7 @@ class DevEnvSyncSQLCommand {
    * @return {Promise<void>} Promise that resolves when the export is complete
    */
   async generateExport() {
-    const exportCommand = new _exportSql.ExportSQLCommand(this.app, this.env, this.gzFile, this.track);
+    const exportCommand = new _exportSql.ExportSQLCommand(this.app, this.env, this.gzFile);
     await exportCommand.run();
   }
 
@@ -117,13 +114,9 @@ class DevEnvSyncSQLCommand {
     const replacements = this.siteUrls.reduce((acc, url) => [...acc, url, this.landoDomain], []);
     const readStream = _fs.default.createReadStream(this.sqlFile);
     const replacedStream = await (0, _vipSearchReplace.replace)(readStream, replacements);
-    const outputFile = `${this.tmpDir}/sql-export-sr.sql`;
-    replacedStream.pipe(_fs.default.createWriteStream(outputFile));
+    replacedStream.pipe(_fs.default.createWriteStream(this.sqlFile));
     return new Promise((resolve, reject) => {
-      replacedStream.on('finish', () => {
-        _fs.default.renameSync(outputFile, this.sqlFile);
-        resolve();
-      });
+      replacedStream.on('finish', resolve);
       replacedStream.on('error', reject);
     });
   }
@@ -136,10 +129,11 @@ class DevEnvSyncSQLCommand {
    */
   async runImport() {
     const importOptions = {
+      slug: this.slug,
       inPlace: true,
       skipValidate: true
     };
-    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions, this.slug);
+    const importCommand = new _devEnvImportSql.DevEnvImportSQLCommand(this.sqlFile, importOptions);
     await importCommand.run(true);
   }
 
@@ -160,9 +154,6 @@ class DevEnvSyncSQLCommand {
       await (0, _clientFileUploader.unzipFile)(this.gzFile, this.sqlFile);
       console.log(`${_chalk.default.green('✓')} Extracted to ${this.sqlFile}`);
     } catch (err) {
-      await this.track('archive_extraction_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error extracting the SQL export: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
     try {
@@ -179,9 +170,6 @@ class DevEnvSyncSQLCommand {
       await this.runSearchReplace();
       console.log(`${_chalk.default.green('✓')} Search-replace operation is complete`);
     } catch (err) {
-      await this.track('search_replace_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error replacing domains: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
     try {
@@ -189,9 +177,6 @@ class DevEnvSyncSQLCommand {
       await this.runImport();
       console.log(`${_chalk.default.green('✓')} SQL file imported`);
     } catch (err) {
-      await this.track('import_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error importing SQL file: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
   }

package/dist/commands/export-sql.js

@@ -8,7 +8,7 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _fs = _interopRequireDefault(require("fs"));
 var _https = _interopRequireDefault(require("https"));
 var _path = _interopRequireDefault(require("path"));
-var _api = _interopRequireWildcard(require("../lib/api"));
+var _api = _interopRequireDefault(require("../lib/api"));
 var _format = require("../lib/cli/format");
 var _progress = require("../lib/cli/progress");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
@@ -162,10 +162,8 @@ async function generateDownloadLink(appId, envId, backupId) {
  * @throws {Error} Throws an error if the job creation fails
  */
 async function createExportJob(appId, envId, backupId) {
-  // Disable global error handling so that we can handle errors ourselves
-  (0, _api.disableGlobalGraphQLErrorHandling)();
   const api = await (0, _api.default)();
-  await api.mutate({
+  const response = await api.mutate({
     mutation: CREATE_EXPORT_JOB_MUTATION,
     variables: {
       input: {
@@ -175,9 +173,16 @@ async function createExportJob(appId, envId, backupId) {
       }
     }
   });
-
-  // Re-enable global error handling
-  (0, _api.enableGlobalGraphQLErrorHandling)();
+  const {
+    data: {
+      startDBBackupCopy: {
+        success
+      }
+    }
+  } = response;
+  if (!success) {
+    throw new Error();
+  }
 }
 
 /**
@@ -190,15 +195,15 @@ class ExportSQLCommand {
     DOWNLOAD_LINK: 'downloadLink',
     DOWNLOAD: 'download'
   };
+
   /**
    * Creates an instance of SQLExportCommand
    *
-   * @param {any}      app        The application object
-   * @param {any}      env        The environment object
-   * @param {string}   outputFile The output file path
-   * @param {Function} trackerFn  The progress tracker function
+   * @param {any}    app        The application object
+   * @param {any}    env        The environment object
+   * @param {string} outputFile The output file path
    */
-  constructor(app, env, outputFile, trackerFn = () => {}) {
+  constructor(app, env, outputFile) {
     this.app = app;
     this.env = env;
     this.outputFile = outputFile;
@@ -215,7 +220,6 @@ class ExportSQLCommand {
       id: this.steps.DOWNLOAD,
       name: 'Downloading file'
     }]);
-    this.track = trackerFn;
   }
 
   /**
@@ -315,29 +319,21 @@ class ExportSQLCommand {
       latestBackup
     } = await fetchLatestBackupAndJobStatus(this.app.id, this.env.id);
     if (!latestBackup) {
-      await this.track('no_backup_found_error', {
-        errorMessage: 'No backup found for the site'
-      });
       exit.withError(`No backup found for site ${this.app.name}`);
     } else {
       console.log(`${(0, _format.getGlyphForStatus)('success')} Latest backup found with timestamp ${latestBackup.createdAt}`);
     }
-    if (await this.getExportJob()) {
-      console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
-    } else {
+
+    // See if there is an existing export job for the latest backup
+    if (!(await this.getExportJob())) {
       console.log(`Creating a new export for the backup with timestamp ${latestBackup.createdAt}`);
       try {
         await createExportJob(this.app.id, this.env.id, latestBackup.id);
       } catch (err) {
-        // Todo: match error code instead of message substring
-        if (err !== null && err !== void 0 && err.message.includes('Backup Copy already in progress')) {
-          await this.track('export_job_already_running_error', {
-            errorMessage: err === null || err === void 0 ? void 0 : err.message
-          });
-          exit.withError('There is an export job already running for this site: ' + `https://dashboard.wpvip.com/apps/${this.app.id}/${this.env.uniqueLabel}/data/database/backups\n` + 'Currently, we allow only one export job per site. Please try again later.');
-        }
         exit.withError(`Error creating export job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
+    } else {
+      console.log(`Attaching to an existing export for the backup with timestamp ${latestBackup.createdAt}`);
     }
     this.progressTracker.stepRunning(this.steps.PREPARE);
     this.progressTracker.startPrinting();
@@ -357,9 +353,6 @@ class ExportSQLCommand {
     } catch (err) {
       this.progressTracker.stepFailed(this.steps.DOWNLOAD);
       this.stopProgressTracker();
-      await this.track('download_failed_error', {
-        errorMessage: err === null || err === void 0 ? void 0 : err.message
-      });
       exit.withError(`Error downloading exported file: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
   }

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

@@ -83,13 +83,7 @@ async function getLandoConfig() {
       subdir: '.',
       namespace: '@lando'
     }],
-    disablePlugins: [
-    // Plugins we need:
-    // '@lando/compose',
-    // '@lando/mailhog',
-    // '@lando/phpmyadmin',
-    // The rest we don't need
-    '@lando/acquia', '@lando/apache', '@lando/argv', '@lando/backdrop', '@lando/dotnet', '@lando/drupal', '@lando/elasticsearch', '@lando/go', '@lando/joomla', '@lando/lagoon', '@lando/lamp', '@lando/laravel', '@lando/lemp', '@lando/mariadb', '@lando/mean', '@lando/memcached', '@lando/mongo', '@lando/mssql', '@lando/mysql', '@lando/nginx', '@lando/node', '@lando/pantheon', '@lando/php', '@lando/platformsh', '@lando/postgres', '@lando/python', '@lando/redis', '@lando/ruby', '@lando/solr', '@lando/symfony', '@lando/tomcat', '@lando/varnish', '@lando/wordpress'],
+    disablePlugins: ['@lando/argv'],
     proxyName: 'vip-dev-env-proxy',
     userConfRoot: landoDir,
     home: fakeHomeDir,

package/dist/lib/tracker.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.aliasUser = aliasUser;
-exports.makeCommandTracker = makeCommandTracker;
 exports.trackEvent = trackEvent;
 exports.trackEventWithEnv = trackEventWithEnv;
 var _index = _interopRequireDefault(require("./analytics/index"));
@@ -78,13 +77,4 @@ async function trackEventWithEnv(appId, envId, eventName, eventProps = {}) {
     app_id: appId,
     env_id: envId
   });
-}
-function makeCommandTracker(command, trackingInfo = {}) {
-  const trackerFn = async (type, data = {}) => {
-    await trackEvent(`${command}_command_${type}`, {
-      ...trackingInfo,
-      ...data
-    });
-  };
-  return trackerFn;
 }