@axway/axway-central-cli 2.12.2 → 2.12.4

package/dist/commands/get/index.js

@@ -133,14 +133,13 @@ ${defsManager.getDefsTableForHelpMsg()}`);
 
         (0, _utils.verifyScopeParam)(defsManager.getAllKindsList(), defs, scope);
         /**
-         	1) Execute getByName or getList calls for every definition that match scope name/kind if a user provides -s
-        	param to the cli.
-        	2) It is possible to execute list (get all) api calls for scoped resources without providing the scope in
-        	the path so api-server returns the entire list in all scopes, for example for "Document" kind calling
+         	1) If "scope" param provided: execute getByName or getList calls for every definition that match this scope name/kind.
+        	2) If "scope" param is not provided: execute list (get all) api calls for scoped resources without providing the scope in
+        	the path so api-server returns the entire list in all scopes. For example, using "Document" kind and calling
         	https://apicentral.axway.com/apis/catalog/v1alpha1/documents returns a list of documents in Asset and AssetRelease
-        	scopes in a single api call. So take the first resource definition + cli definition and do call, if user is
-        	not providing the "scope" param. Note: this logic might have some edge cases if same kind can be used for
-        	"scoped" and "scope" resources and api-server is not handling this case correctly anymore.
+        	scopes in a single api call. So getting unique list of groups and finding first matching definitions to do a call
+        	Note: this logic might have some edge cases if same kind can be used for "scoped" and "scope" resources and api-server is
+        	not handling this case correctly anymore.
          */
 
         if (scope) {
@@ -158,10 +157,24 @@ ${defsManager.getDefsTableForHelpMsg()}`);
             });
           });
         } else {
-          let response = await getListOrByName(defs[0].resource, client, undefined, resourceName, undefined, query, progressListener);
-          getResults.push({
-            columns: defs[0].cli.spec.columns,
-            response
+          const defsMatchingGroup = {};
+          defs.forEach(def => {
+            if (!defsMatchingGroup[def.resource.metadata.scope.name]) {
+              defsMatchingGroup[def.resource.metadata.scope.name] = def;
+            }
+          });
+          const results = await Promise.all(Object.values(defsMatchingGroup).map(async defs => ({
+            response: await getListOrByName(defs.resource, client, undefined, resourceName, undefined, query, progressListener),
+            cli: defs.cli
+          })));
+          results.forEach(({
+            response,
+            cli
+          }) => {
+            getResults.push({
+              columns: cli.spec.columns,
+              response
+            });
           });
         }
       } // resolve team guids

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/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/common/ApiServerClient.js

@@ -998,8 +998,6 @@ class ApiServerClient {
         } else {
           throw e;
         }
-
-        ;
       }
     }
 

package/dist/common/DefinitionsManager.js

@@ -28,10 +28,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const {
   log
 } = (0, _snooplogg.default)('central:class.DefinitionsManager');
+
 /**
  * Get / fetch / set specs.
  */
-
 class DefinitionsManager {
   constructor(apiServerClient) {
     _defineProperty(this, "apiServerClient", void 0);
@@ -282,6 +282,22 @@ class DefinitionsManager {
     });
     return t.sort(['RESOURCE']).toString();
   }
+
+  findDefsByKind(kind) {
+    log('findDefsByKind: ', kind);
+    const res = [...this.resources].reduce((a, [_, def]) => {
+      if (def.spec.kind === kind) {
+        a.push({
+          resource: def,
+          cli: [...this.cli].find(([_, cliDef]) => cliDef.spec.resourceDefinition === def.name)[1],
+          scope: def.spec.scope ? [...this.resources].find(([_, resDef]) => resDef.spec.kind === def.spec.scope.kind)[1] : undefined
+        });
+      }
+
+      return a;
+    }, []);
+    return res.length ? res : null;
+  }
   /**
    * Returns set of related definitions if word is known.
    * @param word word to search for
@@ -307,12 +323,15 @@ class DefinitionsManager {
       var _cliDef$spec$names$sh;
 
       if (cliDef.spec.names.plural === word || cliDef.spec.names.singular === word || cliDef.spec.names.shortNames.includes(word) || (_cliDef$spec$names$sh = cliDef.spec.names.shortNamesAlias) !== null && _cliDef$spec$names$sh !== void 0 && _cliDef$spec$names$sh.includes(word)) {
+        var _this$findDefsByKind;
+
         // note: mind non-null assertion
         const resource = this.resources.get(cliDef.spec.resourceDefinition);
+        const scope = resource.spec.scope ? (_this$findDefsByKind = this.findDefsByKind(resource.spec.scope.kind)) === null || _this$findDefsByKind === void 0 ? void 0 : _this$findDefsByKind[0].resource : null;
         a.push({
           resource,
           cli: cliDef,
-          scope: resource.spec.scope ? this.resources.get(resource === null || resource === void 0 ? void 0 : resource.spec.scope.kind.toLowerCase()) : undefined
+          scope: !!scope ? scope : undefined
         });
       }
 

package/package.json

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