@axway/axway-central-cli 3.15.0-rc.2 → 3.15.0-rc.3

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

@@ -3,23 +3,31 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.traceableHelmOverrideTemplate = exports.traceableEnvVarTemplate = exports.TraceableAgentValues = void 0;
+exports.traceableHelmOverrideTemplate = exports.traceableEnvVarTemplate = exports.TraceableAgentValues = exports.ComplianceAgentValues = 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.
  */
-class TraceableAgentValues {
+exports.ComplianceAgentValues = ComplianceAgentValues;
+class TraceableAgentValues extends ComplianceAgentValues {
   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);
@@ -31,7 +39,6 @@ class TraceableAgentValues {
     this.traceableToken = '';
     this.traceableRegion = _types.TraceableRegionType.US;
     this.environments = [];
-    this.centralEnvironments = [];
     this.centralConfig = new _types.CentralAgentConfig();
     this.traceabilityConfig = new _types.TraceabilityConfig();
     this.traceableSecret = '';

package/dist/commands/install/platform.js

@@ -97,12 +97,17 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
     centralConfig.daAgentName = await helpers.askAgentName(apiServerClient, defsManager, _types.AgentTypes.da, centralConfig.ampcEnvInfo.name);
   }
 
-  // Get the TA Agent name
+  // Initialize agent names
   centralConfig.taAgentName = '';
-  // Set agent type based on gateway type. For Traceable and Graylog, we need to set the type to ca (compliance)
-  const agentType = installConfig.gatewayType !== _types.GatewayTypes.TRACEABLE && installConfig.gatewayType !== _types.GatewayTypes.GRAYLOG ? _types.AgentTypes.ta : _types.AgentTypes.ca;
+  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) {
-    centralConfig.taAgentName = await helpers.askAgentName(apiServerClient, defsManager, agentType, centralConfig.ampcEnvInfo.name);
+    const agentName = await helpers.askAgentName(apiServerClient, defsManager, agentType, centralConfig.ampcEnvInfo.name);
+    centralConfig[agentNameProperty] = agentName;
   }
   return centralConfig;
 };
@@ -135,20 +140,23 @@ const finalizeCentralInstall = async (apiServerClient, platformClient, defsManag
   if (installConfig.centralConfig.ampcEnvInfo.isUpdated) {
     await helpers.updateSubResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env', '', refEnvSubResource);
   }
+
   // Create DiscoveryAgent Resource unless gateway type is Istio.  This can be removed when this is available for Istio
   if (installConfig.centralConfig.daAgentName != '') {
     installConfig.centralConfig.daAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], _types.AgentResourceKind.da, _types.AgentTypes.da, installConfig.centralConfig.ampcTeamName, installConfig.centralConfig.daAgentName);
   }
 
   // Create TraceabilityAgent Resource
-  if (installConfig.centralConfig.taAgentName !== '') {
-    let agentResourceKind = _types.AgentResourceKind.ta;
-    let agentType = _types.AgentTypes.ta;
-    if (installConfig.gatewayType === _types.GatewayTypes.TRACEABLE || installConfig.gatewayType === _types.GatewayTypes.GRAYLOG) {
-      agentResourceKind = _types.AgentResourceKind.ca;
-      agentType = _types.AgentTypes.ca;
-    }
-    installConfig.centralConfig.taAgentName = await helpers.createNewAgentResource(apiServerClient, defsManager, installConfig.centralConfig.environment, _types.GatewayTypeToDataPlane[installConfig.gatewayType], agentResourceKind, agentType, installConfig.centralConfig.ampcTeamName, installConfig.centralConfig.taAgentName);
+  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/common/types.js

@@ -387,6 +387,7 @@ 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);
@@ -401,6 +402,7 @@ 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('://');
@@ -411,6 +413,7 @@ 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.2",
+	"version": "3.15.0-rc.3",
 	"description": "Manage APIs, services and publish to the Amplify Marketplace",
 	"homepage": "https://platform.axway.com",
 	"author": {