@axway/axway-central-cli 2.3.0 → 2.5.1

package/README.md

@@ -97,7 +97,7 @@ Log in to the [Axway Amplify Platform](https://www.axway.com/en/products/amplify
 ```bash
 # If using a regular account
 axway auth login
-# If using a service(DOSA) account
+# If using a service account
 axway auth login --client-id <Service Account Client ID> --secret-file <Private Key>
 ```
 
@@ -121,14 +121,15 @@ USAGE: axway central <command> [options]
 Manage APIs, services and publish to the Unified Catalog
 
 Axway CENTRAL COMMANDS:
-  apply         Update resources from a file
-  completion    Output shell completion code
-  config        Configure Central CLI settings
-  create        Create one or more resources from a file or stdin
-  delete        Delete resources
-  edit          Edit and update resources by using the default editor
-  get           List one or more resources
-  proxies       Manage API proxies
+  apply          Update resources from a file
+  completion     Output shell completion code
+  config         Configure Central CLI settings
+  create         Create one or more resources from a file or stdin
+  delete         Delete resources
+  edit           Edit and update resources by using the default editor
+  get            List one or more resources
+  install        Install additional platform resources
+  proxies        Manage API proxies
 ```
 
 # Commands reference:
@@ -162,23 +163,17 @@ You can always override current region setting in every command by adding option
 axway central get environments --region=EU
 ```
 
-### Client id configuration
+### Account configuration
 
-**_Note: Only required for service accounts._**
-
-Axway Central CLI allows you to provide `--client-id` with every command you run.
+In general, it is not needed to manipulate the `account` configuration. CLI should be able to detect the current default account. However, if you want to use a specific account Axway Central CLI allows you to provide `--account` with every command you run to override your `auth.defaultAccount` config in Axway CLI (you can check its value by running `axway config list` or `axway config get auth.defaultAccount`):
 
 ```bash
-axway central get environments --clientId=<Service Account Client ID>
+axway central get environments --account=<Desired account name>
+# for example:
+axway central get environments --account=amplify-cli:johndoe@axway.com
 ```
 
-Preferred: save your DevOps account clientId for future operations.
-
-```bash
-axway central config set --clientId=<Service Account Client ID>
-# run commands without --client-id param
-axway central get environments
-```
+You can also achieve same goal by running `axway config set auth.defaultAccount <desired account name>` command when needed. Keep in mind that this value is set automatically when you login to the platform using CLI.
 
 ### Extensions:
 
@@ -386,9 +381,9 @@ webhooks                  webh           Webhook                         true
 
 You can fetch resources by Resource, by Short Name, or by the specific Resource Name.
 
-You can "simple filter" resources by title, tag, and attribute. These simple filters can be used independently or in combination(logical AND), i.e. you can filter by title AND tag AND attribute. However, they only support -singular- filters: you can only filter by *one* tag, *one* title, *one* attribute at a time.
+You can "simple filter" resources by title, tag, and attribute. These simple filters can be used independently or in combination(logical AND), i.e. you can filter by title AND tag AND attribute. However, they only support -singular- filters: you can only filter by _one_ tag, _one_ title, _one_ attribute at a time.
 
-For more complex filtering and fetching(e.g. using logical OR, or filterieng by *multiple* tags, titles, attributes, and other filters), you can also query for resources that match [RSQL-formatted](https://github.com/jirutka/rsql-parser#grammar-and-semantic) query parameters you pass in. See the linked documentation for examples of RSQL query syntax, and the "get examples" below for sample usage.
+For more complex filtering and fetching(e.g. using logical OR, or filterieng by _multiple_ tags, titles, attributes, and other filters), you can also query for resources that match [RSQL-formatted](https://github.com/jirutka/rsql-parser#grammar-and-semantic) query parameters you pass in. See the linked documentation for examples of RSQL query syntax, and the "get examples" below for sample usage.
 
 Note: Using the --query flag will override any --title, --tag or --attribute flags you use.
 
@@ -405,7 +400,7 @@ GET ARGUMENTS:
 GET OPTIONS:
   --attribute [key=value]          Attribute in key=value pair format to filter by
   --no-cache                       Do not use cache when communicating with the server
-  --client-id [value]              Override your DevOps account's client ID
+  --account [value]                Override your default account config
   -o, --output [value]             Additional output formats. One of: yaml | json
   -q, --query [RSQL query]         RSQL-formatted query to search for filters that match specific parameters
   --region [value]                 Override your region config
@@ -461,13 +456,16 @@ USAGE: axway central create <command> [options]
 Create one or more resources from a file or stdin
 
 CREATE COMMANDS:
-  environment   Create an environment with the specified name
-  service-account Create a service account
+  agent-resource  Create an agent resource
+  environment     Create an environment with the specified name
 
 CREATE OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  -f,--file=<path>      Filename to use to create the resource
-  -o,--output=<value>   Additional output formats. One of: yaml|json
+  --account [value]                                  Override your default account config
+  --no-cache                                         Do not use cache when communicating with the server
+  -f, --file [path]                                  Filename to use to create the resource
+  -o, --output [value]                               Additional output formats. One of: yaml | json
+  --region [value]                                   Override your region config
+  -y, --yes                                          Automatically reply "yes" to any command prompts.
 ```
 
 ### create: multiple resources from a file
@@ -489,9 +487,12 @@ ENVIRONMENT ARGUMENTS:
   name          Name of new environment
 
 CREATE OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  -f,--file=<path>      Filename to use to create the resource
-  -o,--output=<value>   Additional output formats. One of: yaml|json
+  --account [value]     Override your default account config
+  --no-cache            Do not use cache when communicating with the server
+  -f, --file [path]     Filename to use to create the resource
+  -o, --output [value]  Additional output formats. One of: yaml | json
+  --region [value]      Override your region config
+  -y, --yes             Automatically reply "yes" to any command prompts.
 ```
 
 ### create examples
@@ -503,8 +504,6 @@ axway central create env newenv
 axway central create environment newenv -o yaml
 # create multiple resources from file
 axway central create -f ./some/folder/resources.yaml
-# create a service account(DOSA)
-axway central create service-account
 # create an agent resource
 axway central create agent-resource
 ```
@@ -523,9 +522,12 @@ USAGE: axway central apply [options]
 Update resources from a file
 
 APPLY OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  -f,--file=<path>      Filename to use to create or update the resources. One of: yaml | json
-  -o,--output=<value>   Additional output formats. One of: yaml | json
+  --account [value]     Override your default account config
+  --no-cache            Do not use cache when communicating with the server
+  -f, --file [path]     Filename to use to create or update the resources. One of: yaml | json
+  -o, --output [value]  Additional output formats. One of: yaml | json
+  --region [value]      Override your region config
+  -y, --yes             Automatically reply "yes" to any command prompts.
 ```
 
 ### apply examples
@@ -572,13 +574,13 @@ DELETE ARGUMENTS:
   args...               Command arguments, run "axway central delete" to see the examples
 
 DELETE OPTIONS:
-  --no-cache                            Do not use cache when communicating with the server
-  --client-id [value]                   Override your DevOps account's client ID
-  -f, --file [path]                     Filename to use to delete the resource.
-  --region [value]                      Override your region config
-  -s, --scope [name] or [kind/name]     Scope name or kind/name for scoped resources.
-  --wait                                Wait for the resources to be completely deleted.
-  -y, --yes                             Automatically reply "yes" to any command prompts.
+  --account [value]                  Override your default account config
+  --no-cache                         Do not use cache when communicating with the server
+  -f, --file [path]                  Filename to use to delete the resource.
+  --region [value]                   Override your region config
+  -s, --scope [name] or [kind/name]  Scope name or kind/name for scoped resources.
+  --wait                             Wait for the resources to be completely deleted.
+  -y, --yes                          Automatically reply "yes" to any command prompts.
 ```
 
 ### delete examples
@@ -609,8 +611,10 @@ EDIT COMMANDS:
   environment   Edit an environment with the specified name.
 
 EDIT OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  -o,--output=<value>   Additional output formats. One of: yaml|json
+  --account [value]     Override your default account config
+  --no-cache            Do not use cache when communicating with the server
+  -o, --output [value]  Additional output formats. One of: yaml|json
+  --region [value]      Override your region config
 ```
 
 ### edit: resource by name
@@ -626,8 +630,10 @@ ENVIRONMENT ARGUMENTS:
   name          Name of the environment
 
 EDIT OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  -o,--output=<value>   Additional output formats. One of: yaml|json
+  --account [value]     Override your default account config
+  --no-cache            Do not use cache when communicating with the server
+  -o, --output [value]  Additional output formats. One of: yaml|json
+  --region [value]      Override your region config
 ```
 
 ### edit examples
@@ -653,8 +659,9 @@ INSTALL ARGUMENTS:
   args...               Command arguments, run "axway central install" to see the examples
 
 INSTALL OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  --region=<value>      Override your region config
+  --account [value]  Override your default account config
+  --no-cache         Do not use cache when communicating with the server
+  --region [value]   Override your region config
 ```
 
 ### install: agents configuration
@@ -665,8 +672,9 @@ USAGE: axway central install agents [options]
 Amplify API Gateway / Amazon API Gateway / Azure API Gateway / Istio
 
 INSTALL OPTIONS:
-  --client-id=<value>   Override your DevOps account's client ID
-  --region=<value>      Override your region config
+  --account [value]  Override your default account config
+  --no-cache         Do not use cache when communicating with the server
+  --region [value]   Override your region config
 ```
 
 ### install examples

package/dist/commands/apply/index.js

@@ -33,7 +33,7 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     file,
     output,
     region,
@@ -58,8 +58,13 @@ const action = async ({
       error: []
     }
   };
-  const render = new _Renderer.default(console, output);
-  const client = new _ApiServerClient.ApiServerClient(baseUrl, clientId, region, cache);
+  const render = new _Renderer.default(console, output).startSpin('Creating or updating resource(s)');
+  const client = new _ApiServerClient.ApiServerClient({
+    baseUrl,
+    region,
+    useCache: cache,
+    account
+  });
   const defsManager = new _DefinitionsManager.DefinitionsManager(client);
   log(`executing api calls`);
 
@@ -72,14 +77,15 @@ const action = async ({
     } = await (0, _utils.loadAndVerifySpecs)(file, defsManager.getAllKindsList());
 
     if (!yes && isMissingName) {
+      render.stopSpin();
       if ((await (0, _basicPrompts.askList)({
         msg: `As your file contains resources with missing logical names, their logical names will be autogenerated. \nRun ${_chalk.default.cyan('axway central apply -f <filepath> -o [yaml|json] -y > <output filepath>')} to capture the resource(s) with the autogenerated logical name(s) so you can use them again. \nNOTE: To suppress this prompt in the future, please use the '-y' flag. \nWould you like to continue *without* capturing the resource names in a new file?`,
         choices: _types.YesNoChoices,
         default: _types.YesNo.Yes
       })) === _types.YesNo.No) process.exit(1);
+      render.startSpin('Creating or updating resource(s)');
     }
 
-    render.startSpin('Creating or updating resource(s)');
     const sortedKindsMap = defsManager.getSortedKindsMap();
     results = await client.bulkCreateOrUpdate(docs, sortedKindsMap);
     render.bulkCreateOrUpdateResult(results, 'has successfully been created.', 'has successfully been updated.', 'was created with an autogenerated logical name.');

package/dist/commands/config/set.js

@@ -34,7 +34,12 @@ const action = async ({
 
   if (!isValidRootConfig && !isValidExtension) {
     log((0, _cliKit.chalk)`{magenta Allowed central config values weren't provided. Exiting...}`);
-    return;
+    throw Error(` Allowed central config values weren't provided`);
+  }
+
+  if (argv.clientId) {
+    log(`Unsupported values received`);
+    throw Error(`"client-id" configuration is no longer supported, please check the latest docs for updated examples.`);
   }
 
   try {
@@ -45,11 +50,6 @@ const action = async ({
       (0, _set.default)(config, argv.name, argv.value);
     }
 
-    if (argv.clientId) {
-      log(`Writing ${_types.ConfigTypes.CLIENT_ID}`);
-      config[_types.ConfigTypes.CLIENT_ID] = argv.clientId;
-    }
-
     if (argv.baseUrl) {
       log(`Writing ${_types.ConfigTypes.BASE_URL}`);
       config[_types.ConfigTypes.BASE_URL] = argv.baseUrl;
@@ -107,7 +107,12 @@ const setCommand = {
   action,
   desc: 'Set Central CLI settings',
   options: {
-    '--client-id [value]': "Set your DevOps account's client ID",
+    // TODO: client-id is no longer supported keeping for some time for validation purposes
+    // config rework is going to happen: https://jira.axway.com/browse/APIGOV-19737
+    '--client-id [value]': {
+      hidden: true,
+      descr: "Set your DevOps account's client ID"
+    },
     '--region [value]': 'Set your region, one of: US or EU (US region is used by default if nothing set).',
     '--base-url [value]': {
       hidden: true

package/dist/commands/create/agentResource.js

@@ -33,7 +33,7 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     region
   } = argv;
   const render = new _Renderer.default(console);
@@ -51,7 +51,11 @@ const action = async ({
   };
 
   try {
-    const apiServerClient = new _ApiServerClient.ApiServerClient(baseUrl, clientId, region);
+    const apiServerClient = new _ApiServerClient.ApiServerClient({
+      baseUrl,
+      account,
+      region
+    });
     const defsManager = await new _DefinitionsManager.DefinitionsManager(apiServerClient).init(); // Agent resource Type
 
     parameters.agentType = await askAgentType();

package/dist/commands/create/environment.js

@@ -5,15 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.environment = void 0;
 
-var _cliKit = require("cli-kit");
-
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
-var _ora = _interopRequireDefault(require("ora"));
-
 var _dataService = require("../../common/dataService");
 
-var _errorHandler = require("../../common/errorHandler");
+var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
 
 var _resultsRenderers = require("../../common/resultsRenderers");
 
@@ -29,21 +25,19 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     name,
     output,
     region
   } = argv;
-  const spinner = process.env['DEBUG'] || !!output ? null : (0, _ora.default)({
-    spinner: 'dots3',
-    text: 'Creating an environment'
-  }).start();
+  const render = new _Renderer.default(console, output).startSpin('Creating an environment');
+  let commandIsSuccessful = true;
 
   try {
     // send post request
     const service = await (0, _dataService.dataService)({
       baseUrl,
-      clientId,
+      account,
       region
     });
     const response = await service.post('/management/v1alpha1/environments', {
@@ -51,14 +45,17 @@ const action = async ({
       spec: {}
     }); // render response
 
-    spinner && spinner.succeed((0, _cliKit.chalk)`{greenBright "environment/${name}" has successfully been created.}`);
+    render.success(`"environment/${name}" has successfully been created.`, true);
     output && (0, _resultsRenderers.renderResponse)(console, response, output);
   } catch (e) {
-    log('command error', e);
-    (0, _errorHandler.handleErrors)(console, e, spinner);
+    log('command error', e); // handleErrors(console, e, spinner);
+
+    render.anyError(e);
+    commandIsSuccessful = false;
   } finally {
-    log('command successful');
-    spinner && spinner.stop();
+    log(`command finished, success = ${commandIsSuccessful}`);
+    render.stopSpin();
+    !commandIsSuccessful && process.exit(1);
   }
 };
 

package/dist/commands/create/index.js

@@ -39,7 +39,7 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     file,
     output,
     region,
@@ -50,7 +50,7 @@ const action = async ({
   // cli-kit is also enforcing it on sub-commands
 
   log(`verifying args`);
-  if (!file) throw new Error('To create an environment from a file, please provide -f, --file [path] option');
+  if (!file) throw new Error('To create resources from a file, please provide -f, --file [path] option');
   log(`verifying file: ${file}`);
   (0, _utils.verifyFile)(file);
   let results = {
@@ -58,9 +58,14 @@ const action = async ({
     error: [],
     warning: []
   };
-  const client = new _ApiServerClient.ApiServerClient(baseUrl, clientId, region, cache);
+  const render = new _Renderer.default(console, output).startSpin('Creating resource(s)');
+  const client = new _ApiServerClient.ApiServerClient({
+    baseUrl,
+    account,
+    region,
+    useCache: cache
+  });
   const defsManager = new _DefinitionsManager.DefinitionsManager(client);
-  const render = new _Renderer.default(console, output);
   log(`executing api calls`);
 
   try {
@@ -72,14 +77,15 @@ const action = async ({
     } = await (0, _utils.loadAndVerifySpecs)(file, defsManager.getAllKindsList());
 
     if (!yes && isMissingName) {
+      render.stopSpin();
       if ((await (0, _basicPrompts.askList)({
         msg: `As your file contains resources with missing logical names, their logical names will be autogenerated. \nRun ${_chalk.default.cyan('axway central create -f <filepath> -o [yaml|json] -y > <output filepath>')} to capture the resource(s) with the autogenerated logical name(s) so you can use them again. \nNOTE: To suppress this prompt in the future, please use the '-y' flag. \nWould you like to continue *without* capturing the resource names in a new file?`,
         choices: _types.YesNoChoices,
         default: _types.YesNo.Yes
       })) === _types.YesNo.No) process.exit(1);
+      render.startSpin('Creating resource(s)');
     }
 
-    render.startSpin('Creating resource(s)');
     const sortedKindsMap = defsManager.getSortedKindsMap();
     results = await client.bulkCreate(docs, sortedKindsMap);
     render.bulkResult(results, 'has successfully been created.');

package/dist/commands/create/serviceAccount.js

@@ -5,53 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.serviceAccount = void 0;
 
-var _snooplogg = _interopRequireDefault(require("snooplogg"));
-
-var _ApiCentralClient = require("../../common/ApiCentralClient");
-
-var _bashCommands = require("../../common/bashCommands");
-
-var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
-
-var _helpers = require("../install/helpers");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const {
-  log
-} = (0, _snooplogg.default)('central: create: service-account');
-
-const action = async ({
-  argv,
-  console
-}) => {
-  const {
-    baseUrl,
-    clientId,
-    region
-  } = argv;
-  const render = new _Renderer.default(console);
-  let isCmdError = false;
-  const apiCentralClient = new _ApiCentralClient.ApiCentralClient(baseUrl, clientId, region);
-
-  try {
-    await (0, _bashCommands.isOpenSslInstalled)();
-    const dosaName = await (0, _helpers.askServiceAccountName)();
-    await (0, _helpers.createDosaAndCerts)(apiCentralClient, dosaName);
-  } catch (e) {
-    log('command error', e);
-    render.anyError(e);
-    isCmdError = true;
-  } finally {
-    log('command finished, error = ', isCmdError);
-    if (isCmdError) process.exit(1);
-    process.exit(0);
-  }
+const action = async ({}) => {
+  throw new Error('Creating a service account via "central" is no longer supported. ' + 'Use the "axway" CLI instead. ' + 'Example: "axway service-account create [options]"');
 };
 
 const serviceAccount = {
   aliases: ['service account', 'service-account', 'serviceaccount'],
   action,
-  desc: 'Create a service account'
+  desc: 'Create a service account',
+  hidden: true // Hide this command line option since it's no longer supported.
+
 };
 exports.serviceAccount = serviceAccount;

package/dist/commands/delete/index.js

@@ -33,7 +33,7 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     file,
     wait,
     args,
@@ -50,7 +50,12 @@ const action = async ({
     error: []
   };
   const render = new _Renderer.default(console);
-  const client = new _ApiServerClient.ApiServerClient(baseUrl, clientId, region, cache);
+  const client = new _ApiServerClient.ApiServerClient({
+    baseUrl,
+    account,
+    region,
+    useCache: cache
+  });
   const defsManager = new _DefinitionsManager.DefinitionsManager(client);
 
   if (file && args.length) {
@@ -101,14 +106,29 @@ ${defsManager.getDefsTableForHelpMsg()}`);
         return scope && (scope.kind && scope.kind === ((_defs$scope = defs.scope) === null || _defs$scope === void 0 ? void 0 : _defs$scope.spec.kind) || !scope.kind && !!defs.scope) || !scope && !defs.scope;
       }); // this should never happen, the filtering logic is probably invalid if true
 
-      if (!matchingDefs.length) throw Error(`can't find matching resource definitions.`); // Prompt the confirmation if action will be executed on multiple resources
-
-      if (!yes && matchingDefs.length > 1) {
-        if ((await (0, _basicPrompts.askList)({
-          msg: 'The resource may exist in many scopes, and multiple entities might be deleted. Do you want to continue?',
-          choices: _types.YesNoChoices,
-          default: _types.YesNo.Yes
-        })) === _types.YesNo.No) process.exit(1);
+      if (!matchingDefs.length) throw Error(`can't find matching resource definitions.`); // Ask user if it's okay to delete unless the "--yes" option is set.
+      // Note: Only prompt if it ends up deleting multiple associated resources.
+
+      if (!yes) {
+        let result = _types.YesNo.Yes;
+
+        if (!scope) {
+          result = await (0, _basicPrompts.askList)({
+            msg: 'Deleting this will delete all resources under its scope. Are you sure you want to do this?',
+            choices: _types.YesNoChoices,
+            default: _types.YesNo.No
+          });
+        } else if (matchingDefs.length > 1) {
+          result = await (0, _basicPrompts.askList)({
+            msg: 'The resource may exist in many scopes, and multiple entities might be deleted. Do you want to continue?',
+            choices: _types.YesNoChoices,
+            default: _types.YesNo.No
+          });
+        }
+
+        if (result === _types.YesNo.No) {
+          process.exit(1);
+        }
       }
 
       render.startSpin(`Deleting resources${wait ? ' and waiting for them to be deleted' : ''}`);

package/dist/commands/edit/environment.js

@@ -9,16 +9,14 @@ var _cliKit = require("cli-kit");
 
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 
-var _ora = _interopRequireDefault(require("ora"));
-
-var _TmpFile = _interopRequireDefault(require("../../common/TmpFile"));
-
 var _dataService = require("../../common/dataService");
 
-var _errorHandler = require("../../common/errorHandler");
+var _Renderer = _interopRequireDefault(require("../../common/Renderer"));
 
 var _resultsRenderers = require("../../common/resultsRenderers");
 
+var _TmpFile = _interopRequireDefault(require("../../common/TmpFile"));
+
 var _utils = require("../../common/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -33,28 +31,26 @@ const action = async ({
 }) => {
   const {
     baseUrl,
-    clientId,
+    account,
     name,
     output,
     region
   } = argv;
   log(`editing ${name} env`);
   let file;
-  const spinner = process.env['DEBUG'] || !!output ? null : (0, _ora.default)({
-    spinner: 'dots3',
-    text: `Fetching details of "environment/${name}".`
-  }).start();
+  let commandIsSuccessful = true;
+  const render = new _Renderer.default(console, output).startSpin(`Fetching details of "environment/${name}".`);
 
   try {
     const service = await (0, _dataService.dataService)({
       baseUrl,
-      clientId,
+      account,
       region
     });
     let response = await service.get(`/management/v1alpha1/environments/${name}`);
     file = new _TmpFile.default(response); // stop spinner or it will interfere stdio of editor
 
-    spinner && spinner.stop();
+    render.stopSpin();
     const {
       isUpdated
     } = await file.edit();
@@ -63,22 +59,25 @@ const action = async ({
       // intentionally taking just first doc even if user will provide more in the same file while editing.
       const doc = (0, _utils.LEGACY_loadAndVerifySpecs)(file.path)[0];
       response = await service.put(`/management/v1alpha1/environments/${name}`, doc);
-      spinner && spinner.succeed((0, _cliKit.chalk)`{greenBright "environment/${name}" has successfully been edited.}`); // render result if output flag has been provided
+      render.success((0, _cliKit.chalk)`{greenBright "environment/${name}" has successfully been edited.}`); // render result if output flag has been provided
 
       output && (0, _resultsRenderers.renderResponse)(console, response, output);
     } else {
       log('no changes has been made to file');
-      spinner && spinner.warn((0, _cliKit.chalk)`{yellow Edit cancelled, no changes made.}`);
+      render.error('Edit cancelled, no changes made.');
       file.delete();
+      commandIsSuccessful = false;
     }
   } catch (e) {
     log('command error', e);
     file && console.log(`A copy of your changes has been stored to "${file.path}".`);
-    (0, _errorHandler.handleErrors)(console, e, spinner);
+    render.anyError(e);
+    commandIsSuccessful = false;
   } finally {
-    log('command successful');
-    file && file.delete();
-    spinner && spinner.stop();
+    log(`command finished, success = ${commandIsSuccessful}`);
+    file && commandIsSuccessful && file.delete();
+    render.stopSpin();
+    !commandIsSuccessful && process.exit(1);
   }
 };