@axway/axway-central-cli 2.12.3 → 2.13.0

package/README.md

@@ -148,16 +148,20 @@ CONFIG COMMANDS:
 
 ### Region configuration
 
-Region configuration identifies the Amplify Central instance whose servers you want to send your requests to. Possible values are `US` or `EU` (`US` is used by default):
+Region configuration identifies the Amplify Central instance to whose servers you want to send your requests. Your current authenticated account's org setting is used by default (i.e., if your org belongs to the APAC region, it is going to be used automatically).
+
+You can always override the current region setting by configuring CLI with the following command (possible values are `US`, `EU` or `AP`):
 
 ```bash
 # to point CLI to EU region:
 axway central config set --region=EU
 # to point CLI to US region:
 axway central config set --region=US
+# to point CLI to APAC region:
+axway central config set --region=AP
 ```
 
-You can always override current region setting in every command by adding optional `--region=<value>` flag:
+Or by adding optional `--region=<value>` flag with any command:
 
 ```bash
 axway central get environments --region=EU

package/dist/commands/config/set.js

@@ -82,7 +82,7 @@ const action = async ({
       log(`Writing ${_types.ConfigTypes.APIC_DEPLOYMENT}`);
 
       if (!Object.values(_types.APICDeployments).includes(argv.apicDeployment)) {
-        throw Error('"--apic-deployment" value is not correct, please provide one of: prod, staging, prod-eu, staging-eu, qa, or teams. For example: "axway central config set --apic-deployment=staging"');
+        throw Error('"--apic-deployment" value is not correct, please provide one of: prod, staging, prod-ap, prod-eu, staging-eu, qa, or teams. For example: "axway central config set --apic-deployment=staging"');
       }
 
       config[_types.ConfigTypes.APIC_DEPLOYMENT] = argv.apicDeployment;

package/dist/commands/install/edgeAgents.js

@@ -321,6 +321,8 @@ const completeInstall = async installConfig => {
   v7AgentValues.centralConfig = installConfig.centralConfig;
   v7AgentValues.traceabilityConfig = installConfig.traceabilityConfig;
   v7AgentValues.isGatewayOnly = installConfig.switches.isGatewayOnly;
+  v7AgentValues.daVersion = installConfig.daVersion;
+  v7AgentValues.taVersion = installConfig.taVersion;
 
   if (installConfig.switches.isHelmInstall) {
     if (v7AgentValues.namespace.isNew) {

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

@@ -86,6 +86,14 @@ const getIngestionHost = (region, env, apicDeployment, protocol = _types.Ingesti
         [_types.Platforms.staging]: {
           [_types.APICDeployments.EUStaging]: _types.IngestionHosts.EUStaging
         }
+      },
+      [_types.Regions.AP]: {
+        [_types.Platforms.prod]: {
+          [_types.APICDeployments.AP]: _types.IngestionHosts.AP
+        },
+        [_types.Platforms.staging]: {
+          [_types.APICDeployments.APStaging]: _types.IngestionHosts.APStaging
+        }
       }
     },
     [_types.IngestionProtocol.HTTPS]: {
@@ -104,6 +112,14 @@ const getIngestionHost = (region, env, apicDeployment, protocol = _types.Ingesti
         [_types.Platforms.staging]: {
           [_types.APICDeployments.EU]: _types.IngestionHTTPHosts.EUStaging
         }
+      },
+      [_types.Regions.AP]: {
+        [_types.Platforms.prod]: {
+          [_types.APICDeployments.AP]: _types.IngestionHTTPHosts.AP
+        },
+        [_types.Platforms.staging]: {
+          [_types.APICDeployments.AP]: _types.IngestionHTTPHosts.APStaging
+        }
       }
     }
   };

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

@@ -50,6 +50,10 @@ class V7AgentValues {
 
     _defineProperty(this, "traceabilityConfig", void 0);
 
+    _defineProperty(this, "daVersion", void 0);
+
+    _defineProperty(this, "taVersion", void 0);
+
     this.amplifyAgentCreds = _.amplifyAgentsCredsSecret;
     this.amplifyAgentKeys = _.amplifyAgentsKeysSecret;
     this.apiGatewayAuthPass = '';
@@ -70,6 +74,8 @@ class V7AgentValues {
     };
     this.centralConfig = new _types.CentralAgentConfig();
     this.traceabilityConfig = new _types.TraceabilityConfig();
+    this.daVersion = '';
+    this.taVersion = '';
   }
 
 }
@@ -167,7 +173,7 @@ image:
   repository: axway.jfrog.io/ampc-public-docker-release/agent/v7-traceability-agent
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "latest"
+  tag: "{{taVersion}}" 
 
 imagePullSecrets: []
 nameOverride: ""
@@ -180,39 +186,66 @@ statusPort: 8990
 # https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#common-variables-to-both-agents
 # https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#specific-variables-for-traceability-agent
 env:
-  APIGATEWAY_HEALTHCHECKPORT: 8090
-  APIGATEWAY_HEALTHCHECKPROTOCOL: "https"
-  APIGATEWAY_HEALTHCHECKURI: login
-  APIGATEWAY_HOST: {{apiGatewayHost}}
-  APIGATEWAY_PORT: {{apiGatewayPort}}
-  APIMANAGER_HOST: {{apiManagerHost}}
-  APIMANAGER_PORT: {{apiManagerPort}}
+  LOG_LEVEL: info 
   CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
-  CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
+  CENTRAL_URL: {{centralConfig.url}}
   CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
+  CENTRAL_SINGLEURL: {{centralConfig.singleEntryPointUrl}}
   CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
-  CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+  CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
-  {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
-  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
-  {{/compare}}
-  CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
-  CENTRAL_URL:  {{centralConfig.url}}
-  EVENT_LOG_FILE_PATHS: /events/*.log
-  LOG_LEVEL: info
-  LOG_FILE_PATH_INSTANCE: "axwayDemo"
+  CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+  CENTRAL_TEAM: "{{centralConfig.ampcTeamName}}"
+  {{#if isOpenTraffic}}
+  # API Gateway open traffic logs
+  EVENT_LOG_INPUT: false
+  OPENTRAFFIC_LOG_INPUT: true
+  OPENTRAFFIC_LOG_PATHS: /events/*.log
+  {{else}}
+  # API Gateway event logs
+  EVENT_LOG_PATHS: /events/*.log
+  {{/if}}
   TRACEABILITY_HOST: {{traceabilityConfig.host}}
   TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
   TRACEABILITY_SAMPLING_PERCENTAGE: {{traceabilityConfig.samplingPercentage}}
   TRACEABILITY_SAMPLING_REPORTALLERRORS: {{traceabilityConfig.samplingReportAllErrors}}
+  
+  {{#if isGatewayOnly}}
+  APIGATEWAY_ONLY: {{isGatewayOnly}}
+  {{else}}
+  APIMANAGER_HOST: {{apiManagerHost}}
+  APIMANAGER_PORT: {{apiManagerPort}}
+  # flip to true if API manager is using a self signed certificate
+  APIMANAGER_SSL_INSECURESKIPVERIFY: false
+  {{/if}}
+  {{#if isOpenTraffic}}
+  {{else}}
+  APIGATEWAY_HOST: {{apiGatewayHost}}
+  APIGATEWAY_PORT: {{apiGatewayPort}}
+  # flip to true if API manager is using a self signed certificate
+  APIGATEWAY_SSL_INSECURESKIPVERIFY: false
+  APIGATEWAY_HEALTHCHECKPORT: 8090
+  APIGATEWAY_HEALTHCHECKPROTOCOL: "https"
+  APIGATEWAY_HEALTHCHECKURI: login
+  {{/if}}
 
 # The below secret are a pre-requisite. Please refer to the readme file for more info on it.
 secrets:
   credentials: {{amplifyAgentCreds}}
   keys: {{amplifyAgentKeys}}
 
+podAnnotations:
+
+podSecurityContext:
+  supplementalGroups: [ 2500 ]
+  fsGroupChangePolicy: "OnRootMismatch"
+
 securityContext:
 
+tolerations:
+
+affinity:
+
 nodeSelector: {}
 
 # Add additional labels to the agent deployment which may be required based on your configuration
@@ -243,6 +276,7 @@ persistentVolumeClaimConfig:
     storageClass: gp2-csi
     name: data-claim
   events:
+    # update this value to match the name of the volume claim that is used for the event logs
     name: events-claim
 `;
 };
@@ -299,7 +333,7 @@ image:
   repository: axway.jfrog.io/ampc-public-docker-release/agent/v7-discovery-agent
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "latest"
+  tag: "{{daVersion}}" 
 
 imagePullSecrets: []
 nameOverride: ""
@@ -312,27 +346,37 @@ statusPort: 8989
 # https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#common-variables-to-both-agents
 # https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/agent-variables/index.html#specific-variables-for-discovery-agent
 env:
-  APIMANAGER_HOST: {{apiManagerHost}}
-  APIMANAGER_PORT: {{apiManagerPort}}
+  LOG_LEVEL: info
   CENTRAL_AGENTNAME: {{centralConfig.daAgentName}}
-  CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
+  CENTRAL_URL: {{centralConfig.url}}
   CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
-  CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+  CENTRAL_SINGLEURL: {{centralConfig.singleEntryPointUrl}}
+  CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
   CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
-  {{#compare . centralConfig.ampcTeamName "" operator="!=" }}
-  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
-  {{/compare}}
-  CENTRAL_SINGLEURL={{centralConfig.singleEntryPointUrl}}
-  CENTRAL_URL: {{centralConfig.url}}
-  LOG_LEVEL: info
+  CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+  CENTRAL_TEAM: "{{centralConfig.ampcTeamName}}"
+  APIMANAGER_HOST: {{apiManagerHost}}
+  APIMANAGER_PORT: {{apiManagerPort}}
+  # flip to true if API manager is using a self signed certificate
+  APIMANAGER_SSL_INSECURESKIPVERIFY: false
 
 # The below secret are a pre-requisite. Please refer to the readme file for more info on it.
 secrets:
   credentials: {{amplifyAgentCreds}}
   keys: {{amplifyAgentKeys}}
 
+podAnnotations:
+
+podSecurityContext:
+  supplementalGroups: [ 2500 ]
+  fsGroupChangePolicy: "OnRootMismatch"
+
 securityContext:
 
+tolerations:
+
+affinity:
+
 nodeSelector: {}
 
 # Add additional labels to the agent deployment which may be required based on your configuration

package/dist/commands/install/istioAgents.js

@@ -343,6 +343,14 @@ const getCondorHost = (region, env, apicDeployment) => {
       [_types.Platforms.staging]: {
         [_types.APICDeployments.EUStaging]: _types.IngestionHosts.EUStaging
       }
+    },
+    [_types.Regions.AP]: {
+      [_types.Platforms.prod]: {
+        [_types.APICDeployments.AP]: _types.IngestionHosts.AP
+      },
+      [_types.Platforms.staging]: {
+        [_types.APICDeployments.APStaging]: _types.IngestionHosts.APStaging
+      }
     }
   };
   return ((_hosts$region = hosts[region]) === null || _hosts$region === void 0 ? void 0 : (_hosts$region$env = _hosts$region[env]) === null || _hosts$region$env === void 0 ? void 0 : _hosts$region$env[apicDeployment]) || _types.IngestionHosts.US;

package/dist/commands/install/platform.js

@@ -179,6 +179,10 @@ const getApicDeployment = (region, env) => {
     [_types.Regions.EU]: {
       [_types.Platforms.prod]: _types.APICDeployments.EU,
       [_types.Platforms.staging]: _types.APICDeployments.EUStaging
+    },
+    [_types.Regions.AP]: {
+      [_types.Platforms.prod]: _types.APICDeployments.AP,
+      [_types.Platforms.staging]: _types.APICDeployments.APStaging
     }
   };
   const savedDeployment = new _CliConfigManager.CliConfigManager().getAll()['apic-deployment'];

package/dist/common/CoreConfigController.js

@@ -73,7 +73,7 @@ class CoreConfigController {
     const baseUrl = process.env.AXWAY_CENTRAL_BASE_URL || configCtrl.get(_CliConfigManager.CliConfigKeys.BASE_URL); // environment defined by using central cli "base-url" or axway "env" configs if set,
     // otherwise its undefined (equals to prod)
 
-    const environment = !baseUrl || baseUrl === _types.ProdBaseUrls.US || baseUrl === _types.ProdBaseUrls.EU ? config.get('env') : 'staging';
+    const environment = !baseUrl || baseUrl === _types.ProdBaseUrls.US || baseUrl === _types.ProdBaseUrls.EU || baseUrl === _types.ProdBaseUrls.AP ? config.get('env') : 'staging';
     log(`getAuthInfo, baseUrl = ${baseUrl}, environment = ${environment}`);
     const {
       sdk

package/dist/common/types.js

@@ -88,7 +88,8 @@ exports.AuthUrls = AuthUrls;
 
 const SingleEntryPointUrls = {
   US: 'https://ingestion.platform.axway.com',
-  EU: 'https://ingestion-eu.platform.axway.com'
+  EU: 'https://ingestion-eu.platform.axway.com',
+  AP: 'https://ingestion-ap-sg.platform.axway.com'
 };
 exports.SingleEntryPointUrls = SingleEntryPointUrls;
 let Regions;
@@ -97,6 +98,7 @@ exports.Regions = Regions;
 (function (Regions) {
   Regions["US"] = "US";
   Regions["EU"] = "EU";
+  Regions["AP"] = "AP";
 })(Regions || (exports.Regions = Regions = {}));
 
 let Platforms;
@@ -109,8 +111,8 @@ exports.Platforms = Platforms;
 
 const ProdBaseUrls = {
   US: 'https://apicentral.axway.com',
-  // change me after some time: https://central.us.axway.com
-  EU: 'https://central.eu-fr.axway.com'
+  EU: 'https://central.eu-fr.axway.com',
+  AP: 'https://central.ap-sg.axway.com'
 };
 exports.ProdBaseUrls = ProdBaseUrls;
 let IngestionProtocol;
@@ -126,19 +128,24 @@ const IngestionHosts = {
   EUStaging: 'ingestion.visibility.eu-fr.axwaypreprod.net:5044',
   QA: 'ingestion.condor.staging.axwaytest.net:5044',
   US: 'ingestion.datasearch.axway.com:5044',
-  USStaging: 'ingestion.search.axwaytest.net:5044'
+  USStaging: 'ingestion.search.axwaytest.net:5044',
+  AP: 'ingestion.visibility.ap-sg.axway.com:5044',
+  APStaging: 'ingestion.visibility.ap-sg.axwaypreprod.net:5044'
 };
 exports.IngestionHosts = IngestionHosts;
 const IngestionHTTPHosts = {
   US: 'ingestion.datasearch.axway.com:443',
   USStaging: 'ingestion.search.axwaytest.net:443',
   EU: 'ingestion.visibility.eu-fr.axway.com:443',
-  EUStaging: 'ingestion.visibility.eu-fr.axwaypreprod.net:443'
+  EUStaging: 'ingestion.visibility.eu-fr.axwaypreprod.net:443',
+  AP: 'ingestion.visibility.ap-sg.axway.com:443',
+  APStaging: 'ingestion.visibility.ap-sg.axwaypreprod.net:443'
 };
 exports.IngestionHTTPHosts = IngestionHTTPHosts;
 const IngestionHostsHTTP = {
   US: 'ingestion.datasearch.axway.com:443',
-  EU: 'ingestion.visibility.eu-fr.axway.com:443'
+  EU: 'ingestion.visibility.eu-fr.axway.com:443',
+  AP: 'ingestion.visibility.ap-sg.axway.com:443'
 };
 exports.IngestionHostsHTTP = IngestionHostsHTTP;
 const IngestionProtocolToHosts = {
@@ -152,7 +159,9 @@ const APICDeployments = {
   QA: 'qa',
   US: 'prod',
   USStaging: 'staging',
-  TEAMS: 'teams'
+  TEAMS: 'teams',
+  AP: 'prod-ap',
+  APStaging: 'preprod'
 };
 exports.APICDeployments = APICDeployments;
 const commonCmdArgsDescription = {

package/package.json

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