@axway/axway-central-cli 3.2.0-rc.0 → 3.2.0-rc.1

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

@@ -15,6 +15,7 @@ class TraceableAgentValues {
   constructor() {
     _defineProperty(this, "namespace", void 0);
     _defineProperty(this, "traceableToken", void 0);
+    _defineProperty(this, "traceableRegion", void 0);
     _defineProperty(this, "environments", void 0);
     _defineProperty(this, "internalDomains", void 0);
     _defineProperty(this, "basePathSegmentLen", void 0);
@@ -25,6 +26,7 @@ class TraceableAgentValues {
       isNew: false
     };
     this.traceableToken = '';
+    this.traceableRegion = _types.TraceableRegionType.US;
     this.environments = [];
     this.internalDomains = false;
     this.basePathSegmentLen = 2;
@@ -42,6 +44,7 @@ const traceableHelmOverrideTemplate = () => {
 traceable:
   token: {{traceableToken}}
   environments: {{environments}}
+  region: {{traceableRegion}}
   internalDomains: {{internalDomains}}
   basePathSegmentLen: {{basePathSegmentLen}}
 
@@ -63,6 +66,7 @@ exports.traceableHelmOverrideTemplate = traceableHelmOverrideTemplate;
 const traceableEnvVarTemplate = () => {
   return `# Traceable configs
 TRACEABLE_TOKEN={{traceableToken}}
+TRACEABLE_REGION={{traceableRegion}}
 TRACEABLE_ENVIRONMENTS={{environments}}
 TRACEABLE_INTERNAL_DOMAINS={{internalDomains}}
 

package/dist/commands/install/traceableAgents.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testables = exports.gatewayConnectivity = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.amplifyAgentsNs = exports.TraceableInstallMethods = exports.ConfigFiles = void 0;
+exports.testables = exports.gatewayConnectivity = exports.completeInstall = exports.askTraceableRegion = exports.askConfigType = exports.askBundleType = exports.amplifyAgentsNs = exports.TraceableInstallMethods = exports.ConfigFiles = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 var _Kubectl = require("../../common/Kubectl");
@@ -34,6 +34,7 @@ const prompts = {
   configTypeMsg: 'Select the mode of installation',
   agentNamespace: 'Enter the namespace to use for the Amplify Traceable Agents',
   enterToken: 'Enter the token that the agent will use',
+  enterRegion: 'Enter the region that the agent will use',
   enterEnvironments: 'Enter an environment that the agent will use',
   enterInternalDomains: 'Enter if the internal domains should be used by the agent',
   enterBasePathSegmentLen: 'Enter the base path segment length that agent will use for lookup',
@@ -58,6 +59,19 @@ const askToken = async () => await (0, _basicPrompts.askInput)({
   msg: prompts.enterToken,
   allowEmptyInput: false
 });
+const askTraceableRegion = async () => {
+  return await (0, _basicPrompts.askList)({
+    msg: prompts.enterRegion,
+    choices: Object.entries(_types.TraceableRegionType).reduce((accumulator, curr) => {
+      return accumulator.concat({
+        name: curr[0],
+        value: curr[1]
+      });
+    }, []),
+    default: _types.TraceableRegionType.US
+  });
+};
+exports.askTraceableRegion = askTraceableRegion;
 const askEnvironments = async () => {
   let askEnvs = true;
   let envs = [];
@@ -65,9 +79,14 @@ const askEnvironments = async () => {
   while (askEnvs) {
     const env = await (0, _basicPrompts.askInput)({
       msg: prompts.enterEnvironments,
-      allowEmptyInput: false
+      allowEmptyInput: true
     });
-    envs.push(env);
+    if (envs.length === 0 && env.toString().trim() === "") {
+      break;
+    }
+    if (env && env.toString().trim() !== "") {
+      envs.push(env);
+    }
     askEnvs = (await (0, _basicPrompts.askList)({
       msg: prompts.enterMoreEnviroments,
       default: _types.YesNo.No,
@@ -103,6 +122,7 @@ const gatewayConnectivity = async installConfig => {
     console.log(_chalk.default.gray("The Discovery Agent needs to connect to the Traceable API Gateway to discover API's for publishing to Amplify Central."));
   }
   traceableAgentValues.traceableToken = await askToken();
+  traceableAgentValues.traceableRegion = await askTraceableRegion();
   traceableAgentValues.environments = await askEnvironments();
   traceableAgentValues.internalDomains = await askInternalDomains();
   traceableAgentValues.basePathSegmentLen = await askBasePathSegmentLen();

package/dist/common/types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.docsUrl = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceabilityConfig = exports.SingleEntryPointUrls = exports.SaaSGatewayTypes = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_TABLE_STRING_LENGTH = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.LanguageTypes = exports.KindTypes = exports.Kind = exports.IstioProfileChoices = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.IDPType = exports.IDPConfiguration = exports.IDPClientSecretAuthMethod = exports.IDPAuthType = exports.IDPAuthConfiguration = exports.IDPAuthClientSecret = exports.IDPAuthAccessToken = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.AWSRegions = exports.APIGEEXDISCOVERYMODES = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
+exports.docsUrl = exports.commonCmdArgsDescription = exports.cliVersionHeader = exports.YesNoChoices = exports.YesNo = exports.WAIT_TIMEOUT = exports.TrueFalseChoices = exports.TrueFalse = exports.TraceableRegionType = exports.TraceabilityConfig = exports.SingleEntryPointUrls = exports.SaaSGatewayTypes = exports.Regions = exports.PublicRepoUrl = exports.PublicDockerRepoBaseUrl = exports.Protocol = exports.ProdBaseUrls = exports.Platforms = exports.OutputTypes = exports.MAX_TABLE_STRING_LENGTH = exports.MAX_FILE_SIZE = exports.MAX_CACHE_FILE_SIZE = exports.LoggingSource = exports.LanguageTypes = exports.KindTypes = exports.Kind = exports.IstioProfileChoices = exports.IstioInstallValues = exports.IstioAgentValues = exports.IngestionProtocolToHosts = exports.IngestionProtocol = exports.IngestionHostsHTTP = exports.IngestionHosts = exports.IngestionHTTPHosts = exports.IDPType = exports.IDPConfiguration = exports.IDPClientSecretAuthMethod = exports.IDPAuthType = exports.IDPAuthConfiguration = exports.IDPAuthClientSecret = exports.IDPAuthAccessToken = exports.GatewayTypes = exports.GatewayTypeToDataPlane = exports.GatewayMode = exports.EnvironmentConfigInfo = exports.DosaAccount = exports.DataPlaneNames = exports.DOSAConfigInfo = exports.ConfigTypes = exports.CloudFormationConfig = exports.Certificate = exports.CentralAgentConfig = exports.CACHE_FILE_TTL_MILLISECONDS = exports.BundleType = exports.BasePaths = exports.AuthUrls = exports.AgentTypes = exports.AgentResourceKind = exports.AgentNames = exports.AgentInstallSwitches = exports.AgentInstallConfig = exports.AgentConfigTypes = exports.AWSRegions = exports.APIGEEXDISCOVERYMODES = exports.APICDeployments = exports.ABORT_TIMEOUT = void 0;
 var _dataService = require("./dataService");
 var _utils = require("./utils");
 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; }
@@ -742,4 +742,10 @@ let IDPAuthType = exports.IDPAuthType = /*#__PURE__*/function (IDPAuthType) {
   IDPAuthType["AccessToken"] = "AccessToken";
   IDPAuthType["ClientSecret"] = "ClientSecret";
   return IDPAuthType;
+}({});
+let TraceableRegionType = exports.TraceableRegionType = /*#__PURE__*/function (TraceableRegionType) {
+  TraceableRegionType["US"] = "US";
+  TraceableRegionType["EU"] = "EU";
+  TraceableRegionType["AP"] = "AP";
+  return TraceableRegionType;
 }({});

package/package.json

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