@adinsure-ops/ops-cli 5.4.1-rc5 → 5.4.2-rc1

package/lib/command.base.d.ts

@@ -3,6 +3,7 @@ import SecurityContext from './security/context.js';
 export default abstract class CommandBase<T extends typeof Command> extends Command {
     protected readonly security: SecurityContext;
     private readonly childProcess;
+    private readonly _yarnVersionRegex;
     constructor(argv: string[], config: Config);
     getGitRoot(startDir?: string): Promise<string>;
     getYarnVersion(): Promise<string>;

package/lib/command.base.js

@@ -11,6 +11,7 @@ export default class CommandBase extends Command {
     constructor(argv, config) {
         super(argv, config);
         this.childProcess = new ChildProcessCommand();
+        this._yarnVersionRegex = /^\d+\.\d+\.\d+/;
         this.security = new SecurityContext(this.config.configDir);
     }
     getGitRoot(startDir) {
@@ -32,18 +33,14 @@ export default class CommandBase extends Command {
     }
     getYarnVersion() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.log(`Getting workspace yarn version`);
             const output = yield this.childProcess.runCommand(['yarn', '--version']);
-            // NOTE: When corepack downloads new version of yarn the log is sent to stderr.
-            if (output.error && !output.error.includes('Corepack is about to download')) {
-                ux.action.stop(`${chalk.red(output.error)}`);
-                throw new Error(`Getting yarn version command error: ${output.error}`);
+            const version = output.data.trim().split('\n')[0];
+            if (!this._yarnVersionRegex.test(version)) {
+                ux.action.stop(`${chalk.red('yarn version resolution failure')}`);
+                throw new Error(`Resolved yarn version "${version}" is not in correct format expected "${this._yarnVersionRegex.source}". Command output:\nstdout: "${output.data}",\nstderr: "${output.error}"`);
             }
-            const version = output.data.split('\n')[0];
-            if (version) {
-                return version;
-            }
-            ux.action.stop(`${chalk.red('failed getting yarn version')}`);
-            throw new Error(`Could not resolve yarn version, from "${output.data}"`);
+            return version;
         });
     }
     yarnIsBerryVersion(version) {

package/lib/commands/download/studio.js

@@ -65,9 +65,14 @@ class DownloadStudio extends CommandBase {
     installExtension(extensionPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const cp = new ChildProcessCommand();
-            const commandResult = yield cp.runCommand([this.vscodeExecutable, '--install-extension', extensionPath, '--force']);
-            if (commandResult.error) {
-                this.error(`${chalk.redBright('Installing into VSCode failed!')}\n${commandResult.error}`);
+            // Success is decided by the exit code only (runCommand throws on non-zero exit).
+            // VS Code may write warnings (e.g. Node deprecation warnings) to stderr on a successful install.
+            try {
+                yield cp.runCommand([this.vscodeExecutable, '--install-extension', extensionPath, '--force']);
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (error) {
+                this.error(`${chalk.redBright('Installing into VSCode failed!')}\n${error.message}`);
             }
         });
     }
@@ -133,26 +138,26 @@ class DownloadStudio extends CommandBase {
                 else {
                     file = yield this.downloadFileFromGitLabRu(flags.version);
                 }
-                const writeStream = fs.createWriteStream(filePath);
-                writeStream.write(file.data, 'binary');
-                writeStream.on('finish', () => __awaiter(this, void 0, void 0, function* () {
-                    ux.action.stop(`${chalk.green('OK')}`);
-                    if (flags.install) {
-                        ux.action.start(`Installing into VSCode`, undefined, { stdout: true });
-                        yield this.installExtension(filePath);
-                        ux.action.stop(`${chalk.green('Done')}`);
-                        if (!flags.keep) {
-                            ux.action.start(`Removing VSIX file`, undefined, { stdout: true });
-                            fs.removeSync(filePath);
-                        }
+                yield fs.writeFile(filePath, file.data);
+                ux.action.stop(`${chalk.green('OK')}`);
+                if (flags.install) {
+                    ux.action.start(`Installing into VSCode`, undefined, { stdout: true });
+                    yield this.installExtension(filePath);
+                    ux.action.stop(`${chalk.green('Done')}`);
+                    if (!flags.keep) {
+                        ux.action.start(`Removing VSIX file`, undefined, { stdout: true });
+                        fs.removeSync(filePath);
                         ux.action.stop(`${chalk.green('Done')}`);
-                        this.log(`${chalk.yellow('Use \'CRTL + SHIFT + P\' and select reload windows to apply this studio version.')}`);
                     }
-                }));
-                writeStream.end();
+                    this.log(`${chalk.yellow('Use \'CRTL + SHIFT + P\' and select reload windows to apply this studio version.')}`);
+                }
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             catch (error) {
+                // Errors raised via this.error() are already formatted for oclif
+                if (error.oclif) {
+                    throw error;
+                }
                 switch (error.statusCode) {
                     case 404: {
                         this.error('Does not exist.', { exit: 1 });

package/oclif.manifest.json

@@ -618,6 +618,53 @@
         "unset.js"
       ]
     },
+    "docker:update-image-version": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "Version",
+          "name": "version",
+          "required": true
+        }
+      },
+      "description": "update docker image version docker compose file",
+      "examples": [
+        "$ ops docker:update-image-version 17.0.0 --service server client"
+      ],
+      "flags": {
+        "services": {
+          "description": "list of services to update",
+          "name": "services",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "file-path": {
+          "description": "list of services to update",
+          "name": "file-path",
+          "default": "./docker-compose.yml",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "docker:update-image-version",
+      "pluginAlias": "@adinsure-ops/ops-cli",
+      "pluginName": "@adinsure-ops/ops-cli",
+      "pluginType": "core",
+      "strict": true,
+      "usage": "docker:update-image-version <tag>",
+      "isESM": true,
+      "relativePath": [
+        "lib",
+        "commands",
+        "docker",
+        "update-image-version.js"
+      ]
+    },
     "download:client": {
       "aliases": [
         "download:client"
@@ -1117,53 +1164,6 @@
         "studio.js"
       ]
     },
-    "docker:update-image-version": {
-      "aliases": [],
-      "args": {
-        "version": {
-          "description": "Version",
-          "name": "version",
-          "required": true
-        }
-      },
-      "description": "update docker image version docker compose file",
-      "examples": [
-        "$ ops docker:update-image-version 17.0.0 --service server client"
-      ],
-      "flags": {
-        "services": {
-          "description": "list of services to update",
-          "name": "services",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": true,
-          "type": "option"
-        },
-        "file-path": {
-          "description": "list of services to update",
-          "name": "file-path",
-          "default": "./docker-compose.yml",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "docker:update-image-version",
-      "pluginAlias": "@adinsure-ops/ops-cli",
-      "pluginName": "@adinsure-ops/ops-cli",
-      "pluginType": "core",
-      "strict": true,
-      "usage": "docker:update-image-version <tag>",
-      "isESM": true,
-      "relativePath": [
-        "lib",
-        "commands",
-        "docker",
-        "update-image-version.js"
-      ]
-    },
     "gitlab:get-tag-pipeline": {
       "aliases": [],
       "args": {
@@ -1859,5 +1859,5 @@
       ]
     }
   },
-  "version": "5.4.1-rc5"
+  "version": "5.4.2-rc1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.4.1-rc5",
+    "version": "5.4.2-rc1",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"