@axway/axway-central-cli 3.15.0-rc.4 → 3.15.0

package/dist/commands/install/gitHubSaasAgents.js

@@ -281,7 +281,8 @@ const GitHubSaaSInstallMethods = exports.GitHubSaaSInstallMethods = {
   FinalizeGatewayInstall: completeInstall,
   ConfigFiles: [],
   AgentNameMap: {
-    [_types.AgentTypes.da]: _types.AgentNames.GITHUB_DA
+    [_types.AgentTypes.da]: _types.AgentNames.GITHUB_DA,
+    [_types.AgentTypes.ta]: _types.AgentNames.GITHUB_DA
   },
   GatewayDisplay: _types.SaaSGatewayTypes.GITHUB
 };

package/dist/commands/install/graylogAgent.js

@@ -138,7 +138,8 @@ const GraylogInstallMethods = exports.GraylogInstallMethods = {
   FinalizeGatewayInstall: completeInstall,
   ConfigFiles: Object.values(ConfigFiles),
   AgentNameMap: {
-    [_types.AgentTypes.ca]: _types.AgentNames.GRAYLOG_CA
+    [_types.AgentTypes.da]: _types.AgentNames.GRAYLOG_TA,
+    [_types.AgentTypes.ta]: _types.AgentNames.GRAYLOG_TA
   },
   GatewayDisplay: _types.GatewayTypes.GRAYLOG
 };

package/dist/commands/install/helpers/inputs.js

@@ -36,7 +36,6 @@ const k8sClusterMessages = exports.k8sClusterMessages = {
 const agentMessages = exports.agentMessages = {
   enterDiscoveryAgentName: 'Enter a new discovery agent name',
   enterTraceabilityAgentName: 'Enter a new traceability agent name',
-  enterComplianceAgentName: 'Enter a new compliance agent name',
   getAgentsError: 'Error getting agents.',
   agentAlreadyExists: 'Agent already exists. Please enter a new name.',
   selectAgentType: 'Select the type of agent(s) you want to install'
@@ -354,13 +353,6 @@ const askAgentName = async (client, defsManager, agentType, scopeName) => {
         msg = agentMessages.enterTraceabilityAgentName;
         break;
       }
-    case _types.AgentTypes.ca:
-      {
-        resourceType = 'ComplianceAgent';
-        resourceShortName = 'ca';
-        msg = agentMessages.enterComplianceAgentName;
-        break;
-      }
   }
   let {
     data: agents

package/dist/commands/install/helpers/templates/graylogTemplates.js

@@ -68,7 +68,7 @@ env:
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
-  CENTRAL_AGENTNAME: {{centralConfig.caAgentName}}
+  CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
   CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
   TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
 `;

package/dist/commands/install/helpers/templates/traceableTemplates.js

@@ -3,31 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.traceableHelmOverrideTemplate = exports.traceableEnvVarTemplate = exports.TraceableAgentValues = exports.ComplianceAgentValues = void 0;
+exports.traceableHelmOverrideTemplate = exports.traceableEnvVarTemplate = exports.TraceableAgentValues = void 0;
 var _types = require("../../../../common/types");
 var _handlebars = _interopRequireDefault(require("handlebars"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-class ComplianceAgentValues {
-  constructor() {
-    _defineProperty(this, "centralEnvironments", void 0);
-    this.centralEnvironments = [];
-  }
-}
-
 /**
  * @description Parameters to provide to the Traceable handlebars templates.
  */
-exports.ComplianceAgentValues = ComplianceAgentValues;
-class TraceableAgentValues extends ComplianceAgentValues {
+class TraceableAgentValues {
   constructor() {
-    super();
     _defineProperty(this, "namespace", void 0);
     _defineProperty(this, "traceableToken", void 0);
     _defineProperty(this, "traceableRegion", void 0);
     _defineProperty(this, "environments", void 0);
+    _defineProperty(this, "centralEnvironments", void 0);
     _defineProperty(this, "centralConfig", void 0);
     _defineProperty(this, "traceabilityConfig", void 0);
     _defineProperty(this, "traceableSecret", void 0);
@@ -39,6 +31,7 @@ class TraceableAgentValues extends ComplianceAgentValues {
     this.traceableToken = '';
     this.traceableRegion = _types.TraceableRegionType.US;
     this.environments = [];
+    this.centralEnvironments = [];
     this.centralConfig = new _types.CentralAgentConfig();
     this.traceabilityConfig = new _types.TraceabilityConfig();
     this.traceableSecret = '';
@@ -46,7 +39,7 @@ class TraceableAgentValues extends ComplianceAgentValues {
   }
 }
 exports.TraceableAgentValues = TraceableAgentValues;
-_handlebars.default.registerHelper('formatIndex', index => {
+_handlebars.default.registerHelper("formatIndex", index => {
   return index + 1;
 });
 
@@ -90,7 +83,7 @@ env:
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
   CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
   CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
-  CENTRAL_AGENTNAME: {{centralConfig.caAgentName}}
+  CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
   CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
   TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
 `;
@@ -116,7 +109,7 @@ TRACEABLE_ENVIRONMENTMAPPING_AMPLIFY_{{formatIndex @index}}={{.}}
 {{/compare}}
 
 # Amplify Central configs
-CENTRAL_AGENTNAME={{centralConfig.caAgentName}}
+CENTRAL_AGENTNAME={{centralConfig.taAgentName}}
 CENTRAL_AUTH_CLIENTID={{centralConfig.dosaAccount.clientId}}
 CENTRAL_AUTH_PRIVATEKEY={{centralConfig.dosaAccount.templatePrivateKey}}
 CENTRAL_AUTH_PUBLICKEY={{centralConfig.dosaAccount.templatePublicKey}}

package/dist/commands/install/platform.js

@@ -97,17 +97,10 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
     centralConfig.daAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.da, centralConfig.ampcEnvInfo.name);
   }
 
-  // Initialize agent names
+  // Get the TA Agent name
   centralConfig.taAgentName = '';
-  centralConfig.caAgentName = '';
-
-  // Determine if we should use CA (compliance) or TA agent. Compliance is good for TRACEABLE and GRAYLOG (atm)
-  const isCaType = installConfig.gatewayType === _types.GatewayTypes.TRACEABLE || installConfig.gatewayType === _types.GatewayTypes.GRAYLOG;
-  const agentType = isCaType ? _types.AgentTypes.ca : _types.AgentTypes.ta;
-  const agentNameProperty = isCaType ? 'caAgentName' : 'taAgentName';
   if (installConfig.switches.isTaEnabled && !installConfig.switches.isHostedInstall) {
-    const agentName = await helpers.askAgentName(apiServerClient, defsManager, agentType, centralConfig.ampcEnvInfo.name);
-    centralConfig[agentNameProperty] = agentName;
+    centralConfig.taAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.ta, centralConfig.ampcEnvInfo.name);
   }
   return centralConfig;
 };
@@ -150,14 +143,6 @@ const finalizeCentralInstall = async (apiServerClient, platformClient, defsManag
   if (installConfig.centralConfig.taAgentName != '') {
     installConfig.centralConfig.taAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.ta, _types.AgentTypes.ta, installConfig.centralConfig.ampcTeamName, installConfig.centralConfig.taAgentName);
   }
-
-  // Create ComplianceAgent Resource
-  if (installConfig.centralConfig.caAgentName != '') {
-    installConfig.centralConfig.caAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.ca, _types.AgentTypes.ca, installConfig.centralConfig.ampcTeamName, installConfig.centralConfig.caAgentName, undefined, undefined, undefined, {
-      managedEnvironment: installConfig.gatewayConfig.centralEnvironments
-    } // cast applied here
-    );
-  }
   if (installConfig.bundleType === _types.BundleType.TRACEABILITY_OFFLINE || installConfig.gatewayType === _types.GatewayTypes.ISTIO) {
     installConfig.centralConfig.environmentId = await helpers.getEnvironmentId(apiServerClient, defsManager, installConfig.centralConfig.environment);
   }

package/dist/commands/install/swaggerHubSaasAgents.js

@@ -259,7 +259,8 @@ const SwaggerHubSaaSInstallMethods = exports.SwaggerHubSaaSInstallMethods = {
   FinalizeGatewayInstall: completeInstall,
   ConfigFiles: [],
   AgentNameMap: {
-    [_types.AgentTypes.da]: _types.AgentNames.SWAGGERHUB_DA
+    [_types.AgentTypes.da]: _types.AgentNames.SWAGGERHUB_DA,
+    [_types.AgentTypes.ta]: _types.AgentNames.SWAGGERHUB_DA
   },
   GatewayDisplay: _types.SaaSGatewayTypes.SWAGGERHUB
 };

package/dist/commands/install/traceableAgents.js

@@ -20,7 +20,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const {
   log
 } = (0, _snooplogg.default)('central: install: agents: Traceable');
-const caImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.TRACEABLE_CA}`;
+const taImage = `${_types.PublicDockerRepoBaseUrl}${_types.BasePaths.DockerAgentPublicRepo}/${_types.AgentNames.TRACEABLE_TA}`;
 const amplifyAgentsNs = exports.amplifyAgentsNs = 'amplify-agents';
 
 // ConfigFiles - all the config file that are used in the setup
@@ -142,12 +142,12 @@ const dockerSuccessMsg = installConfig => {
   if (installConfig.switches.isTaEnabled) {
     dockerInfo = `To utilize the agent, pull the latest Docker image and run it using the appropriate supplied environment file, (${helpers.configFiles.AGENT_ENV_VARS}):`;
     console.log(_chalk.default.whiteBright(dockerInfo), '\n');
-    const caImageVersion = `${caImage}:${installConfig.taVersion}`;
+    const taImageVersion = `${taImage}:${installConfig.taVersion}`;
     console.log(_chalk.default.white('Pull the latest image of the Agent:'));
-    console.log(_chalk.default.cyan(`docker pull ${caImageVersion}`));
+    console.log(_chalk.default.cyan(`docker pull ${taImageVersion}`));
     console.log(_chalk.default.white(_utils.isWindows ? startAgentWinMsg : startAgentLinuxMsg));
     console.log(_chalk.default.cyan(_utils.isWindows ? runAgentWinMsg : runAgentLinuxMsg));
-    console.log('\t', _chalk.default.cyan(`-v /data ${caImageVersion}`), '\n');
+    console.log('\t', _chalk.default.cyan(`-v /data ${taImageVersion}`), '\n');
   }
 };
 const helmSuccessMsg = namespace => {
@@ -225,7 +225,8 @@ const TraceableInstallMethods = exports.TraceableInstallMethods = {
   FinalizeGatewayInstall: completeInstall,
   ConfigFiles: Object.values(ConfigFiles),
   AgentNameMap: {
-    [_types.AgentTypes.ca]: _types.AgentNames.TRACEABLE_CA
+    [_types.AgentTypes.da]: _types.AgentNames.TRACEABLE_TA,
+    [_types.AgentTypes.ta]: _types.AgentNames.TRACEABLE_TA
   },
   GatewayDisplay: _types.GatewayTypes.TRACEABLE
 };

package/dist/common/types.js

@@ -237,10 +237,10 @@ let AgentNames = exports.AgentNames = /*#__PURE__*/function (AgentNames) {
   AgentNames["KAFKA_DA"] = "kafka-discovery-agent";
   AgentNames["KAFKA_TA"] = "kafka-traceability-agent";
   AgentNames["SWAGGERHUB_DA"] = "swaggerhub-discovery-agent";
-  AgentNames["GRAYLOG_CA"] = "graylog-compliance-agent";
+  AgentNames["GRAYLOG_TA"] = "graylog-agent";
   AgentNames["IBMAPICONNECT_DA"] = "ibm-apiconnect-discovery-agent";
   AgentNames["IBMAPICONNECT_TA"] = "ibm-apiconnect-traceability-agent";
-  AgentNames["TRACEABLE_CA"] = "traceable-compliance-agent";
+  AgentNames["TRACEABLE_TA"] = "traceable-agent";
   AgentNames["SOFTWAREAGWEBMETHODS_DA"] = "software-ag-webmethods-discovery-agent";
   AgentNames["SOFTWAREAGWEBMETHODS_TA"] = "software-ag-webmethods-traceability-agent";
   AgentNames["BACKSTAGE_DA"] = "backstage-discovery-agent";
@@ -320,13 +320,11 @@ const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {
 let AgentResourceKind = exports.AgentResourceKind = /*#__PURE__*/function (AgentResourceKind) {
   AgentResourceKind["da"] = "DiscoveryAgent";
   AgentResourceKind["ta"] = "TraceabilityAgent";
-  AgentResourceKind["ca"] = "ComplianceAgent";
   return AgentResourceKind;
 }({});
 let AgentTypes = exports.AgentTypes = /*#__PURE__*/function (AgentTypes) {
   AgentTypes["da"] = "da";
   AgentTypes["ta"] = "ta";
-  AgentTypes["ca"] = "ca";
   return AgentTypes;
 }({}); // AWSRegions - base set of regions, may use option outside this list
 let AWSRegions = exports.AWSRegions = /*#__PURE__*/function (AWSRegions) {
@@ -384,7 +382,6 @@ class CentralAgentConfig {
     _defineProperty(this, "ingestionProtocol", void 0);
     _defineProperty(this, "daAgentName", void 0);
     _defineProperty(this, "taAgentName", void 0);
-    _defineProperty(this, "caAgentName", void 0);
     _defineProperty(this, "dosaAccount", void 0);
     _defineProperty(this, "environment", void 0);
     _defineProperty(this, "environmentId", void 0);
@@ -399,7 +396,6 @@ class CentralAgentConfig {
     _defineProperty(this, "axwayManaged", void 0);
     _defineProperty(this, "apiServerClient", void 0);
     _defineProperty(this, "definitionManager", void 0);
-    _defineProperty(this, "gatewayConfig", void 0);
     _defineProperty(this, "setBaseHost", async () => {
       this.url = await (0, _dataService.getBaseUrl)(undefined, undefined, this.region);
       [this.scheme, this.host] = this.url.split('://');
@@ -410,7 +406,6 @@ class CentralAgentConfig {
     this.ingestionProtocol = IngestionProtocol.Lumberjack;
     this.daAgentName = '';
     this.taAgentName = '';
-    this.caAgentName = '';
     this.ampcEnvInfo = new EnvironmentConfigInfo();
     this.ampcDosaInfo = new DOSAConfigInfo();
     this.dosaAccount = new DosaAccount();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axway/axway-central-cli",
-	"version": "3.15.0-rc.4",
+	"version": "3.15.0",
 	"description": "Manage APIs, services and publish to the Amplify Marketplace",
 	"homepage": "https://platform.axway.com",
 	"author": {