@axway/axway-central-cli 2.17.0 → 2.18.0-rc.0

package/dist/common/utils.js

@@ -7,43 +7,27 @@ exports.FormatString = FormatString;
 exports.parseScopeParam = exports.loadAndVerifySpecs = exports.loadAndVerifyApigeeXCredentialFile = exports.isWindows = exports.isValidJson = exports.isApiServerErrorType = exports.isApiServerErrorResponseType = exports.hbsCompare = exports.getConfig = exports.configFile = exports.compareResourcesByKindDesc = exports.compareResourcesByKindAsc = exports.buildTemplate = exports.buildGenericResource = void 0;
 exports.sanitizeMetadata = sanitizeMetadata;
 exports.writeToFile = exports.writeTemplates = exports.verifyScopeParam = exports.verifyFile = exports.transformSimpleFilters = void 0;
-
 var _fsExtra = require("fs-extra");
-
 var _handlebars = _interopRequireDefault(require("handlebars"));
-
 var _jsYaml = require("js-yaml");
-
 var _os = require("os");
-
 var _path = require("path");
-
 var _CompositeError = require("./CompositeError");
-
 var _types = require("./types");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const isWindows = /^win/.test(process.platform);
-exports.isWindows = isWindows;
-const configFile = (0, _path.join)((0, _os.homedir)(), '.axway', 'central.json');
-exports.configFile = configFile;
-
+const isWindows = exports.isWindows = /^win/.test(process.platform);
+const configFile = exports.configFile = (0, _path.join)((0, _os.homedir)(), '.axway', 'central.json');
 const getConfig = async () => !(0, _fsExtra.existsSync)(configFile) ? Promise.resolve({}) : await (0, _fsExtra.readJson)(configFile);
-
 exports.getConfig = getConfig;
-
 const verifyFile = specFilePath => {
   let stats;
   let fileExtension;
-
   try {
     stats = (0, _fsExtra.lstatSync)(specFilePath);
     fileExtension = (0, _path.extname)(specFilePath);
   } catch (e) {
     throw new Error(`Couldn't find the definition file: ${specFilePath}`);
   }
-
   if (!stats.isFile()) {
     throw new Error(`Couldn't load the definition file: ${specFilePath}`);
   } else if (stats.size >= _types.MAX_FILE_SIZE) {
@@ -52,9 +36,7 @@ const verifyFile = specFilePath => {
     throw new Error(`File extension is invalid, please provide '.yaml' or '.yml' or '.json' file`);
   }
 };
-
 exports.verifyFile = verifyFile;
-
 const writeToFile = (path, data) => {
   try {
     (0, _fsExtra.writeFileSync)(path, data);
@@ -63,93 +45,86 @@ const writeToFile = (path, data) => {
     throw new Error(`Error while writing the yaml file to: ${path}`);
   }
 };
+
 /**
  * Checks if the passed item can be converted to a JSON or is a valid JSON object.
  * @param item item to check
  * @returns true if the item can be converted, false otherwise.
  */
-
-
 exports.writeToFile = writeToFile;
-
 const isValidJson = item => {
   let parsedItem = typeof item !== 'string' ? JSON.stringify(item) : item;
-
   try {
     parsedItem = JSON.parse(parsedItem);
   } catch (e) {
     return false;
   }
-
   return typeof parsedItem === 'object' && item !== null;
 };
+
 /**
  * Loads and parse file from path, accepts JSON and YAML files. Also completing validation on "kind" values.
  * @param specFilePath file path
  * @param allowedKinds array of allowed "kind" values
  */
-
-
 exports.isValidJson = isValidJson;
-
 const loadAndVerifySpecs = async (specFilePath, allowedKinds) => {
   // Load the given JSON or YAML file.
   let docs = [];
   let isMissingName = false;
-
   try {
     docs = (0, _jsYaml.loadAll)(await (0, _fsExtra.readFile)(specFilePath, 'utf8'));
   } catch (e) {
     throw new Error(e.reason && e.reason.includes('null byte') ? `File encoding is invalid, please make sure it is using UTF-8` : `File content is invalid.`);
-  } // if user pass an array of json objects, docs const will have nested array, workaround for this:
-
+  }
 
+  // if user pass an array of json objects, docs const will have nested array, workaround for this:
   if ((0, _path.extname)(specFilePath) === '.json' && docs.length === 1 && Array.isArray(docs[0])) {
     docs = docs[0];
-  } // Do not continue if given an empty file.
-
+  }
 
-  if (!docs.length) throw new Error(`File is empty.`); // Validate all entries in the file.
+  // Do not continue if given an empty file.
+  if (!docs.length) throw new Error(`File is empty.`);
 
+  // Validate all entries in the file.
   const errors = [];
-
   const createErrorPrefix = (index, kind, name) => {
     return `Entry ${index + 1}, "${kind}/${name || 'Unknown name'}"`;
   };
-
   for (let index = 0; index < docs.length; index++) {
     // Verify document is defined/valid.
     const doc = docs[index];
-
     if (typeof doc !== 'object' || !doc) {
       errors.push(new Error(`${createErrorPrefix(index)}: Entry format is invalid.`));
       continue;
-    } // Set a flag if at least 1 name is messing in file.
-
+    }
 
+    // Set a flag if at least 1 name is messing in file.
     if (!doc.name) {
       isMissingName = true;
-    } // Validate resource kind.
-
+    }
 
+    // Validate resource kind.
     if (!doc.kind) {
       errors.push(Error(`${createErrorPrefix(index, doc.kind, doc.name)}: The "kind" field is missing.` + `\nCurrently supported values are (case sensitive): ${[...allowedKinds.values()].join(', ')}`));
     } else if (!allowedKinds.has(doc.kind)) {
       errors.push(new Error(`${createErrorPrefix(index, doc.kind, doc.name)}: Kind "${doc.kind}" is unsupported.` + `\nCurrently supported values are (case sensitive): ${[...allowedKinds.values()].join(', ')}`));
-    } // TODO: Validate "metadata.scope.kind" if available. Requires DefinitionManager.getSortedKindsMap() result.
+    }
 
+    // TODO: Validate "metadata.scope.kind" if available. Requires DefinitionManager.getSortedKindsMap() result.
   }
 
   if (errors.length > 0) {
     throw new _CompositeError.CompositeError(errors);
-  } // File's contents appears to be valid. Return loaded info.
-
+  }
 
+  // File's contents appears to be valid. Return loaded info.
   return {
     docs,
     isMissingName
   };
 };
+
 /**
  * Generate a GenericResource instance from resource definition, resource name, and scope name. Used
  * in some rendering logic for the "delete" command.
@@ -159,10 +134,7 @@ const loadAndVerifySpecs = async (specFilePath, allowedKinds) => {
  * @param {string} scopeName optional scope name
  * @returns {GenericResource} generic resource representation
  */
-
-
 exports.loadAndVerifySpecs = loadAndVerifySpecs;
-
 const buildGenericResource = ({
   resourceDef,
   resourceName,
@@ -180,74 +152,63 @@ const buildGenericResource = ({
       scope: {
         kind: resourceDef.spec.scope.kind,
         name: scopeName
-      } // note: forced conversion here only because using generated resources for rendering simple text
-
+      }
+      // note: forced conversion here only because using generated resources for rendering simple text
     } : undefined,
     spec: {}
   };
 };
+
 /**
  * Returns true if error object is of type ApiServerError
  * @param err error object to check
  */
-
-
 exports.buildGenericResource = buildGenericResource;
-
 const isApiServerErrorType = err => {
   const cast = err;
   return !!cast.status && !!cast.title && !!cast.detail;
 };
+
 /**
  * Returns true if error object is of type ApiServerErrorResponse
  * @param err error object to check
  */
-
-
 exports.isApiServerErrorType = isApiServerErrorType;
-
 const isApiServerErrorResponseType = err => {
   const cast = err;
   return !!cast.errors && Array.isArray(cast.errors);
 };
+
 /**
  * Wrapper to return a compare function for sorting by "kind" value in array of resources in ascending
  * order. Order based on "sortedKindValues" array.
  * @param {Array<ResourceDefinition>} sortedResourceDefs  array of ResourceDefinitions defining a required order of the resources.
  * @returns {Function} Array sorting function
  */
-
-
 exports.isApiServerErrorResponseType = isApiServerErrorResponseType;
-
 const compareResourcesByKindAsc = sortedResourceDefs => (a, b) => sortedResourceDefs.findIndex(def => {
   var _def$spec$scope, _a$metadata, _a$metadata$scope;
-
   return def.spec.kind === a.kind && ((_def$spec$scope = def.spec.scope) === null || _def$spec$scope === void 0 ? void 0 : _def$spec$scope.kind) === ((_a$metadata = a.metadata) === null || _a$metadata === void 0 ? void 0 : (_a$metadata$scope = _a$metadata.scope) === null || _a$metadata$scope === void 0 ? void 0 : _a$metadata$scope.kind);
 }) - sortedResourceDefs.findIndex(def => {
   var _def$spec$scope2, _b$metadata, _b$metadata$scope;
-
   return def.spec.kind === b.kind && ((_def$spec$scope2 = def.spec.scope) === null || _def$spec$scope2 === void 0 ? void 0 : _def$spec$scope2.kind) === ((_b$metadata = b.metadata) === null || _b$metadata === void 0 ? void 0 : (_b$metadata$scope = _b$metadata.scope) === null || _b$metadata$scope === void 0 ? void 0 : _b$metadata$scope.kind);
 });
+
 /**
  * Wrapper to return a compare function for sorting by "kind" value in array of resources in descending
  * order. Order based on "sortedKindValues" array.
  * @param {Array<ResourceDefinition>} sortedResourceDefs  array of ResourceDefinitions defining a required order of the resources.
  * @returns {Function} Array sorting function
  */
-
-
 exports.compareResourcesByKindAsc = compareResourcesByKindAsc;
-
 const compareResourcesByKindDesc = sortedResourceDefs => (a, b) => sortedResourceDefs.findIndex(def => {
   var _def$spec$scope3, _b$metadata2, _b$metadata2$scope;
-
   return def.spec.kind === b.kind && ((_def$spec$scope3 = def.spec.scope) === null || _def$spec$scope3 === void 0 ? void 0 : _def$spec$scope3.kind) === ((_b$metadata2 = b.metadata) === null || _b$metadata2 === void 0 ? void 0 : (_b$metadata2$scope = _b$metadata2.scope) === null || _b$metadata2$scope === void 0 ? void 0 : _b$metadata2$scope.kind);
 }) - sortedResourceDefs.findIndex(def => {
   var _def$spec$scope4, _a$metadata2, _a$metadata2$scope;
-
   return def.spec.kind === a.kind && ((_def$spec$scope4 = def.spec.scope) === null || _def$spec$scope4 === void 0 ? void 0 : _def$spec$scope4.kind) === ((_a$metadata2 = a.metadata) === null || _a$metadata2 === void 0 ? void 0 : (_a$metadata2$scope = _a$metadata2.scope) === null || _a$metadata2$scope === void 0 ? void 0 : _a$metadata2$scope.kind);
 });
+
 /**
  * Api-server returns the "resourceVersion" in metadata object as a counter for resource updates.
  * If a user will send this key in the payload it will throw an error so using this helper to sanitizing metadata on
@@ -255,27 +216,21 @@ const compareResourcesByKindDesc = sortedResourceDefs => (a, b) => sortedResourc
  * @param doc resource data
  * @returns {GenericResource} resource data without metadata.resourceVersion key
  */
-
-
 exports.compareResourcesByKindDesc = compareResourcesByKindDesc;
-
 function sanitizeMetadata(doc) {
   var _doc$metadata;
-
   if (doc !== null && doc !== void 0 && (_doc$metadata = doc.metadata) !== null && _doc$metadata !== void 0 && _doc$metadata.resourceVersion) {
     delete doc.metadata.resourceVersion;
   }
-
   return doc;
 }
-
 const buildTemplate = (templateFunc, input) => {
   const template = _handlebars.default.compile(templateFunc(), {
     noEscape: true
   });
-
   return template(input);
 };
+
 /**
  * Takes in a set of parameters (values), compiles a string utilizing the provided handlebars templating function (templateFunc)
  * and the buildTemplate function with those parameters, and finally writes the output string to a file of the name that was provided (fileName).
@@ -283,24 +238,19 @@ const buildTemplate = (templateFunc, input) => {
  * @param  {object} values
  * @param  {()=>string} templateFunc
  */
-
-
 exports.buildTemplate = buildTemplate;
-
 const writeTemplates = (fileName, values, templateFunc) => {
   const data = buildTemplate(templateFunc, values);
   writeToFile(fileName, data);
 };
+
 /**
  * helper function to extend the handlebars built-in helpers functionality to add a way to compare equality of two strings or numbers
  * @param  {string|number} lvalue
  * @param  {string|number} rvalue
  * @param  {{fn:(} options
  */
-
-
 exports.writeTemplates = writeTemplates;
-
 const hbsCompare = () => {
   _handlebars.default.registerHelper('compare', (context, lvalue, rvalue, options) => {
     let operator = options.hash.operator || '===';
@@ -331,7 +281,6 @@ const hbsCompare = () => {
       }
     };
     var result = operators[operator](lvalue, rvalue);
-
     if (result) {
       return options.fn(context);
     } else {
@@ -339,15 +288,13 @@ const hbsCompare = () => {
     }
   });
 };
+
 /**
  * Parse and verify scope param, returns undefined if param is undefined. Throws an error if "Kind" is unknown.
  * @param scopeParam raw scope param value
  * @returns {ParsedScopeParam | undefined}
  */
-
-
 exports.hbsCompare = hbsCompare;
-
 const parseScopeParam = scopeParam => {
   if (!scopeParam) return undefined;else if (scopeParam.indexOf('/') === -1) return {
     name: scopeParam
@@ -361,6 +308,7 @@ const parseScopeParam = scopeParam => {
     };
   }
 };
+
 /**
  * Verify parsed scope param:
  * 1. scope kind should be known.
@@ -369,19 +317,16 @@ const parseScopeParam = scopeParam => {
  * @param defs resource definitions where at least one should match the scope kind if some "scoped" resources are there.
  * @param scopeParam parsed scope param.
  */
-
-
 exports.parseScopeParam = parseScopeParam;
-
 const verifyScopeParam = (allKinds, defs, scopeParam) => {
   const allowedScopeKinds = new Set();
   defs.forEach(defs => !!defs.scope && allowedScopeKinds.add(defs.scope.spec.kind));
-
   if (scopeParam !== null && scopeParam !== void 0 && scopeParam.kind) {
     if (!allKinds.has(scopeParam.kind)) throw new Error(`unsupported kind value "${scopeParam.kind}" in the "--scope" param.` + `\nCurrently supported values are (case sensitive): ${[...allKinds.values()].join(', ')}`);
     if (allowedScopeKinds.size > 0 && !allowedScopeKinds.has(scopeParam.kind)) throw Error(`scope kind "${scopeParam.kind}" is invalid.` + `\n"${defs[0].resource.spec.kind}" resource might exist in the following scopes: ${[...allowedScopeKinds.values()].join(', ')}`);
   }
 };
+
 /**
  * Transforms simple filters(title, attribute, tag) into an RSQL-formatted query string the GET API supports.
  * @param {string} title The title the user wants to filter the resource list by.
@@ -389,10 +334,7 @@ const verifyScopeParam = (allKinds, defs, scopeParam) => {
  * @param {string} tag The tag the user wants to filter the resource list by.
  * @returns {string} transformedFilter, the RSQL formatted query string
  */
-
-
 exports.verifyScopeParam = verifyScopeParam;
-
 const transformSimpleFilters = (title, attribute, tag) => {
   const titleFilter = title ? `title=='*${title}*'` : '';
   const attributeKey = attribute && attribute.split('=')[0];
@@ -403,37 +345,33 @@ const transformSimpleFilters = (title, attribute, tag) => {
   const transformedFilter = formattedFilter.charAt(formattedFilter.length - 1) === ';' ? formattedFilter.slice(0, -1) : formattedFilter;
   return transformedFilter;
 };
-
 exports.transformSimpleFilters = transformSimpleFilters;
-
 function FormatString(str, ...val) {
   for (let index = 0; index < val.length; index++) {
     str = str.replace(`{${index}}`, val[index]);
   }
-
   return str;
 }
+
 /**
  * Loads and parse file from path, accepts JSON file. Also validates additional details.
  * @param credentialFilePath file path
  */
-
-
 const loadAndVerifyApigeeXCredentialFile = async credentialFilePath => {
   // Load the given JSON file.
   let fileInfo = '';
-
   try {
     fileInfo = await (0, _fsExtra.readJson)(credentialFilePath);
   } catch (e) {
     throw new Error(e.reason);
-  } // Do not continue if given an empty file.
+  }
 
+  // Do not continue if given an empty file.
+  if (fileInfo === '') throw new Error(`File is empty.`);
 
-  if (fileInfo === '') throw new Error(`File is empty.`); // TODO: Validate additional details if needed
-  // Return loaded info.
+  // TODO: Validate additional details if needed
 
+  // Return loaded info.
   return fileInfo;
 };
-
 exports.loadAndVerifyApigeeXCredentialFile = loadAndVerifyApigeeXCredentialFile;

package/dist/main.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _cli = _interopRequireDefault(require("./cli"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 _cli.default.exec().catch(err => {
   console.error(err);
   process.exit(err.exitCode || 1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.17.0",
+	"version": "2.18.0-rc.0",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {
@@ -59,7 +59,7 @@
 		"json5": "^2.2.3",
 		"lodash": "^4.17.21",
 		"node-cache": "^5.1.2",
-		"npm-check-updates": "^16.10.8",
+		"npm-check-updates": "16.14.5",
 		"ora": "^5.4.1",
 		"promise-limit": "^2.7.0",
 		"semver": "^7.3.7",