496 consistent boolean flags

src/base-command.ts

@@ -5,6 +5,7 @@ import { ValidationErrors } from '.';
 import AppService from './app-config/service';
 import { prettyValidationErrors } from './common/dependency-manager/validation';
 import LoginRequiredError from './common/errors/login-required';
+import { isBooleanStringFlag } from './common/utils/oclif';
 import SentryService from './sentry';
 
 const DEPRECATED_LABEL = '[deprecated]';
@@ -78,7 +79,18 @@ export default abstract class BaseCommand extends Command {
     const args = [];
     const flags = [];
     let flag_option = false;
+
+    const new_args = [];
     for (const arg of argv) {
+      if (!arg.startsWith('-')) {
+        new_args.push(arg);
+      } else {
+        const flag = arg.startsWith('--') ? flag_definitions[arg.replace('--', '')] : Object.values(flag_definitions).find((f: any) => f.char === arg.replace('-', ''));
+        new_args.push(isBooleanStringFlag(flag) ? `${arg}=true` : arg);
+      }
+    }
+
+    for (const arg of new_args) {
       const is_flag = arg.startsWith('-');
 
       if (is_flag || flag_option) {

src/commands/deploy.ts

@@ -8,6 +8,7 @@ import PipelineUtils from '../architect/pipeline/pipeline.utils';
 import BaseCommand from '../base-command';
 import { DeploymentFailedError, PipelineAbortedError, PollingTimeout } from '../common/errors/pipeline-errors';
 import DeployUtils from '../common/utils/deploy.utils';
+import { booleanString } from '../common/utils/oclif';
 import { buildSpecFromPath } from '../dependency-manager/spec/utils/component-builder';
 import { ComponentVersionSlugUtils } from '../dependency-manager/spec/utils/slugs';
 import Dev from "./dev";
@@ -80,17 +81,19 @@ export default class Deploy extends DeployCommand {
     ...DeployCommand.flags,
     ...AccountUtils.flags,
     ...EnvironmentUtils.flags,
-    local: Flags.boolean({
+    local: booleanString({
       char: 'l',
       description: `${BaseCommand.DEPRECATED} Deploy the stack locally instead of via Architect Cloud`,
       exclusive: ['account', 'auto-approve', 'auto_approve', 'refresh'],
       hidden: true,
       sensitive: false,
+      default: undefined,
     }),
-    production: Flags.boolean({
+    production: booleanString({
       description: `${BaseCommand.DEPRECATED} Please use --environment.`,
       dependsOn: ['local'],
       sensitive: false,
+      default: undefined,
     }),
     compose_file: Flags.string({
       description: `${BaseCommand.DEPRECATED} Please use --compose-file.`,
@@ -105,11 +108,12 @@ export default class Deploy extends DeployCommand {
       exclusive: ['account', 'environment', 'auto-approve', 'auto_approve', 'refresh'],
       sensitive: false,
     }),
-    detached: Flags.boolean({
+    detached: booleanString({
       description: 'Run in detached mode',
       char: 'd',
       dependsOn: ['local'],
       sensitive: false,
+      default: undefined,
     }),
     parameter: Flags.string({
       char: 'p',
@@ -146,30 +150,26 @@ export default class Deploy extends DeployCommand {
       multiple: true,
       description: `${BaseCommand.DEPRECATED} Please use --secret-file.`,
     }),
-    'deletion-protection': Flags.boolean({
+    'deletion-protection': booleanString({
       default: true,
-      allowNo: true,
       description: '[default: true] Toggle for deletion protection on deployments',
       exclusive: ['local'],
       sensitive: false,
     }),
-    recursive: Flags.boolean({
+    recursive: booleanString({
       char: 'r',
       default: true,
-      allowNo: true,
       description: '[default: true] Toggle to automatically deploy all dependencies',
       sensitive: false,
     }),
-    refresh: Flags.boolean({
+    refresh: booleanString({
       default: true,
       hidden: true,
-      allowNo: true,
       exclusive: ['local', 'compose-file', 'compose_file'],
       sensitive: false,
     }),
-    browser: Flags.boolean({
+    browser: booleanString({
       default: true,
-      allowNo: true,
       description: '[default: true] Automatically open urls in the browser for local deployments',
       sensitive: false,
     }),

src/commands/dev.ts

@@ -192,7 +192,7 @@ export default class Dev extends BaseCommand {
 
   static examples = [
     'architect dev ./mycomponent/architect.yml',
-    'architect dev --port=81 --no-browser --debug=true --secret-file=./mycomponent/mysecrets.yml ./mycomponent/architect.yml',
+    'architect dev --port=81 --browser=false --debug=true --secret-file=./mycomponent/mysecrets.yml ./mycomponent/architect.yml',
   ];
 
   static flags = {
@@ -236,16 +236,14 @@ export default class Dev extends BaseCommand {
       multiple: true,
       default: [],
     }),
-    recursive: Flags.boolean({
+    recursive: booleanString({
       char: 'r',
       default: true,
-      allowNo: true,
       description: '[default: true] Toggle to automatically deploy all dependencies',
       sensitive: false,
     }),
-    browser: Flags.boolean({
+    browser: booleanString({
       default: true,
-      allowNo: true,
       description: '[default: true] Automatically open urls in the browser for local deployments',
       sensitive: false,
     }),
@@ -254,18 +252,20 @@ export default class Dev extends BaseCommand {
       sensitive: false,
     }),
     // Used for proxy from deploy to dev. These will be removed once --local is deprecated
-    local: Flags.boolean({
+    local: booleanString({
       char: 'l',
       description: `${Command.DEPRECATED} Deploy the stack locally instead of via Architect Cloud`,
       exclusive: ['account', 'auto-approve', 'auto_approve', 'refresh'],
       hidden: true,
       sensitive: false,
+      default: undefined,
     }),
-    production: Flags.boolean({
+    production: booleanString({
       description: `${Command.DEPRECATED} Please use --environment.`,
       dependsOn: ['local'],
       hidden: true,
       sensitive: false,
+      default: undefined,
     }),
     compose_file: Flags.string({
       description: `${Command.DEPRECATED} Please use --compose-file.`,
@@ -278,10 +278,11 @@ export default class Dev extends BaseCommand {
       hidden: true,
       description: `${Command.DEPRECATED} Please use --secret-file.`,
     }),
-    detached: Flags.boolean({
+    detached: booleanString({
       description: 'Run in detached mode',
       char: 'd',
       sensitive: false,
+      default: false,
     }),
     debug: booleanString({
       description: `[default: true] Turn debug mode on (true) or off (false)`,

src/commands/environments/destroy.ts

@@ -1,9 +1,10 @@
-import { CliUx, Flags, Interfaces } from '@oclif/core';
+import { CliUx, Interfaces } from '@oclif/core';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import AccountUtils from '../../architect/account/account.utils';
 import { EnvironmentUtils } from '../../architect/environment/environment.utils';
 import BaseCommand from '../../base-command';
+import { booleanString } from '../../common/utils/oclif';
 
 export default class EnvironmentDestroy extends BaseCommand {
   static aliases = ['environment:destroy', 'envs:destroy', 'env:destroy', 'env:deregister', 'environment:deregister'];
@@ -15,17 +16,18 @@ export default class EnvironmentDestroy extends BaseCommand {
   static flags = {
     ...BaseCommand.flags,
     ...AccountUtils.flags,
-    auto_approve: Flags.boolean({
+    auto_approve: booleanString({
       description: `${BaseCommand.DEPRECATED} Please use --auto-approve.`,
       hidden: true,
       sensitive: false,
+      default: false,
     }),
-    ['auto-approve']: Flags.boolean({
+    ['auto-approve']: booleanString({
       description: 'Automatically apply the changes',
       default: false,
       sensitive: false,
     }),
-    force: Flags.boolean({
+    force: booleanString({
       description: 'Force the deletion even if the environment is not empty',
       char: 'f',
       default: false,

src/commands/exec.ts

@@ -10,6 +10,7 @@ import AccountUtils from '../architect/account/account.utils';
 import { EnvironmentUtils, Replica } from '../architect/environment/environment.utils';
 import BaseCommand from '../base-command';
 import { DockerComposeUtils } from '../common/docker-compose';
+import { booleanString } from '../common/utils/oclif';
 
 enum RemoteExecCommandOutputStatus {
   SUCCESS = 'Success',
@@ -46,16 +47,14 @@ export default class Exec extends BaseCommand {
     ...BaseCommand.flags,
     ...AccountUtils.flags,
     ...EnvironmentUtils.flags,
-    stdin: Flags.boolean({
+    stdin: booleanString({
       description: 'Pass stdin to the container. Only works on remote deploys.',
       char: 'i',
-      allowNo: true,
       default: true,
     }),
-    tty: Flags.boolean({
+    tty: booleanString({
       description: 'Stdin is a TTY. If the flag isn\'t supplied, tty or no-tty is automatically detected.',
       char: 't',
-      allowNo: true,
       default: undefined,
       sensitive: false,
     }),

src/commands/logs.ts

@@ -10,6 +10,7 @@ import Environment from '../architect/environment/environment.entity';
 import { EnvironmentUtils, Replica } from '../architect/environment/environment.utils';
 import BaseCommand from '../base-command';
 import { DockerComposeUtils } from '../common/docker-compose';
+import { booleanString } from '../common/utils/oclif';
 
 export default class Logs extends BaseCommand {
   async auth_required(): Promise<boolean> {
@@ -25,7 +26,7 @@ export default class Logs extends BaseCommand {
     ...BaseCommand.flags,
     ...AccountUtils.flags,
     ...EnvironmentUtils.flags,
-    follow: Flags.boolean({
+    follow: booleanString({
       description: 'Specify if the logs should be streamed.',
       char: 'f',
       default: false,
@@ -36,7 +37,7 @@ export default class Logs extends BaseCommand {
       default: '',
       sensitive: false,
     }),
-    raw: Flags.boolean({
+    raw: booleanString({
       description: 'Show the raw output of the logs.',
       default: false,
       sensitive: false,
@@ -46,7 +47,7 @@ export default class Logs extends BaseCommand {
       default: -1,
       sensitive: false,
     }),
-    timestamps: Flags.boolean({
+    timestamps: booleanString({
       description: 'Include timestamps on each line in the log output.',
       default: false,
       sensitive: false,

src/commands/platforms/create.ts

@@ -7,6 +7,7 @@ import PipelineUtils from '../../architect/pipeline/pipeline.utils';
 import { CreatePlatformInput } from '../../architect/platform/platform.utils';
 import BaseCommand from '../../base-command';
 import { KubernetesPlatformUtils } from '../../common/utils/kubernetes-platform.utils';
+import { booleanString } from '../../common/utils/oclif';
 
 export default class PlatformCreate extends BaseCommand {
   static aliases = ['platforms:register', 'platform:create', 'platforms:create'];
@@ -25,12 +26,16 @@ export default class PlatformCreate extends BaseCommand {
   static flags = {
     ...BaseCommand.flags,
     ...AccountUtils.flags,
-    auto_approve: Flags.boolean({
+    auto_approve: booleanString({
       description: `${BaseCommand.DEPRECATED} Please use --auto-approve.`,
       hidden: true,
       sensitive: false,
+      default: false,
+    }),
+    ['auto-approve']: booleanString({
+      sensitive: false,
+      default: false,
     }),
-    ['auto-approve']: Flags.boolean({ sensitive: false }),
     type: Flags.string({
       char: 't',
       options: ['KUBERNETES', 'kubernetes'],

src/commands/platforms/destroy.ts

@@ -1,9 +1,10 @@
-import { CliUx, Flags, Interfaces } from '@oclif/core';
+import { CliUx, Interfaces } from '@oclif/core';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import AccountUtils from '../../architect/account/account.utils';
 import PlatformUtils from '../../architect/platform/platform.utils';
 import BaseCommand from '../../base-command';
+import { booleanString } from '../../common/utils/oclif';
 
 export default class PlatformDestroy extends BaseCommand {
   static aliases = ['platforms:deregister', 'platform:destroy', 'platforms:destroy'];
@@ -15,17 +16,18 @@ export default class PlatformDestroy extends BaseCommand {
   static flags = {
     ...BaseCommand.flags,
     ...AccountUtils.flags,
-    auto_approve: Flags.boolean({
+    auto_approve: booleanString({
       description: `${BaseCommand.DEPRECATED} Please use --auto-approve.`,
       hidden: true,
       sensitive: false,
+      default: false,
     }),
-    ['auto-approve']: Flags.boolean({
+    ['auto-approve']: booleanString({
       description: 'Automatically apply the changes',
       default: false,
       sensitive: false,
     }),
-    force: Flags.boolean({
+    force: booleanString({
       description: 'Force the deletion even if the platform is not empty',
       char: 'f',
       default: false,

src/commands/secrets/upload.ts

@@ -1,4 +1,3 @@
-import { Flags } from '@oclif/core';
 import fs from 'fs-extra';
 import yaml from 'js-yaml';
 import path from 'path';
@@ -9,6 +8,7 @@ import { EnvironmentUtils } from '../../architect/environment/environment.utils'
 import SecretUtils, { Secret } from '../../architect/secret/secret.utils';
 import UserUtils from '../../architect/user/user.utils';
 import BaseCommand from '../../base-command';
+import { booleanString } from '../../common/utils/oclif';
 import { SecretsDict } from '../../dependency-manager/secrets/type';
 
 export default class SecretsUpload extends BaseCommand {
@@ -22,7 +22,7 @@ export default class SecretsUpload extends BaseCommand {
     ...BaseCommand.flags,
     ...AccountUtils.flags,
     ...EnvironmentUtils.flags,
-    override: Flags.boolean({
+    override: booleanString({
       description: 'Allow override of existing secrets',
       default: false,
       sensitive: false,

src/commands/task.ts

@@ -6,6 +6,7 @@ import { EnvironmentUtils } from '../architect/environment/environment.utils';
 import BaseCommand from '../base-command';
 import { DockerComposeUtils } from '../common/docker-compose';
 import * as Docker from '../common/utils/docker';
+import { booleanString } from '../common/utils/oclif';
 
 export default class TaskExec extends BaseCommand {
   static aliases = ['task:exec'];
@@ -25,11 +26,12 @@ export default class TaskExec extends BaseCommand {
     ...AccountUtils.flags,
     ...EnvironmentUtils.flags,
 
-    local: Flags.boolean({
+    local: booleanString({
       char: 'l',
       description: 'Deploy the stack locally instead of via Architect Cloud',
       exclusive: ['account', 'auto-approve', 'auto_approve', 'refresh'],
       sensitive: false,
+      default: false,
     }),
     compose_file: Flags.string({
       description: `${BaseCommand.DEPRECATED} Please use --compose-file.`,

src/commands/unlink.ts

@@ -1,9 +1,9 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import path from 'path';
 import untildify from 'untildify';
 import { buildSpecFromPath } from '../';
 import BaseCommand from '../base-command';
+import { booleanString } from '../common/utils/oclif';
 
 export default class Unlink extends BaseCommand {
   async auth_required(): Promise<boolean> {
@@ -18,9 +18,10 @@ export default class Unlink extends BaseCommand {
   ];
   static flags = {
     ...BaseCommand.flags,
-    all: Flags.boolean({
+    all: booleanString({
       description: 'Unlink all components registered locally',
       sensitive: false,
+      default: false,
     }),
   };