@axway/axway-central-cli 2.27.0 → 2.28.0-rc.1

package/dist/commands/install/agents.js

@@ -27,6 +27,7 @@ var istioAgents = _interopRequireWildcard(require("./istioAgents"));
 var azureSaasAgents = _interopRequireWildcard(require("./azureSaasAgents"));
 var kafkaAgents = _interopRequireWildcard(require("./kafkaAgents"));
 var swaggerHubAgents = _interopRequireWildcard(require("./swaggerHubSaasAgents"));
+var graylogAgent = _interopRequireWildcard(require("./graylogAgent"));
 var platform = _interopRequireWildcard(require("./platform"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -46,7 +47,8 @@ const agentInstallFlows = {
   [_types.GatewayTypes.GITLAB]: gitLabAgents.GitLabInstallMethods,
   [_types.GatewayTypes.AZURE_GATEWAY]: azureAgents.AzureInstallMethods,
   [_types.GatewayTypes.ISTIO]: istioAgents.IstioInstallMethods,
-  [_types.GatewayTypes.KAFKA]: kafkaAgents.KafkaInstallMethods
+  [_types.GatewayTypes.KAFKA]: kafkaAgents.KafkaInstallMethods,
+  [_types.GatewayTypes.GRAYLOG]: graylogAgent.GraylogInstallMethods
 };
 const saasAgentInstallFlows = {
   [_types.SaaSGatewayTypes.AWS_GATEWAY]: awsSaaSAgents.AWSSaaSInstallMethods,

package/dist/commands/install/apigeexSaasAgents.js

@@ -26,14 +26,26 @@ class DataplaneConfig {
   }
 }
 class APIGEEXDataplaneConfig extends DataplaneConfig {
-  constructor(projectID, developerEmail, mode) {
+  constructor(projectID, developerEmail, mode, metricsFilter, environment) {
     super("Apigee");
     _defineProperty(this, "projectId", void 0);
     _defineProperty(this, "developerEmail", void 0);
     _defineProperty(this, "mode", void 0);
+    _defineProperty(this, "metricsFilter", void 0);
+    _defineProperty(this, "environment", void 0);
     this.projectId = projectID;
     this.developerEmail = developerEmail;
     this.mode = mode;
+    this.metricsFilter = metricsFilter;
+    this.environment = environment;
+  }
+}
+class ApigeeMetricsFilterConfig {
+  constructor(filterMetrics, filteredAPIs) {
+    _defineProperty(this, "filterMetrics", void 0);
+    _defineProperty(this, "filteredAPIs", void 0);
+    this.filterMetrics = filterMetrics;
+    this.filteredAPIs = filteredAPIs;
   }
 }
 class SaasAgentValues {
@@ -59,12 +71,16 @@ class SaasAPIGEEXAgentValues extends SaasAgentValues {
     _defineProperty(this, "projectId", void 0);
     _defineProperty(this, "developerEmailAddress", void 0);
     _defineProperty(this, "mode", void 0);
+    _defineProperty(this, "metricsFilter", void 0);
+    _defineProperty(this, "environment", void 0);
     this.authType = APIGEEXAuthType.IMP_SVC_ACC;
     this.clientEmailAddress = '';
     this.credentialJSON = '';
     this.projectId = '';
     this.developerEmailAddress = '';
     this.mode = _types.APIGEEXDISCOVERYMODES.PROXY;
+    this.metricsFilter = new ApigeeMetricsFilterConfig(true, []);
+    this.environment = '';
   }
   getAccessData() {
     let data = JSON.stringify({
@@ -95,7 +111,11 @@ const SaasPrompts = {
   DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
   TA_FREQUENCY: 'How often should the traffic collection run, leave blank for manual trigger only',
   QUEUE: 'Do you want to discover immediately after installation',
-  ENTER_MORE: 'Do you want to enter another {0} for {1}'
+  ENTER_MORE: 'Do you want to enter another {0} for {1}',
+  FILTER_METRICS: 'Do you want metrics filtering? (defaults to true)',
+  FILTERED_APIS: 'Enter APIs to filter metrics for',
+  ENTER_MORE_APIS: 'Do you want to add another API?',
+  ENVIRONMENT: 'Enter the Apigee Envirnoment to filter discovered APIs/metrics'
 };
 const askBundleType = async () => {
   return await (0, _basicPrompts.askList)({
@@ -132,6 +152,32 @@ const askForAPIGEEXCredentials = async hostedAgentValues => {
       allowEmptyInput: true
     });
   }
+  hostedAgentValues.metricsFilter.filterMetrics = (await (0, _basicPrompts.askList)({
+    msg: SaasPrompts.FILTER_METRICS,
+    default: _types.YesNo.No,
+    choices: _types.YesNoChoices
+  })) === _types.YesNo.Yes;
+  if (hostedAgentValues.metricsFilter.filterMetrics) {
+    let askFilteredAPIs = true;
+    console.log(_chalk.default.gray("An array of APIs to filter metrics for"));
+    while (askFilteredAPIs) {
+      const api = await (0, _basicPrompts.askInput)({
+        msg: SaasPrompts.FILTERED_APIS,
+        allowEmptyInput: true
+      });
+      hostedAgentValues.metricsFilter.filteredAPIs.push(api);
+      askFilteredAPIs = (await (0, _basicPrompts.askList)({
+        msg: SaasPrompts.ENTER_MORE_APIS,
+        default: _types.YesNo.No,
+        choices: _types.YesNoChoices
+      })) === _types.YesNo.Yes;
+    }
+  }
+  hostedAgentValues.environment = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.ENVIRONMENT,
+    defaultValue: '',
+    allowEmptyInput: true
+  });
   return hostedAgentValues;
 };
 const validateFrequency = () => input => {
@@ -218,7 +264,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
     production: installConfig.centralConfig.production
   }) : installConfig.centralConfig.ampcEnvInfo.name;
   if (installConfig.gatewayType === _types.SaaSGatewayTypes.APIGEEX_GATEWAY) {
-    apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode);
+    apigeeXAgentValues.dataplaneConfig = new APIGEEXDataplaneConfig(apigeeXAgentValues.projectId, apigeeXAgentValues.developerEmailAddress, apigeeXAgentValues.mode, apigeeXAgentValues.metricsFilter, apigeeXAgentValues.environment);
   }
 
   // create the data plane resource

package/dist/commands/install/edgeAgents.js

@@ -191,7 +191,7 @@ const gatewayConnectivity = async installConfig => {
   }
   if (installConfig.switches.isTaEnabled) {
     v7AgentValues.isOpenTraffic = await askLoggingSource();
-    if (!v7AgentValues.isOpenTraffic) {
+    if (!v7AgentValues.isOpenTraffic && installConfig.bundleType !== _types.BundleType.TRACEABILITY_OFFLINE) {
       console.log('\nCONNECTION TO API GATEWAY:');
       console.log(_cliKit.chalk.gray(`The traceability agent needs to connect to Axway API Gateway.\n` + `Use the credentials of an Operator user.`));
       if (installConfig.switches.isHelmInstall) {
@@ -365,8 +365,9 @@ const helmSuccessMsg = (namespace, isDaEnabled, isTaEnabled) => {
     finishUp += `helm upgrade --install --namespace ${namespace} v7-traceability axway/v7-traceability -f ${ConfigFiles.TAHelmOverride}`;
   }
   console.log(_cliKit.chalk.white('\nTo deploy the Agents run the following commands\n'));
-  console.log(_cliKit.chalk.cyan('helm repo add axway https://charts.axway.com/charts'));
+  console.log(_cliKit.chalk.cyan('helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'));
   console.log(_cliKit.chalk.cyan(finishUp));
+  console.log(_cliKit.chalk.white(`\n* client_id - service account id for your Amplify Platform organization`), _cliKit.chalk.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
 };
 const edgeAgentNameMap = {
   [_types.AgentTypes.da]: _types.AgentNames.EDGE_DA,

package/dist/commands/install/graylogAgent.js

@@ -0,0 +1,142 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testables = exports.gatewayConnectivity = exports.completeInstall = exports.askConfigType = exports.askBundleType = exports.amplifyAgentsNs = exports.GraylogInstallMethods = exports.ConfigFiles = void 0;
+var _chalk = _interopRequireDefault(require("chalk"));
+var _snooplogg = _interopRequireDefault(require("snooplogg"));
+var _Kubectl = require("../../common/Kubectl");
+var _basicPrompts = require("../../common/basicPrompts");
+var _inputs = require("./helpers/inputs");
+var _types = require("../../common/types");
+var _utils = require("../../common/utils");
+var helpers = _interopRequireWildcard(require("./helpers"));
+var _graylogTemplates = require("./helpers/templates/graylogTemplates");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-ignore
+const {
+  log
+} = (0, _snooplogg.default)('central: install: agents: graylog');
+const amplifyAgentsNs = exports.amplifyAgentsNs = 'amplify-agents';
+
+// ConfigFiles - all the config file that are used in the setup
+const ConfigFiles = exports.ConfigFiles = {
+  helmOverride: 'agent-overrides.yaml'
+};
+
+// GraylogPrompts - prompts for user inputs
+const prompts = {
+  agentNamespace: 'Enter the namespace to use for the Amplify Graylog Agents',
+  enterUrl: 'Enter the Graylog base URL that the agent will use',
+  enterUsername: 'Enter the Graylog user name',
+  enterPassword: 'Enter the password for Graylog user',
+  enterBasePathSegmentLen: 'Enter the base path segment length that agent will use for lookup'
+};
+const askBundleType = async () => {
+  return _types.BundleType.TRACEABILITY;
+};
+exports.askBundleType = askBundleType;
+const askConfigType = async () => {
+  return _types.AgentConfigTypes.HELM;
+};
+
+//
+// Questions for the configuration of Graylog agent
+//
+exports.askConfigType = askConfigType;
+const askURL = async () => await (0, _basicPrompts.askInput)({
+  msg: prompts.enterUrl,
+  allowEmptyInput: false,
+  validate: (0, _basicPrompts.validateRegex)(helpers.GitLabRegexPatterns.gitLabBaseURLRegex, helpers.invalidValueExampleErrMsg('BaseURL', 'https://www.testdomain.com'))
+});
+const askUsername = async () => await (0, _basicPrompts.askInput)({
+  msg: prompts.enterUsername,
+  allowEmptyInput: false
+});
+const askPassword = async () => await (0, _basicPrompts.askInput)({
+  msg: prompts.enterPassword
+});
+const askBasePathSegmentLen = async () => await (0, _basicPrompts.askInput)({
+  msg: prompts.enterBasePathSegmentLen,
+  type: 'number',
+  defaultValue: 2
+});
+const gatewayConnectivity = async _installConfig => {
+  console.log(_chalk.default.gray(`The Amplify Graylog Agent needs to be deployed to your Kubernetes cluster to discover APIs for publishing to Amplify Central.`));
+  const {
+    error
+  } = await _Kubectl.kubectl.isInstalled();
+  if (error) {
+    throw new Error(`Kubectl is required to fill out the following prompts. It appears to be missing or misconfigured.\n${error}`);
+  }
+  const graylogAgentValues = new _graylogTemplates.GraylogAgentValues();
+  graylogAgentValues.namespace = await (0, _inputs.askNamespace)(prompts.agentNamespace, amplifyAgentsNs);
+  graylogAgentValues.url = await askURL();
+  graylogAgentValues.userName = await askUsername();
+  graylogAgentValues.password = await askPassword();
+  graylogAgentValues.basePathSegmentLen = await askBasePathSegmentLen();
+  return graylogAgentValues;
+};
+exports.gatewayConnectivity = gatewayConnectivity;
+const generateSuccessHelpMsg = graylogAgentValues => {
+  console.log(`Graylog Agent override file has been placed at ${process.cwd()}/${ConfigFiles.helmOverride}`);
+  const installCmd = `helm upgrade --install --namespace ${graylogAgentValues.namespace.name} graylog-agent axway/graylog-agent -f ${ConfigFiles.helmOverride}`;
+  console.log('To complete the Graylog Agent installation run the following commands:', _chalk.default.cyan('\n  helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'), _chalk.default.cyan(`\n  helm repo update\n  ${installCmd}`), _chalk.default.cyan(`\n`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
+  console.log('Configuration file(s) have been successfully created.\n');
+  console.log(_chalk.default.gray(`\nAdditional information about agent features can be found here:\n${helpers.agentsDocsUrl.GRAYLOG}`));
+};
+const completeInstall = async installConfig => {
+  // Add final settings to graylogAgentValues
+  const graylogAgentValues = installConfig.gatewayConfig;
+  if (graylogAgentValues.namespace.isNew) {
+    await helpers.createNamespace(graylogAgentValues.namespace.name);
+  }
+  graylogAgentValues.centralConfig = installConfig.centralConfig;
+  graylogAgentValues.graylogSecret = helpers.amplifyAgentsCredsSecret;
+  graylogAgentValues.agentKeysSecret = helpers.amplifyAgentsKeysSecret;
+  // read file content
+  await helpers.createSecret(graylogAgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, async () => {
+    if (installConfig.centralConfig.ampcDosaInfo.isNew) {
+      console.log(_chalk.default.yellow(`The secret '${helpers.amplifyAgentsKeysSecret}' will be created with the same "private_key.pem" and "public_key.pem" that was auto generated to create the Service Account.`));
+    }
+    await helpers.createAmplifyAgentKeysSecret(graylogAgentValues.namespace.name, helpers.amplifyAgentsKeysSecret, 'publicKey', graylogAgentValues.centralConfig.dosaAccount.publicKey, 'privateKey', graylogAgentValues.centralConfig.dosaAccount.privateKey);
+  });
+  await helpers.createSecret(graylogAgentValues.namespace.name, helpers.amplifyAgentsCredsSecret, async () => {
+    await createGraylogCredsSecret(graylogAgentValues.namespace.name, helpers.amplifyAgentsCredsSecret, graylogAgentValues.userName, graylogAgentValues.password);
+  });
+  graylogAgentValues.traceabilityConfig = installConfig.traceabilityConfig;
+  console.log('Generating the configuration file(s)...');
+  (0, _utils.writeTemplates)(ConfigFiles.helmOverride, graylogAgentValues, helpers.graylogHelmOverrideTemplate);
+  generateSuccessHelpMsg(graylogAgentValues);
+};
+exports.completeInstall = completeInstall;
+const createGraylogCredsSecret = async (namespace, secretName, user, password) => {
+  const {
+    error
+  } = await _Kubectl.kubectl.create('secret', `-n ${namespace} generic ${secretName} \
+		--from-literal=username=${user} \
+		--from-literal=password=${password}`);
+  if (error) {
+    throw Error(error);
+  }
+  console.log(`Created ${secretName} in the ${namespace} namespace.`);
+};
+const GraylogInstallMethods = exports.GraylogInstallMethods = {
+  GetBundleType: askBundleType,
+  GetDeploymentType: askConfigType,
+  AskGatewayQuestions: gatewayConnectivity,
+  FinalizeGatewayInstall: completeInstall,
+  ConfigFiles: Object.values(ConfigFiles),
+  AgentNameMap: {
+    [_types.AgentTypes.da]: _types.AgentNames.GRAYLOG_TA,
+    [_types.AgentTypes.ta]: _types.AgentNames.GRAYLOG_TA
+  },
+  GatewayDisplay: _types.GatewayTypes.GRAYLOG
+};
+const testables = exports.testables = {
+  prompts,
+  ConfigFiles
+};

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createSecret = exports.createNewDataPlaneSecretResource = exports.createNewDataPlaneResource = exports.createNewAgentResource = exports.createDosaAndCerts = exports.createByResourceType = exports.createBackUpConfigs = void 0;
+exports.updateSubResourceType = exports.createSecret = exports.createNewDataPlaneSecretResource = exports.createNewDataPlaneResource = exports.createNewAgentResource = exports.createDosaAndCerts = exports.createByResourceType = exports.createBackUpConfigs = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _snooplogg = _interopRequireDefault(require("snooplogg"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
@@ -51,22 +51,62 @@ const createDosaAndCerts = async (client, name) => {
   return new _types.DosaAccount(account.client_id, publicKey, privateKey);
 };
 exports.createDosaAndCerts = createDosaAndCerts;
-const createByResourceType = async (client, defsManager, name, resourceType, resourceShortName, spec = {}, scopeName = '') => {
+const updateSubResourceType = async (client, defsManager, name, resourceType, resourceShortName, scopeName = '', subResources = {}) => {
+  var _defs$0$resource$spec, _defs$0$resource$spec2;
+  const defs = defsManager.findDefsByWord(resourceShortName);
+  if (!defs) {
+    throw Error(`the server doesn't have a resource type "${resourceType}"`);
+  }
+  const knownSubResourcesNames = (_defs$0$resource$spec = (_defs$0$resource$spec2 = defs[0].resource.spec.subResources) === null || _defs$0$resource$spec2 === void 0 ? void 0 : _defs$0$resource$spec2.names) !== null && _defs$0$resource$spec !== void 0 ? _defs$0$resource$spec : [];
+  for (let [key, value] of Object.entries(subResources)) {
+    if (knownSubResourcesNames.includes(key)) {
+      console.log(`Updating subresource ${key} on ${resourceType}`);
+      const resource = {
+        name
+      };
+      Object.assign(resource, {
+        [key]: value
+      });
+      await client.updateSubResource({
+        resourceDef: defs[0].resource,
+        resource: resource,
+        subResourceName: key,
+        scopeDef: defs[0].scope ? defs[0].scope : undefined,
+        scopeName: defs[0].scope ? scopeName || name : undefined
+      });
+    }
+  }
+};
+exports.updateSubResourceType = updateSubResourceType;
+const createByResourceType = async (client, defsManager, name, resourceType, resourceShortName, spec = {}, scopeName = '', subResources = {}) => {
+  var _defs$0$resource$spec3, _defs$0$resource$spec4;
   console.log(`Creating a new ${resourceType}`);
   // NOTE: only a first found set is used
   const defs = defsManager.findDefsByWord(resourceShortName);
   if (!defs) {
     throw Error(`the server doesn't have a resource type "${resourceType}"`);
   }
+
+  // @ts-ignore payload
+  const resource = {
+    name,
+    spec
+  };
+  const knownSubResourcesNames = (_defs$0$resource$spec3 = (_defs$0$resource$spec4 = defs[0].resource.spec.subResources) === null || _defs$0$resource$spec4 === void 0 ? void 0 : _defs$0$resource$spec4.names) !== null && _defs$0$resource$spec3 !== void 0 ? _defs$0$resource$spec3 : [];
+  for (let [key, value] of Object.entries(subResources)) {
+    if (knownSubResourcesNames.includes(key)) {
+      Object.assign(resource, {
+        [key]: value
+      });
+    }
+  }
+  const withSubRes = subResources !== null;
   const result = await client.createResource({
-    // @ts-ignore payload
-    resource: {
-      name,
-      spec
-    },
+    resource,
     resourceDef: defs[0].resource,
     scopeDef: defs[0].scope ? defs[0].scope : undefined,
-    scopeName: defs[0].scope ? scopeName || name : undefined
+    scopeName: defs[0].scope ? scopeName || name : undefined,
+    withSubResources: withSubRes
   });
   if (!result.data) {
     var _result$error;

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

@@ -152,6 +152,18 @@ Object.keys(_kafkaTemplates).forEach(function (key) {
     }
   });
 });
+var _graylogTemplates = require("./templates/graylogTemplates");
+Object.keys(_graylogTemplates).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _graylogTemplates[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _graylogTemplates[key];
+    }
+  });
+});
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const streamPipeline = exports.streamPipeline = _util.default.promisify(_stream.default.pipeline);
 const unzip = async filePath => {
@@ -180,7 +192,8 @@ const agentsDocsUrl = exports.agentsDocsUrl = {
   V7: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_api_manager/index.html',
   AWS: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_aws_gateway/index.html',
   AZURE: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/connect_azure_gateway/index.html',
-  ISTIO: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html'
+  ISTIO: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html',
+  GRAYLOG: 'https://docs.axway.com/bundle/amplify-central/page/docs/connect_manage_environ/mesh_management/index.html'
 };
 
 // export * from './updaters';

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transactionLoggingMessages = exports.serviceAccountNameAlreadyExists = exports.selectServiceAccount = exports.selectIngestionProtocol = exports.selectAWSRegion = exports.secretAlreadyExists = exports.namespaceAlreadyExists = exports.k8sClusterMessages = exports.envMessages = exports.enterServiceAccountName = exports.enterPublicKeyPath = exports.enterPrivateKeyPath = exports.enterNamespaceName = exports.enterAWSRegion = exports.createNamespace = exports.createGatewayAgentCredsSecret = exports.createAmplifyAgentKeysSecret = exports.askToEnableTransactionLogging = exports.askServiceAccountName = exports.askPublicKeyPath = exports.askPublicAndPrivateKeysPath = exports.askPrivateKeyPath = exports.askNamespace = exports.askK8sClusterName = exports.askIngestionProtocol = exports.askForSecretName = exports.askEnvironmentName = exports.askDosaClientId = exports.askBundleType = exports.askAgentName = exports.askAWSRegion = exports.agentMessages = void 0;
+exports.transactionLoggingMessages = exports.serviceAccountNameAlreadyExists = exports.selectServiceAccount = exports.selectIngestionProtocol = exports.selectAWSRegion = exports.secretAlreadyExists = exports.namespaceAlreadyExists = exports.k8sClusterMessages = exports.envMessages = exports.enterServiceAccountName = exports.enterPublicKeyPath = exports.enterPrivateKeyPath = exports.enterNamespaceName = exports.enterAWSRegion = exports.createNamespace = exports.createGatewayAgentCredsSecret = exports.createAmplifyAgentKeysSecret = exports.askToEnableTransactionLogging = exports.askServiceAccountName = exports.askReferencedEnvironments = exports.askPublicKeyPath = exports.askPublicAndPrivateKeysPath = exports.askPrivateKeyPath = exports.askNamespace = exports.askK8sClusterName = exports.askIngestionProtocol = exports.askForSecretName = exports.askEnvironmentName = exports.askDosaClientId = exports.askBundleType = exports.askAgentName = exports.askAWSRegion = exports.agentMessages = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _inquirer = _interopRequireDefault(require("inquirer"));
 var _basicPrompts = require("../../../common/basicPrompts");
@@ -19,6 +19,9 @@ const envMessages = exports.envMessages = {
   enterEnvironmentName: 'Enter a new environment name',
   isProduction: 'Is the environment used for production purpose?',
   selectEnvironment: 'Select an environment',
+  selectReferencedEnvironment: 'Select a referenced environment',
+  selectMoreWithExistingRefEnv: "Selected environment already contains references, do you want to select more",
+  selectMoreRefEnv: "Do you want to select more referenced environment",
   getEnvironmentsError: 'Get environments error.',
   environmentAlreadyExists: 'Environment already exists. Please enter a new name.',
   selectTeam: 'Select a team'
@@ -239,13 +242,60 @@ const askEnvironmentName = async (client, defsManager, isAxwayManaged = null) =>
       isNew: true
     };
   } else {
+    var _selectedEnv$referenc;
+    const selectedEnv = envs.find(env => env.name == answer);
     return {
       name: answer,
-      isNew: false
+      isNew: false,
+      referencedEnvironments: selectedEnv === null || selectedEnv === void 0 ? void 0 : (_selectedEnv$referenc = selectedEnv.references) === null || _selectedEnv$referenc === void 0 ? void 0 : _selectedEnv$referenc.managedEnvironments
     };
   }
 };
 exports.askEnvironmentName = askEnvironmentName;
+const askReferencedEnvironments = async (client, defsManager, envInfo) => {
+  var _envInfo$referencedEn;
+  if (((_envInfo$referencedEn = envInfo.referencedEnvironments) === null || _envInfo$referencedEn === void 0 ? void 0 : _envInfo$referencedEn.length) > 0) {
+    const choice = (await (0, _basicPrompts.askList)({
+      msg: envMessages.selectMoreWithExistingRefEnv,
+      default: _types.YesNo.No,
+      choices: _types.YesNoChoices
+    })) === _types.YesNo.Yes;
+    if (!choice) {
+      return envInfo.referencedEnvironments;
+    }
+  }
+
+  // filter all environments not referencing other environment
+  const {
+    data: allEnvs
+  } = await (0, _getters.getListByResource)({
+    client,
+    defsManager,
+    resourceType: 'Environment',
+    resourceShortName: 'env',
+    query: "metadata.references.kind!=Environment"
+  });
+  if (!allEnvs) throw Error(envMessages.getEnvironmentsError);
+  let askReferencedEnvironments = true;
+  const selectedRefEnv = envInfo.referencedEnvironments ? [...envInfo.referencedEnvironments] : [];
+  const envFilter = name => {
+    return !(selectedRefEnv !== null && selectedRefEnv !== void 0 && selectedRefEnv.includes(name)) && name != envInfo.name;
+  };
+  while (askReferencedEnvironments) {
+    let selectedEnv = await (0, _basicPrompts.askList)({
+      msg: envMessages.selectReferencedEnvironment,
+      choices: [...allEnvs.filter(e => envFilter(e.name)).map(e => e.name).sort((n, m) => n.localeCompare(m))]
+    });
+    selectedRefEnv.push(selectedEnv);
+    askReferencedEnvironments = (await (0, _basicPrompts.askList)({
+      msg: envMessages.selectMoreRefEnv,
+      default: _types.YesNo.No,
+      choices: _types.YesNoChoices
+    })) === _types.YesNo.Yes;
+  }
+  return selectedRefEnv;
+};
+exports.askReferencedEnvironments = askReferencedEnvironments;
 const askK8sClusterName = async (client, defsManager) => {
   const {
     data: k8sCluster

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

@@ -69,18 +69,21 @@ APIMANAGER_AUTH_PASSWORD={{apiManagerAuthPass}}
 APIMANAGER_AUTH_USERNAME={{apiManagerAuthUser}}
 APIMANAGER_HOST={{apiManagerHost}}
 APIMANAGER_PORT={{apiManagerPort}}
-
 {{/unless}}
+{{#if isGatewayOnly}}
+APIGATEWAY_ONLY={{isGatewayOnly}}
+{{/if}}
+{{#if traceabilityConfig.usageReportingOffline}}
+APIGATEWAY_GETHEADERS=false
+{{else}}
 {{#unless isOpenTraffic}}
 # API Gateway configs
 APIGATEWAY_AUTH_PASSWORD={{apiGatewayAuthPass}}
 APIGATEWAY_AUTH_USERNAME={{apiGatewayAuthUser}}
 APIGATEWAY_HOST={{apiGatewayHost}}
 APIGATEWAY_PORT={{apiGatewayPort}}
-{{#if isGatewayOnly}}
-APIGATEWAY_ONLY={{isGatewayOnly}}
-{{/if}}
 {{/unless}}
+{{/if}}
 {{#if eventLogPathTemplate}}
 {{#if isOpenTraffic}}
 # API Gateway open traffic logs

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

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.graylogHelmOverrideTemplate = exports.GraylogAgentValues = void 0;
+var _types = require("../../../../common/types");
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+/**
+ * @description Parameters to provide to the Graylog handlebars templates.
+ */
+class GraylogAgentValues {
+  constructor() {
+    _defineProperty(this, "namespace", void 0);
+    _defineProperty(this, "url", void 0);
+    _defineProperty(this, "graylogSecret", void 0);
+    _defineProperty(this, "agentKeysSecret", void 0);
+    _defineProperty(this, "userName", void 0);
+    _defineProperty(this, "password", void 0);
+    _defineProperty(this, "basePathSegmentLen", void 0);
+    _defineProperty(this, "centralConfig", void 0);
+    _defineProperty(this, "traceabilityConfig", void 0);
+    this.namespace = {
+      name: '',
+      isNew: false
+    };
+    this.url = '';
+    this.graylogSecret = '';
+    this.agentKeysSecret = '';
+    this.userName = '';
+    this.password = '';
+    this.basePathSegmentLen = 2;
+    this.centralConfig = new _types.CentralAgentConfig();
+    this.traceabilityConfig = new _types.TraceabilityConfig();
+  }
+}
+
+/**
+ * @description Generates the helm override file for the Amplify Graylog Agent.
+ */
+exports.GraylogAgentValues = GraylogAgentValues;
+const graylogHelmOverrideTemplate = () => {
+  return `---
+graylog:
+  url: {{url}}
+  basePathSegmentLen: {{basePathSegmentLen}}
+
+secrets:
+  graylog:
+    name: {{graylogSecret}}
+  agent:
+    name: {{agentKeysSecret}}
+  
+env:
+  CENTRAL_SINGLEURL: {{centralConfig.singleEntryPointUrl}}
+  CENTRAL_URL: {{centralConfig.url}}
+  CENTRAL_AUTH_URL: {{centralConfig.authUrl}}
+  CENTRAL_ORGANIZATIONID: "{{centralConfig.orgId}}"
+  CENTRAL_DEPLOYMENT: {{centralConfig.deployment}}
+  CENTRAL_TEAM: {{centralConfig.ampcTeamName}}
+  CENTRAL_ENVIRONMENT: {{centralConfig.environment}}
+  CENTRAL_AGENTNAME: {{centralConfig.taAgentName}}
+  CENTRAL_AUTH_CLIENTID: {{centralConfig.dosaAccount.clientId}}
+  TRACEABILITY_HOST: {{traceabilityConfig.host}}
+  TRACEABILITY_PROTOCOL: {{traceabilityConfig.protocol}}
+`;
+};
+exports.graylogHelmOverrideTemplate = graylogHelmOverrideTemplate;

package/dist/commands/install/istioAgents.js

@@ -317,7 +317,7 @@ const createHybridOverride = overrides => {
   (0, _utils.writeTemplates)(overrideFileName, overrides, helpers.istioAgentsTemplate);
   console.log(`Istio agent override file has been placed at ${process.cwd()}/${overrideFileName}`);
   const installCmd = `helm upgrade --install --namespace ${overrides.istioAgentValues.namespace.name} ampc-hybrid axway/ampc-hybrid -f ${overrideFileName}`;
-  console.log('To complete the Istio agent installation run the following commands:', _chalk.default.cyan('\n  helm repo add axway https://charts.axway.com/charts'), _chalk.default.cyan(`\n  helm repo update\n  ${installCmd}`));
+  console.log('To complete the Istio agent installation run the following commands:', _chalk.default.cyan('\n  helm repo add axway https://helm.repository.axway.com --username=<client_id> --password=<client_secret>'), _chalk.default.cyan(`\n  helm repo update\n  ${installCmd}`), _chalk.default.cyan(`\n`), _chalk.default.white(`\n* client_id - service account id for your Amplify Platform organization`), _chalk.default.white(`\n* client_secret - service account secret for your Amplify Platform organization`));
 };
 exports.createHybridOverride = createHybridOverride;
 const installPreprocess = async installConfig => {

package/dist/commands/install/platform.js

@@ -47,7 +47,7 @@ const getTraceabilityConfig = async installConfig => {
   // Do not ask Traceability questions in offline mode
   if (!traceabilityConfig.usageReportingOffline) {
     console.log('\nCONNECTION TO TRACEABILITY MODULE:');
-    if (installConfig.gatewayType !== _types.GatewayTypes.KAFKA) {
+    if (installConfig.gatewayType !== _types.GatewayTypes.KAFKA && installConfig.gatewayType !== _types.GatewayTypes.GRAYLOG) {
       const {
         enabled,
         samplingPercentage,
@@ -80,6 +80,16 @@ const getCentralConfig = async (apiServerClient, platformClient, defsManager, ap
   centralConfig.orgId = await helpers.getCurrentUserOrgId();
   centralConfig.ampcEnvInfo = await helpers.askEnvironmentName(apiServerClient, defsManager, centralConfig.axwayManaged);
   centralConfig.production = centralConfig.ampcEnvInfo.isNew ? await askIsProductionEnvironment() : false;
+  if (installConfig.gatewayType === _types.GatewayTypes.GRAYLOG) {
+    const updatedRefEnvs = await helpers.askReferencedEnvironments(apiServerClient, defsManager, centralConfig.ampcEnvInfo);
+    const compareRefs = (a, b) => {
+      return (a === null || a === void 0 ? void 0 : a.length) === (b === null || b === void 0 ? void 0 : b.length) && (a === null || a === void 0 ? void 0 : a.every(element => b === null || b === void 0 ? void 0 : b.includes(element)));
+    };
+    if (!compareRefs(updatedRefEnvs, centralConfig.ampcEnvInfo.referencedEnvironments)) {
+      centralConfig.ampcEnvInfo.referencedEnvironments = updatedRefEnvs;
+      centralConfig.ampcEnvInfo.isUpdated = true;
+    }
+  }
   if (!installConfig.switches.isOrgRep) {
     centralConfig.ampcTeamName = await askTeamName(platformClient);
   }
@@ -118,12 +128,23 @@ const finalizeCentralInstall = async (apiServerClient, platformClient, defsManag
     installConfig.centralConfig.dosaAccount.clientId = installConfig.centralConfig.ampcDosaInfo.clientId;
   }
   installConfig.centralConfig.dosaAccount.updateKeyTemplateValues(installConfig.deploymentType);
+  let refEnvSubResource;
+  if (installConfig.centralConfig.ampcEnvInfo.referencedEnvironments) {
+    refEnvSubResource = {
+      references: {
+        managedEnvironments: installConfig.centralConfig.ampcEnvInfo.referencedEnvironments
+      }
+    };
+  }
 
   // environment name
   installConfig.centralConfig.environment = installConfig.centralConfig.ampcEnvInfo.isNew ? await helpers.createByResourceType(apiServerClient, defsManager, installConfig.centralConfig.ampcEnvInfo.name, 'Environment', 'env', {
     axwayManaged: installConfig.centralConfig.axwayManaged,
     production: installConfig.centralConfig.production
-  }) : installConfig.centralConfig.ampcEnvInfo.name;
+  }, '', refEnvSubResource) : installConfig.centralConfig.ampcEnvInfo.name;
+  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 != '') {

package/dist/common/ApiServerClient.js

@@ -327,6 +327,58 @@ class ApiServerClient {
     return result;
   }
 
+  /**
+   * Update sub resource on the resource.
+   * @param resources resource to be updated
+   * @param subResourceName sub resource name to be updated
+   */
+  async updateSubResource({
+    resourceDef,
+    resource,
+    subResourceName,
+    scopeDef,
+    scopeName,
+    version = ApiServerVersions.v1alpha1
+  }) {
+    log(`updateSubResource, spec.kind = ${resourceDef.spec.kind}, name = ${resource.name}`);
+    const result = {
+      data: null,
+      error: null,
+      pending: null
+    };
+    try {
+      var _resourceDef$spec$sub3, _resourceDef$spec$sub4;
+      const service = await (0, _dataService.dataService)({
+        baseUrl: this.baseUrl,
+        region: this.region,
+        account: this.account,
+        team: this.team
+      });
+      const knownSubResourcesNames = (_resourceDef$spec$sub3 = (_resourceDef$spec$sub4 = resourceDef.spec.subResources) === null || _resourceDef$spec$sub4 === void 0 ? void 0 : _resourceDef$spec$sub4.names) !== null && _resourceDef$spec$sub3 !== void 0 ? _resourceDef$spec$sub3 : [];
+      const foundSubResources = (0, _pickBy.default)(resource, (_, key) => subResourceName == key && knownSubResourcesNames.includes(key));
+      const resourceName = resource.name;
+      const baseUrl = this.buildResourceBaseUrl({
+        resourceDef,
+        resourceName,
+        scopeDef,
+        scopeName,
+        version
+      });
+      service.put(`${baseUrl}/${subResourceName}?fields=${subResourceName}`, {
+        [subResourceName]: foundSubResources[subResourceName]
+      });
+    } catch (e) {
+      log('updateSubResource, error', e);
+      // expecting only a valid ApiServer error response here
+      // re-throw if something different, so it should be handled by command's catch block.
+      if (e.errors && Array.isArray(e.errors)) {
+        result.error = e.errors;
+      } else throw e;
+    }
+    if (!!result.data) result.data = (0, _utils.sanitizeMetadata)(result.data);
+    return result;
+  }
+
   /**
    * Delete a resources by name.
    * @param opts = {

package/dist/common/types.js

@@ -224,6 +224,7 @@ 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_TA"] = "graylog-agent";
   return AgentNames;
 }({});
 let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
@@ -234,6 +235,7 @@ let GatewayTypes = exports.GatewayTypes = /*#__PURE__*/function (GatewayTypes) {
   GatewayTypes["ISTIO"] = "Istio";
   GatewayTypes["EDGE_GATEWAY_ONLY"] = "Amplify API Gateway only";
   GatewayTypes["KAFKA"] = "Kafka";
+  GatewayTypes["GRAYLOG"] = "Graylog";
   return GatewayTypes;
 }({});
 let SaaSGatewayTypes = exports.SaaSGatewayTypes = /*#__PURE__*/function (SaaSGatewayTypes) {
@@ -251,6 +253,7 @@ let DataPlaneNames = exports.DataPlaneNames = /*#__PURE__*/function (DataPlaneNa
   DataPlaneNames["AZURE"] = "Azure";
   DataPlaneNames["EDGE"] = "Edge";
   DataPlaneNames["KAFKA"] = "Kafka";
+  DataPlaneNames["GRAYLOG"] = "Graylog";
   DataPlaneNames["KONG"] = "Kong";
   DataPlaneNames["SWAGGERHUB"] = "SwaggerHub";
   DataPlaneNames["MULESOFT"] = "Mulesoft";
@@ -268,7 +271,8 @@ const GatewayTypeToDataPlane = exports.GatewayTypeToDataPlane = {
   [GatewayTypes.ISTIO]: 'Istio',
   [SaaSGatewayTypes.APIGEEX_GATEWAY]: DataPlaneNames.APIGEE,
   [GatewayTypes.KAFKA]: DataPlaneNames.KAFKA,
-  [SaaSGatewayTypes.SWAGGERHUB]: DataPlaneNames.SWAGGERHUB
+  [SaaSGatewayTypes.SWAGGERHUB]: DataPlaneNames.SWAGGERHUB,
+  [GatewayTypes.GRAYLOG]: DataPlaneNames.GRAYLOG
 };
 let AgentResourceKind = exports.AgentResourceKind = /*#__PURE__*/function (AgentResourceKind) {
   AgentResourceKind["da"] = "DiscoveryAgent";
@@ -299,8 +303,12 @@ class EnvironmentConfigInfo {
   constructor() {
     _defineProperty(this, "name", void 0);
     _defineProperty(this, "isNew", void 0);
+    _defineProperty(this, "isUpdated", void 0);
+    _defineProperty(this, "referencedEnvironments", void 0);
     this.name = '';
     this.isNew = false;
+    this.isUpdated = false;
+    this.referencedEnvironments = [];
   }
 }
 exports.EnvironmentConfigInfo = EnvironmentConfigInfo;

package/package.json

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