@axway/axway-central-cli 2.23.0 → 2.24.0

package/README.md

@@ -229,50 +229,6 @@ The ability to create/update proxies have been deprecated from the CLI verison 2
 
 ---
 
-- **v0**
-
-```yaml
-apiVersion: v1
-proxy:
-  name: 'Musical Instruments'
-  basePath: /api/v1
-  swagger: 'https://ec062a054a2977120b7e721801edb38ca24dfbb3.cloudapp-enterprise.appcelerator.com/apidoc/swagger.json'
-  policy:
-    type: api-key
-    app: 'Sample App'
-  tags: ['musical', 'instruments']
-  team:
-    name: 'Default Team'
-```
-
-- **v1**
-
-```yaml
-apiVersion: v1
-version: v1
-proxy:
-  name: 'Musical Instruments'
-  basePath: /api/v1
-  swagger: 'https://ec062a054a2977120b7e721801edb38ca24dfbb3.cloudapp-enterprise.appcelerator.com/apidoc/swagger.json'
-  policies:
-    clientAuth:
-      type: api-key
-      app: 'Sample App'
-    backendAuth:
-      type: auth-http-basic
-      username: Joe
-      password: changeme
-    rateLimit:
-      perProxy: 5
-      perProxyAndApp: 3
-  apps:
-    - name: 'Second Sample App'
-  team:
-    name: 'Default Team'
-```
-
----
-
 ## GET
 
 Prints a table of the most important information about the specified resources.

package/dist/commands/install/gitHubSaasAgents.js

@@ -37,10 +37,12 @@ class GitHubDataplaneConfig extends DataplaneConfig {
   }
 }
 class GitHubFilterConfig {
-  constructor(paths, pattern) {
+  constructor(paths, branch, pattern) {
     _defineProperty(this, "paths", void 0);
+    _defineProperty(this, "branch", void 0);
     _defineProperty(this, "pattern", void 0);
     this.paths = paths;
+    this.branch = branch;
     this.pattern = pattern;
   }
 }
@@ -53,6 +55,7 @@ class SaasAgentValues {
     _defineProperty(this, "centralConfig", void 0);
     _defineProperty(this, "repositoryOwner", void 0);
     _defineProperty(this, "repositoryName", void 0);
+    _defineProperty(this, "repositoryBranch", void 0);
     _defineProperty(this, "filePaths", void 0);
     _defineProperty(this, "filePatterns", void 0);
     this.frequencyDA = '';
@@ -62,6 +65,7 @@ class SaasAgentValues {
     this.centralConfig = new _types.CentralAgentConfig();
     this.repositoryOwner = '';
     this.repositoryName = '';
+    this.repositoryBranch = '';
     this.filePaths = [];
     this.filePatterns = [];
   }
@@ -88,6 +92,7 @@ const SaasPrompts = {
   ACCESS_TOKEN: 'Enter the GitHub Access Token the agent will use',
   REPOSITORY_OWNER: 'Enter the GitHub Repository Owner the agent will use',
   REPOSITORY_NAME: 'Enter the Repository Name the agent will use',
+  REPOSITORY_BRANCH: 'Enter the Repository Branch the agent will use',
   FILE_PATHS: 'Enter a File Path within the repository that the agent will use',
   FILE_PATTERNS: 'Enter a File Pattern that the agent will use (Optional)',
   DA_FREQUENCY: 'How often should the discovery run, leave blank for integrating in CI/CD process',
@@ -166,7 +171,13 @@ const gatewayConnectivity = async installConfig => {
   hostedAgentValues.repositoryName = await (0, _basicPrompts.askInput)({
     msg: SaasPrompts.REPOSITORY_NAME,
     defaultValue: hostedAgentValues.repositoryName !== '' ? hostedAgentValues.repositoryName : undefined,
-    validate: (0, _basicPrompts.validateRegex)(helpers.GitHubRegexPatterns.gitHubRepositoryOwnerRegex, helpers.invalidValueExampleErrMsg('Repository Name', 'axway-github-repo-name'))
+    validate: (0, _basicPrompts.validateRegex)(helpers.GitHubRegexPatterns.gitHubRepositoryNameRegex, helpers.invalidValueExampleErrMsg('Repository Name', 'axway-github-repo-name'))
+  });
+
+  // get repository branch
+  hostedAgentValues.repositoryBranch = await (0, _basicPrompts.askInput)({
+    msg: SaasPrompts.REPOSITORY_BRANCH,
+    defaultValue: hostedAgentValues.repositoryBranch !== '' ? hostedAgentValues.repositoryBranch : undefined
   });
 
   // get File Paths
@@ -241,7 +252,7 @@ const completeInstall = async (installConfig, apiServerClient, defsManager) => {
     production: installConfig.centralConfig.production
   }) : installConfig.centralConfig.ampcEnvInfo.name;
   if (installConfig.gatewayType === _types.GatewayTypes.GITHUB) {
-    gitHubAgentValues.dataplaneConfig = new GitHubDataplaneConfig(gitHubAgentValues.repositoryName, gitHubAgentValues.repositoryOwner, new GitHubFilterConfig(gitHubAgentValues.filePaths, gitHubAgentValues.filePatterns));
+    gitHubAgentValues.dataplaneConfig = new GitHubDataplaneConfig(gitHubAgentValues.repositoryName, gitHubAgentValues.repositoryOwner, new GitHubFilterConfig(gitHubAgentValues.filePaths, gitHubAgentValues.repositoryBranch, gitHubAgentValues.filePatterns));
   }
 
   // create the data plane resource

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

@@ -31,13 +31,13 @@ const AWSRegexPatterns = exports.AWSRegexPatterns = {
   AWS_REGEXP_ACCESS_KEY_ID: '((?:ASIA|AKIA|AROA|AIDA)([A-Z0-7]{16}))',
   AWS_REGEXP_SECRET_ACCESS_KEY: '[a-zA-Z0-9+/]{40}',
   AWS_REGEXP_ROLE_ARN: '^arn:aws[a-zA-Z-]*:iam::\\d{12}:role\\/?[a-zA-Z0-9+=,.@\\-_\\/]{1,128}$',
-  AWS_ACCESS_LOG_ARN: '^arn:aws[a-zA-Z-]*:logs:[a-zA-Z0-9-]*:\\d{12}:log-group:[a-zA-Z0-9_\\-\\/\\.#]{1,512}$'
+  AWS_ACCESS_LOG_ARN: '^arn:aws[a-zA-Z-]*:logs:[a-zA-Z0-9\-]*:\\d{12}:log-group:[a-zA-Z0-9_\\-\\/\\.#]{1,512}$'
 };
 
 // APIGEEXRegexPatterns - regex patters to validate user inputs
 const APIGEEXRegexPatterns = exports.APIGEEXRegexPatterns = {
   APIGEEX_REGEXP_PROJECT_ID: '^[a-z][a-z0-9-]{4,28}[a-z0-9]$',
-  AWS_REGEXP_EMAIL_ADDRESS: '^(([^<>()[]\\.,;:s@"]+(.[^<>()[]\\.,;:s@"]+)*)|.(".+"))@(([[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}])|(([a-zA-Z-0-9]+.)+[a-zA-Z]{2,}))$'
+  AWS_REGEXP_EMAIL_ADDRESS: '^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$'
 };
 
 // AzureRegexPatterns - regex patters to validate user inputs
@@ -49,12 +49,12 @@ const AzureRegexPatterns = exports.AzureRegexPatterns = {
 const GitHubRegexPatterns = exports.GitHubRegexPatterns = {
   gitHubAccessTokenRegex: '^ghp_[a-zA-Z0-9]{36}$',
   gitHubRepositoryOwnerRegex: '^(?!-)(?!.*--)[a-zA-Z0-9-]{1,37}(?<!-)$',
-  gitHubRepositoryNameRegex: '^[w-.]+$',
-  gitHubFilePathRegex: '^/.*$'
+  gitHubRepositoryNameRegex: '^[\\w-\\.]+$',
+  gitHubFilePathRegex: '^\/.*$'
 };
 const GitLabRegexPatterns = exports.GitLabRegexPatterns = {
-  gitLabAccessTokenRegex: '^[0-9a-zA-Z-]{20}$',
-  gitLabBaseURLRegex: '^(http://|https://)[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?$',
+  gitLabAccessTokenRegex: '^[0-9a-zA-Z\-]{20}$',
+  gitLabBaseURLRegex: '^(http:\/\/|https:\/\/)[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$',
   gitHubRepositoryIDRegex: '^[0-9]*$',
-  gitLabPathRegex: '^/.*$'
+  gitLabPathRegex: '^\/.*$'
 };

package/package.json

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