@axway/axway-central-cli 2.25.0 → 2.26.0-rc.1

package/dist/commands/install/agents.js

@@ -25,6 +25,7 @@ var helpers = _interopRequireWildcard(require("./helpers"));
 var istioAgents = _interopRequireWildcard(require("./istioAgents"));
 var saasAgents = _interopRequireWildcard(require("./awsSaasAgents"));
 var kafkaAgents = _interopRequireWildcard(require("./kafkaAgents"));
+var swaggerHubAgents = _interopRequireWildcard(require("./swaggerHubSaasAgents"));
 var platform = _interopRequireWildcard(require("./platform"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -46,12 +47,14 @@ const agentInstallFlows = {
   [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
   [_types.GatewayTypes.AZURE_GATEWAY]: azureAgents.AzureInstallMethods,
   [_types.GatewayTypes.ISTIO]: istioAgents.IstioInstallMethods,
-  [_types.GatewayTypes.KAFKA]: kafkaAgents.KafkaInstallMethods
+  [_types.GatewayTypes.KAFKA]: kafkaAgents.KafkaInstallMethods,
+  [_types.GatewayTypes.SWAGGERHUB]: swaggerHubAgents.SwaggerHubSaaSInstallMethods
 };
 const saasAgentInstallFlows = {
   [_types.GatewayTypes.AWS_GATEWAY]: saasAgents.AWSSaaSInstallMethods,
   [_types.GatewayTypes.GITHUB]: gitHubAgents.GitHubSaaSInstallMethods,
-  [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods
+  [_types.GatewayTypes.APIGEEX_GATEWAY]: apigeeSaaSAgents.APIGEEXSaaSInstallMethods,
+  [_types.GatewayTypes.SWAGGERHUB]: swaggerHubAgents.SwaggerHubSaaSInstallMethods
 };
 const createConfigBackup = async (configFiles, gatewayType) => {
   // If current configurations exist, back them up
@@ -124,7 +127,7 @@ const agents = exports.agents = {
           default: _types.YesNo.Yes
         })) === _types.YesNo.Yes;
       }
-      if (gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.GatewayTypes.GITHUB) {
+      if (gatewayType === _types.GatewayTypes.APIGEEX_GATEWAY || gatewayType === _types.GatewayTypes.GITHUB || gatewayType === _types.GatewayTypes.SWAGGERHUB) {
         installConfig.switches.isHostedInstall = true;
       }
 

package/dist/commands/install/gitHubSaasAgents.js

@@ -87,7 +87,7 @@ class SaasGitHubAgentValues extends SaasAgentValues {
 // ConfigFiles - all the config file that are used in the setup
 const ConfigFiles = {};
 
-// APIGEEX SaaSPrompts - all APIGEEX Saas prompts to the user for input
+// GitHub SaaSPrompts - all GitHub Saas prompts to the user for input
 const SaasPrompts = {
   ACCESS_TOKEN: 'Enter the GitHub Access Token the agent will use',
   REPOSITORY_OWNER: 'Enter the GitHub Repository Owner the agent will use',
@@ -261,7 +261,6 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
   try {
     await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], dataplaneRes.name, await createEncryptedAccessData(gitHubAgentValues, dataplaneRes));
   } catch (error) {
-    console.log(error);
     console.log(_chalk.default.redBright("rolling back installation. Please check the credential data before re-running install"));
     if (installConfig.centralConfig.ampcEnvInfo.isNew) {
       await helpers.deleteByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env');

package/dist/commands/install/swaggerHubSaasAgents.js

@@ -0,0 +1,274 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testables = exports.askBundleType = exports.SwaggerHubSaaSInstallMethods = void 0;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _snooplogg = _interopRequireDefault(require("snooplogg"));
+var _basicPrompts = require("../../common/basicPrompts");
+var _types = require("../../common/types");
+var helpers = _interopRequireWildcard(require("./helpers"));
+var _crypto = _interopRequireDefault(require("crypto"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+const {
+  log
+} = (0, _snooplogg.default)('central: install: agents: saas');
+class DataplaneConfig {
+  constructor(type) {
+    _defineProperty(this, "type", void 0);
+    this.type = type || "";
+  }
+}
+class SwaggerHubDataplaneConfig extends DataplaneConfig {
+  constructor(owner, filter) {
+    super("SwaggerHub");
+    _defineProperty(this, "owner", void 0);
+    _defineProperty(this, "filter", void 0);
+    this.owner = owner;
+    this.filter = filter;
+  }
+}
+class SwaggerHubFilterConfig {
+  constructor(visibility, publication) {
+    _defineProperty(this, "visibility", void 0);
+    _defineProperty(this, "publication", void 0);
+    this.visibility = visibility;
+    this.publication = publication;
+  }
+}
+var SwaggerHubFilterVisibility = /*#__PURE__*/function (SwaggerHubFilterVisibility) {
+  SwaggerHubFilterVisibility["Both"] = "Both";
+  SwaggerHubFilterVisibility["Public"] = "Public";
+  SwaggerHubFilterVisibility["Private"] = "Private";
+  return SwaggerHubFilterVisibility;
+}(SwaggerHubFilterVisibility || {});
+var SwaggerHubFilterPublication = /*#__PURE__*/function (SwaggerHubFilterPublication) {
+  SwaggerHubFilterPublication["Both"] = "Both";
+  SwaggerHubFilterPublication["Published"] = "Published";
+  SwaggerHubFilterPublication["UnPublished"] = "UnPublished";
+  return SwaggerHubFilterPublication;
+}(SwaggerHubFilterPublication || {});
+class SaasAgentValues {
+  constructor() {
+    _defineProperty(this, "frequencyDA", void 0);
+    _defineProperty(this, "queueDA", void 0);
+    _defineProperty(this, "frequencyTA", void 0);
+    _defineProperty(this, "dataplaneConfig", void 0);
+    _defineProperty(this, "centralConfig", void 0);
+    _defineProperty(this, "owner", void 0);
+    _defineProperty(this, "visibility", void 0);
+    _defineProperty(this, "publication", void 0);
+    this.frequencyDA = '';
+    this.queueDA = false;
+    this.frequencyTA = '';
+    this.dataplaneConfig = new DataplaneConfig();
+    this.centralConfig = new _types.CentralAgentConfig();
+    this.owner = '';
+    this.visibility = SwaggerHubFilterVisibility.Both;
+    this.publication = SwaggerHubFilterPublication.Both;
+  }
+}
+class SaasSwaggerHubAgentValues extends SaasAgentValues {
+  constructor() {
+    super();
+    _defineProperty(this, "apiKey", void 0);
+    this.apiKey = '';
+  }
+  getAccessData() {
+    let data = JSON.stringify({
+      apiKey: this.apiKey
+    });
+    return data;
+  }
+}
+
+// ConfigFiles - all the config file that are used in the setup
+const ConfigFiles = {};
+
+// SwaggerHub SaaSPrompts - all SwaggerHub Saas prompts to the user for input
+const SaasPrompts = {
+  API_KEY: 'Enter the SwaggerHub API Key the agent will use',
+  ORGANIZATION_OWNER: 'Enter the SwaggerHub Organization Owner the agent will use',
+  API_VISIBILITY: 'Enter the visibility of the APIs to be discovered (Optional). If nothing is selected, both Private and Public APIs will be discoverd',
+  API_PUBLICATION: 'Enter the publication status of APIs to be discovered (Optional). If nothing is selected, both Published and UnPublished APIs will be discovered',
+  DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
+  QUEUE: 'Do you want to discover immediately after installation'
+};
+const askBundleType = async () => {
+  //SwaggerHub agent has only DA
+  return _types.BundleType.DISCOVERY;
+};
+exports.askBundleType = askBundleType;
+const askConfigType = async () => {
+  return _types.AgentConfigTypes.HOSTED;
+};
+const askForSwaggerHubCredentials = async hostedAgentValues => {
+  log("gathering access details for SwaggerHub");
+  hostedAgentValues.apiKey = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.API_KEY,
+    defaultValue: hostedAgentValues.apiKey !== '' ? hostedAgentValues.apiKey : undefined
+  });
+  return hostedAgentValues;
+};
+const validateFrequency = () => input => {
+  let val = (0, _basicPrompts.validateRegex)(helpers.frequencyRegex, helpers.invalidValueExampleErrMsg('frequency', '3d5h12m'))(input);
+  if (typeof val === "string") {
+    return val;
+  }
+  let r = input.toString().match(/^(\d*)m/);
+  if (r) {
+    // only minutes
+    let mins = r[1];
+    if (parseInt(mins, 10) < 30) {
+      return "Minimum frequency is 30m";
+    }
+  }
+  return true;
+};
+
+// @ts-ignore
+const gatewayConnectivity = async installConfig => {
+  console.log('\nCONNECTION TO SwaggerHub API GATEWAY:');
+  console.log(_chalk.default.gray("The Discovery Agent needs to connect to the SwaggerHub API Gateway to discover API's for publishing to Amplify Central"));
+
+  // DeploymentType
+  let hostedAgentValues = new SaasAgentValues();
+  if (installConfig.gatewayType === _types.GatewayTypes.SWAGGERHUB) {
+    // SwaggerHub connection details
+    hostedAgentValues = new SaasSwaggerHubAgentValues();
+    hostedAgentValues = await askForSwaggerHubCredentials(hostedAgentValues);
+  }
+
+  // Ask to queue discovery now
+  log("getting the frequency and if the agent should run now");
+  console.log(_chalk.default.gray("\n00d00h00m format, where 30m = 30 minutes, 1h = 1 hour, 7d = 7 days, and 7d1h30m = 7 days 1 hour and 30 minutes. Minimum of 30m."));
+  hostedAgentValues.frequencyDA = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.DA_FREQUENCY,
+    validate: validateFrequency(),
+    allowEmptyInput: true
+  });
+  hostedAgentValues.queueDA = (await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.QUEUE,
+    default: _types.YesNo.No,
+    choices: _types.YesNoChoices
+  })) === _types.YesNo.Yes;
+
+  // get swaggerhub organization owner
+  hostedAgentValues.owner = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.ORGANIZATION_OWNER,
+    defaultValue: hostedAgentValues.owner !== '' ? hostedAgentValues.owner : undefined
+  });
+
+  // get visility of APIs to be discovered
+  hostedAgentValues.visibility = await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.API_VISIBILITY,
+    default: SwaggerHubFilterVisibility.Both,
+    choices: [{
+      name: SwaggerHubFilterVisibility.Both,
+      value: SwaggerHubFilterVisibility.Both
+    }, {
+      name: SwaggerHubFilterVisibility.Public,
+      value: SwaggerHubFilterVisibility.Public
+    }, {
+      name: SwaggerHubFilterVisibility.Private,
+      value: SwaggerHubFilterVisibility.Private
+    }]
+  });
+
+  // get publication status of APIs to be discovered
+  hostedAgentValues.publication = await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.API_PUBLICATION,
+    default: SwaggerHubFilterPublication.Both,
+    choices: [{
+      name: SwaggerHubFilterPublication.Both,
+      value: SwaggerHubFilterPublication.Both
+    }, {
+      name: SwaggerHubFilterPublication.Published,
+      value: SwaggerHubFilterPublication.Published
+    }, {
+      name: SwaggerHubFilterPublication.UnPublished,
+      value: SwaggerHubFilterPublication.UnPublished
+    }]
+  });
+  return hostedAgentValues;
+};
+const generateOutput = async installConfig => {
+  return `Install complete of hosted agent for ${installConfig.gatewayType} region`;
+};
+const createEncryptedAccessData = async (hostedAgentValues, dataplaneRes) => {
+  var _dataplaneRes$securit, _dataplaneRes$securit2;
+  // grab key from data plane resource
+  let key = ((_dataplaneRes$securit = dataplaneRes.security) === null || _dataplaneRes$securit === void 0 ? void 0 : _dataplaneRes$securit.encryptionKey) || "";
+  let hash = ((_dataplaneRes$securit2 = dataplaneRes.security) === null || _dataplaneRes$securit2 === void 0 ? void 0 : _dataplaneRes$securit2.encryptionHash) || "";
+  if (key === "" || hash === "") {
+    throw Error(`cannot encrypt access data as the encryption key info was incomplete`);
+  }
+  console.log(hostedAgentValues.getAccessData());
+  let encData = _crypto.default.publicEncrypt({
+    key: key,
+    padding: _crypto.default.constants.RSA_PKCS1_OAEP_PADDING,
+    oaepHash: hash
+  }, Buffer.from(hostedAgentValues.getAccessData()));
+  return encData.toString("base64");
+};
+const completeInstall = async (installConfig, apiServerClient, defsManager) => {
+  /**
+   * Create agent resources
+   */
+  console.log("\n");
+  let swaggerHubAgentValues = installConfig.gatewayConfig;
+
+  // create the environment, if necessary
+  installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env', {
+    axwayManaged: installConfig.centralConfig.axwayManaged,
+    production: installConfig.centralConfig.production
+  }) : installConfig.centralConfig.ampcEnvInfo.name;
+  if (installConfig.gatewayType === _types.GatewayTypes.SWAGGERHUB) {
+    swaggerHubAgentValues.dataplaneConfig = new SwaggerHubDataplaneConfig(swaggerHubAgentValues.owner, new SwaggerHubFilterConfig(swaggerHubAgentValues.visibility, swaggerHubAgentValues.publication));
+  }
+
+  // create the data plane resource
+  let dataplaneRes = await helpers.createNewDataPlaneResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], swaggerHubAgentValues.dataplaneConfig);
+  // create data plane secret resource
+  try {
+    await helpers.createNewDataPlaneSecretResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], dataplaneRes.name, await createEncryptedAccessData(swaggerHubAgentValues, dataplaneRes));
+  } catch (error) {
+    console.log(_chalk.default.redBright("rolling back installation. Please check the credential data before re-running install"));
+    if (installConfig.centralConfig.ampcEnvInfo.isNew) {
+      await helpers.deleteByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env');
+    } else {
+      await helpers.deleteByResourceType(apiServerClient, defsManager, dataplaneRes.name, "Dataplane", "dp", installConfig.centralConfig.environment);
+    }
+    return;
+  }
+
+  // create discovery agent resource 
+  installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, _types.GatewayTypeToDataPlane[installConfig.gatewayType] + " Discovery Agent", dataplaneRes.name, swaggerHubAgentValues.frequencyDA, swaggerHubAgentValues.queueDA);
+  console.log(await generateOutput(installConfig));
+};
+const SwaggerHubSaaSInstallMethods = exports.SwaggerHubSaaSInstallMethods = {
+  GetBundleType: askBundleType,
+  GetDeploymentType: askConfigType,
+  AskGatewayQuestions: gatewayConnectivity,
+  FinalizeGatewayInstall: completeInstall,
+  ConfigFiles: [],
+  AgentNameMap: {
+    [_types.AgentTypes.da]: _types.AgentNames.SWAGGERHUB_DA,
+    [_types.AgentTypes.ta]: _types.AgentNames.SWAGGERHUB_DA
+  },
+  GatewayDisplay: _types.GatewayTypes.SWAGGERHUB
+};
+
+// These are the items that are not exported, but need to be for testing
+const testables = exports.testables = {
+  SaasAgentValues,
+  SaasSwaggerHubAgentValues,
+  SaasPrompts,
+  ConfigFiles
+};

package/dist/common/types.js

@@ -223,6 +223,7 @@ let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
   AgentNames["EDGE_TA"] = "v7-traceability-agent";
   AgentNames["KAFKA_DA"] = "kafka-discovery-agent";
   AgentNames["KAFKA_TA"] = "kafka-traceability-agent";
+  AgentNames["SWAGGERHUB_DA"] = "swaggerhub-discovery-agent";
   return AgentNames;
 }({});
 let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
@@ -235,6 +236,7 @@ let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
   GatewayTypes["ISTIO"] = "Istio";
   GatewayTypes["EDGE_GATEWAY_ONLY"] = "Amplify API Gateway only";
   GatewayTypes["KAFKA"] = "Kafka";
+  GatewayTypes["SWAGGERHUB"] = "SwaggerHub";
   return GatewayTypes;
 }({});
 let SaaSGatewayTypes = exports.SaaSGatewayTypes = /*#__PURE__*/function (SaaSGatewayTypes) {
@@ -252,6 +254,7 @@ let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNa
   DataPlaneNames["EDGE"] = "Edge";
   DataPlaneNames["KAFKA"] = "Kafka";
   DataPlaneNames["KONG"] = "Kong";
+  DataPlaneNames["SWAGGERHUB"] = "SwaggerHub";
   DataPlaneNames["MULESOFT"] = "Mulesoft";
   DataPlaneNames["WSO2"] = "WSO2";
   DataPlaneNames["OTHER"] = "Other";
@@ -266,7 +269,8 @@ const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {
   [GatewayTypes.AZURE_GATEWAY]: DataPlaneNames.AZURE,
   [GatewayTypes.ISTIO]: 'Istio',
   [GatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
-  [GatewayTypes.KAFKA]: DataPlaneNames.KAFKA
+  [GatewayTypes.KAFKA]: DataPlaneNames.KAFKA,
+  [GatewayTypes.SWAGGERHUB]: DataPlaneNames.SWAGGERHUB
 };
 let AgentResourceKind = exports.AgentResourceKind = /*#__PURE__*/function (AgentResourceKind) {
   AgentResourceKind["da"] = "DiscoveryAgent";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "2.25.0",
+	"version": "2.26.0-rc.1",
 	"description": "Manage APIs, services and publish to the Unified Catalog",
 	"homepage": "https://platform.axway.com",
 	"author": {