@squiz/dxp-cli-next 5.10.0 → 5.11.0

package/lib/datastore/simulator/upgrade/upgrade.spec.js

@@ -0,0 +1,204 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const upgrade_1 = __importDefault(require("./upgrade"));
+const utils = __importStar(require("../utils"));
+const chalk_1 = __importDefault(require("chalk"));
+const nock_1 = __importDefault(require("nock"));
+const logSpy = jest.spyOn(global.console, 'log');
+const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {
+    return undefined;
+}); // prevent process exit on error
+beforeEach(() => {
+    jest.resetAllMocks();
+    (0, nock_1.default)('https://registry.hub.docker.com')
+        .get('/v2/repositories/squizdxp/datastore/tags/latest')
+        .reply(200, {
+        images: [
+            {
+                digest: 'sha256:bd61f8f80d9f235d81477454cf512a6edede0ae6d2d0a8c0508956db2418dbe0',
+            },
+        ],
+    });
+});
+describe('datastoreSimulatorUpgrade', () => {
+    it('should not upgrade a simulator if prompt returns false', () => __awaiter(void 0, void 0, void 0, function* () {
+        const forcePromptSpy = jest
+            .spyOn(utils, 'forcePrompt')
+            .mockResolvedValue(false);
+        let executeCommandCount = 0;
+        const executeCommandSpy = jest
+            .spyOn(utils, 'executeCommand')
+            .mockImplementation((cmd, opt) => {
+            executeCommandCount++;
+            switch (executeCommandCount) {
+                case 1:
+                    expect(cmd).toStrictEqual('docker -v');
+                    return Promise.resolve('Docker version 20.10.23, build 7155243');
+            }
+            return Promise.reject(false);
+        });
+        const program = (0, upgrade_1.default)();
+        const commandErrorSpy = jest.spyOn(program, 'error');
+        yield program.parseAsync([
+            'node',
+            'dxp-cli',
+            'datastore',
+            'simulator',
+            'upgrade',
+        ]);
+        expect(commandErrorSpy).toHaveBeenCalledWith(chalk_1.default.red(`To upgrade run:
+    $ dxp-next datastore simulator upgrade --force
+`));
+        expect(forcePromptSpy).toHaveBeenCalledWith('This will wipe all test data for all of your simulated blueprints. Are you sure you want to continue? (y/N)', false);
+        expect(logSpy).toHaveBeenCalledTimes(1);
+        expect(executeCommandSpy).toHaveBeenCalledTimes(1);
+    }));
+    it('should not upgrade a simulator if already on latest', () => __awaiter(void 0, void 0, void 0, function* () {
+        let executeCommandCount = 0;
+        const executeCommandSpy = jest
+            .spyOn(utils, 'executeCommand')
+            .mockImplementation((cmd, opt) => {
+            executeCommandCount++;
+            switch (executeCommandCount) {
+                case 1:
+                    expect(cmd).toStrictEqual('docker -v');
+                    return Promise.resolve('Docker version 20.10.23, build 7155243');
+                case 2:
+                    expect(cmd).toStrictEqual('docker image inspect squizdxp/datastore:latest --format "{{ index .RepoDigests }}"');
+                    return Promise.resolve('[squizdxp/datastore@sha256:bd61f8f80d9f235d81477454cf512a6edede0ae6d2d0a8c0508956db2418dbe0]');
+            }
+            return Promise.reject(false);
+        });
+        const program = (0, upgrade_1.default)();
+        const commandErrorSpy = jest.spyOn(program, 'error');
+        yield program.parseAsync([
+            'node',
+            'dxp-cli',
+            'datastore',
+            'simulator',
+            'upgrade',
+            '--force',
+        ]);
+        expect(logSpy).toHaveBeenCalledTimes(1);
+        expect(executeCommandSpy).toHaveBeenCalledTimes(2);
+    }));
+    it('should upgrade a simulator if prompt returns true', () => __awaiter(void 0, void 0, void 0, function* () {
+        const forcePromptSpy = jest
+            .spyOn(utils, 'forcePrompt')
+            .mockResolvedValue(true);
+        let executeCommandCount = 0;
+        const executeCommandSpy = jest
+            .spyOn(utils, 'executeCommand')
+            .mockImplementation((cmd, opt) => {
+            executeCommandCount++;
+            // console.info(executeCommandCount, cmd);
+            switch (executeCommandCount) {
+                case 1:
+                    expect(cmd).toStrictEqual('docker -v');
+                    return Promise.resolve('Docker version 20.10.23, build 7155243');
+                case 2:
+                    expect(cmd).toStrictEqual('docker image inspect squizdxp/datastore:latest --format "{{ index .RepoDigests }}"');
+                    return Promise.resolve('[squizdxp/datastore@sha256:bd61f8f80d9f235d81477454cf512a6edede0ae6d2d0a8c0508956db2418dbe1]');
+                case 3:
+                    expect(cmd).toStrictEqual('docker image inspect squizdxp/datastore:latest --format \'{{ or (index .Config.Labels "squiz.datastore.version") (printf "Unknown") }}\'');
+                    return Promise.resolve('4.0.0');
+                case 4:
+                    expect(cmd).toStrictEqual('docker ps -a --filter "name=datastore-sim-*" --format "{{.Names}}~{{.Labels}}~{{.Status}}~{{.Ports}}#"');
+                    return Promise.resolve('datastore-sim-6909fc2c~desktop.docker.io/binds/0/Source=/Users/pnolland/Documents/Work/GitRepos/blueprints/boilerplate,desktop.docker.io/binds/0/SourceKind=hostFile,desktop.docker.io/binds/0/Target=/var/www/instances,port=7001,squiz.datastore.version=4.0.0,blueprint=/Users/pnolland/Documents/Work/GitRepos/blueprints/boilerplate/api.yaml~Up 16 hours~0.0.0.0:7001->80/tcp#');
+                case 5:
+                    expect(cmd).toStrictEqual('docker pull squizdxp/datastore:latest');
+                    return Promise.resolve('');
+                case 6:
+                    expect(cmd).toStrictEqual('mktemp -d -t datastore-XXXXXXXXXX');
+                    return Promise.resolve('/tmp/datastore-XXXXXXXXXX');
+                case 7:
+                    expect(cmd).toStrictEqual('mkdir /tmp/datastore-XXXXXXXXXX/datastore-sim-6909fc2c');
+                    return Promise.resolve('');
+                case 8:
+                    expect(cmd).toStrictEqual('docker start datastore-sim-6909fc2c > /dev/null');
+                    return Promise.resolve('');
+                case 9:
+                    expect(cmd).toStrictEqual('docker cp datastore-sim-6909fc2c:/var/www/data /tmp/datastore-XXXXXXXXXX/datastore-sim-6909fc2c/');
+                    return Promise.resolve('');
+                case 10:
+                    expect(cmd).toStrictEqual('docker rm -f datastore-sim-6909fc2c > /dev/null');
+                    return Promise.resolve('');
+                case 11:
+                    expect(cmd).toStrictEqual('docker run -l "blueprint=/Users/pnolland/Documents/Work/GitRepos/blueprints/boilerplate/api.yaml" -l "port=7001" -itd --name datastore-sim-6909fc2c -p 0.0.0.0:7001:80 -e MYHOST=0.0.0.0 -e MYPORT=7001 -e BLUEPRINT=/Users/pnolland/Documents/Work/GitRepos/blueprints/boilerplate/api.yaml -v "/Users/pnolland/Documents/Work/GitRepos/blueprints/boilerplate":/var/www/instances squizdxp/datastore:latest');
+                    return Promise.resolve('');
+                case 12:
+                    expect(cmd).toStrictEqual('docker cp /tmp/datastore-XXXXXXXXXX/datastore-sim-6909fc2c/data datastore-sim-6909fc2c:/var/www/');
+                    return Promise.resolve('');
+                case 13:
+                    expect(cmd).toStrictEqual('docker image inspect squizdxp/datastore:latest --format \'{{ or (index .Config.Labels "squiz.datastore.version") (printf "Unknown") }}\'');
+                    return Promise.resolve('4.0.1');
+                case 14:
+                    expect(cmd).toStrictEqual('docker exec datastore-sim-6909fc2c cat /var/www/data/containerData.json');
+                    return Promise.resolve('{}');
+                case 15:
+                    expect(cmd).toStrictEqual(`docker exec -i datastore-sim-6909fc2c bash -c "echo '{
+    \\"imageVersion\\": \\"4.0.1\\",
+    \\"imageDigest\\": \\"[squizdxp/datastore@sha256:bd61f8f80d9f235d81477454cf512a6edede0ae6d2d0a8c0508956db2418dbe1]\\"
+}' > /var/www/data/containerData.json"`);
+                    return Promise.resolve('');
+                case 16:
+                    expect(cmd).toStrictEqual('docker exec datastore-sim-6909fc2c bash -c "rm -rf /var/www/data/storage;  rm -rf /var/www/data/provision/**/oven"');
+                    return Promise.resolve('');
+                case 17:
+                    expect(cmd).toStrictEqual('docker image inspect squizdxp/datastore:latest --format \'{{ or (index .Config.Labels "squiz.datastore.version") (printf "Unknown") }}\'');
+                    return Promise.resolve('4.0.1');
+                case 18:
+                    expect(cmd).toStrictEqual('rm -rf /tmp/datastore-XXXXXXXXXX');
+                    return Promise.resolve('');
+            }
+            return Promise.reject(false);
+        });
+        const program = (0, upgrade_1.default)();
+        const commandErrorSpy = jest.spyOn(program, 'error');
+        yield program.parseAsync([
+            'node',
+            'dxp-cli',
+            'datastore',
+            'simulator',
+            'upgrade',
+        ]);
+        expect(forcePromptSpy).toHaveBeenCalledWith('This will wipe all test data for all of your simulated blueprints. Are you sure you want to continue? (y/N)', false);
+        expect(logSpy).toHaveBeenCalledTimes(2);
+        expect(executeCommandSpy).toHaveBeenCalledTimes(18);
+    }));
+});

package/lib/datastore/simulator/utils.d.ts

@@ -1,8 +1,10 @@
+import { FileStore } from '../../ApplicationStore';
 declare type datastoreVersionCache = {
     digest: string;
     updatedAt: number;
     version: string;
 };
+export declare const datastoreSimulatorCache: FileStore;
 export declare const datastoreRepo = "squizdxp/datastore:latest";
 export declare const allowedExtensions: string[];
 export declare const host = "0.0.0.0";

package/lib/datastore/simulator/utils.js

@@ -32,13 +32,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSimulatorDetails = exports.checkUpdateAvailable = exports.checkDockerInstalled = exports.forcePrompt = exports.promptForContinue = exports.stringHashShort = exports.executeCommand = exports.availablePorts = exports.host = exports.allowedExtensions = exports.datastoreRepo = void 0;
+exports.getSimulatorDetails = exports.checkUpdateAvailable = exports.checkDockerInstalled = exports.forcePrompt = exports.promptForContinue = exports.stringHashShort = exports.executeCommand = exports.availablePorts = exports.host = exports.allowedExtensions = exports.datastoreRepo = exports.datastoreSimulatorCache = void 0;
 const child_process_1 = require("child_process");
 const ApplicationStore_1 = require("../../ApplicationStore");
 const ApiService_1 = require("../../ApiService");
 const utils_1 = require("../utils");
 const path_1 = require("path");
-const datastoreSimulatorCache = {
+exports.datastoreSimulatorCache = {
     name: 'datastore-simulator',
     type: 'data',
 };
@@ -95,7 +95,6 @@ const promptForContinue = (versionCache, currentVersion) => __awaiter(void 0, vo
 });
 exports.promptForContinue = promptForContinue;
 const forcePrompt = (message, def = false) => __awaiter(void 0, void 0, void 0, function* () {
-    console.info('WHY!!!!!');
     const inquirer = yield Promise.resolve().then(() => __importStar(require('inquirer')));
     const confirm = yield inquirer.default.prompt([
         {
@@ -124,7 +123,7 @@ const checkUpdateAvailable = () => __awaiter(void 0, void 0, void 0, function* (
     simulatorVersionCmd +=
         ' --format \'{{ or (index .Config.Labels "squiz.datastore.version") (printf "Unknown") }}\'';
     // Default updatedAt to over 1 hour ago to force a check
-    const versionCache = JSON.parse((yield (0, ApplicationStore_1.getApplicationFile)(datastoreSimulatorCache)) ||
+    const versionCache = JSON.parse((yield (0, ApplicationStore_1.getApplicationFile)(exports.datastoreSimulatorCache)) ||
         `{"updatedAt": ${Math.floor(Date.now() / 1000 - 7200)}}`);
     let refreshVersionCache = false;
     let versionInfo = versionCache;
@@ -155,7 +154,7 @@ const checkUpdateAvailable = () => __awaiter(void 0, void 0, void 0, function* (
                 updatedAt: Date.now() / 1000,
                 version: taggedImage.name || '',
             };
-            yield (0, ApplicationStore_1.saveApplicationFile)(datastoreSimulatorCache, JSON.stringify(versionInfo));
+            yield (0, ApplicationStore_1.saveApplicationFile)(exports.datastoreSimulatorCache, JSON.stringify(versionInfo));
         }
         let result;
         try {

package/lib/dxp.js

@@ -14,6 +14,7 @@ validateNodeVersion();
 const auth_1 = __importDefault(require("./auth"));
 const cmp_1 = __importDefault(require("./cmp"));
 const job_runner_1 = __importDefault(require("./job-runner"));
+const datastore_1 = __importDefault(require("./datastore"));
 const program = new commander_1.default.Command();
 const packageJson = require('../package.json');
 const version = packageJson.version;
@@ -24,7 +25,7 @@ program
     .addCommand(auth_1.default)
     .addCommand(cmp_1.default)
     .addCommand(job_runner_1.default)
-    //  .addCommand(datastoreCommand)
+    .addCommand(datastore_1.default)
     .action(() => {
     program.help();
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.10.0",
+  "version": "5.11.0",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },
@@ -39,7 +39,7 @@
     "codecov"
   ],
   "dependencies": {
-    "@squiz/component-cli-lib": "1.63.0",
+    "@squiz/component-cli-lib": "1.64.1",
     "@apidevtools/swagger-parser": "10.1.0",
     "axios": "1.1.3",
     "cli-color": "2.0.3",