Merge branch 'develop' into 'main'

1.18.0 Release See merge request automation-toolchain/f5-automation-config-converter!525
f5devcentral · Jan 24, 2022 · 9fd22ee · 9fd22ee
2 parents 863b9d7 + 171a972
commit 9fd22ee
Show file tree

Hide file tree

Showing 333 changed files with 5,881 additions and 1,812 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -36,11 +36,7 @@ ltm rule /Common/validation_rule {
 
 2. Observe the following error message:
 ```out
-<<<<<<< HEAD
-Error parsing input file. Please email us at solutionsfeedback@f5.com and include the following error:
-=======
 Error parsing input file. Please open an issue at https://github.com/f5devcentral/f5-automation-config-converter/issues and include the following error:
->>>>>>> main-github
 
 
 TypeError: Cannot read property 'length' of undefined

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,22 +7,21 @@ stages:
   - docs
   - build
   - publish
-  - container-scan
+  - container_scan
 
 variables:
   SEC_ALLOW_FAILURE: "true"
   SEC_NO_GIT_HISTORY: "true"
-  # Trivy container scanning prior to Gitlab v14
-  CS_MAJOR_VERSION: "4"
 
 include:
   - project: automation-toolchain/atg-shared-templates
-    file: security/base.gitlab-ci.yml
-    ref: v1.0.6
-  - template: Code-Quality.gitlab-ci.yml
-  - template: Container-Scanning.gitlab-ci.yml
-  - template: Dependency-Scanning.gitlab-ci.yml
-  - template: License-Scanning.gitlab-ci.yml
+    ref: v1.1.2
+    file:
+      - code_quality/base.gitlab-ci.yml
+      - compliance/base.gitlab-ci.yml
+      - security/base.gitlab-ci.yml
+      - security/container.gitlab-ci.yml
+      - test/base.gitlab-ci.yml
 
 # UPDATE #
 # only pipelines on 'develop' should check for new changes
@@ -43,55 +42,6 @@ update_autotool_deps:
       fi
   tags: [cm-official-docker-executor]
 
-# TEST #
-audit:
-  stage: test
-  needs: []
-  allow_failure: true
-  script:
-    - npm audit --production
-  tags: [cm-official-docker-executor]
-
-lint:
-  stage: test
-  needs: []
-  allow_failure: true
-  script:
-    - npm ci
-    - npm run lint
-  tags: [cm-official-docker-executor]
-
-coverage:
-  stage: test
-  needs: []
-  script:
-    - npm ci
-    - npm run coverage
-  artifacts:
-    when: always
-    paths: [coverage/]
-  tags: [cm-official-docker-executor]
-
-check_copyrights:
-  stage: test
-  needs: []
-  allow_failure: true
-  script:
-    - npm run copyright
-  tags: [cm-official-docker-executor]
-
-unit_test:
-  stage: test
-  needs: []
-  script:
-    - npm ci
-    - npm run test -- --reporter xunit --reporter-option output=unit_test.xml
-  artifacts:
-    when: always
-    reports:
-      junit: [unit_test.xml]
-  tags: [cm-official-docker-executor]
-
 # Coverage reports
 pages:
   stage: docs
@@ -114,9 +64,10 @@ build_docs:
   script:
     - cd docs
     - pip3 install -r requirements.txt
-    - if [ "$CI_COMMIT_REF_NAME" = "docs-staging" ] || [ "$CI_COMMIT_REF_NAME" = "docs-latest" ]; then
-    -   rm -r _templates
-    - fi
+    - >
+      if [ "$CI_COMMIT_REF_NAME" = "docs-staging" ] || [ "$CI_COMMIT_REF_NAME" = "docs-latest" ]; then
+        rm -r _templates
+      fi
     - npm ci
     - make html
     - make test
@@ -171,45 +122,3 @@ publish_docs:
     # create invalidation to clear cloudfront cache
     - aws cloudfront create-invalidation --distribution-id $AWS_DIST --paths /products/extensions/f5-automation-config-converter/latest
   tags: [cm-official-docker-executor]
-
-
-###   !!! DO NOT RENAME ANY OF THE FOLLOWING PIPELINE TASKS !!!   ###
-# They are directly overriding config for Gitlab-published pipeline templates.
-# https://gitlab.com/gitlab-org/gitlab/-/tree/master/lib/gitlab/ci/templates/
-
-nodejs-scan-sast:
-  needs: []
-  tags: [cm-official-docker-executor]
-  rules:
-    - when: always
-
-dependency_scanning:
-  stage: atg-shared-checks
-  needs: []
-  tags: [cm-official-docker-executor]
-
-license_scanning:
-  stage: atg-shared-checks
-  needs: []
-  tags: [cm-official-docker-executor]
-
-# https://gitlab.com/gitlab-org/gitlab/-/blob/v13.12.8-ee/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
-# This check requires a custom gitlab-runner for Docker-in-Docker
-# and setting a deep variable to bypass Dockerhub rate limits
-code_quality:
-  stage: atg-shared-checks
-  tags: [automation-toolchain-docker-executor]
-  variables:
-    CODECLIMATE_PREFIX: $ATG_IMG_REGISTRY_URL/
-
-# https://docs.gitlab.com/ee/user/application_security/container_scanning/
-# This scan needs to run after the docker image has been published to Artifactory.
-container_scanning_new:
-  stage: container-scan
-  needs: [publish_image]
-  tags: [cm-official-docker-executor]
-  variables:
-    DOCKER_IMAGE: $ATG_ARTIFACTORY_BASE_URL/$ATG_ARTIFACTORY_DOCKER_REPO/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    DOCKER_USER: $ATG_ARTIFACTORY_DOCKER_USER
-    DOCKER_PASSWORD: $ATG_ARTIFACTORY_DOCKER_TOKEN
-    GIT_STRATEGY: fetch
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,31 @@
 # Changelog
 Changes to this project are documented in this file.
 
+## 1.18.0
+
+## Added
+- CHARON-352: Add support for class: RouteDomain
+- CHARON-353: Add DO support for RouteMap
+- CHARON-354: Add DO support for RoutingAsPath
+- CHARON-355: Add DO support for RoutingBGP
+- CHARON-356: Add DO support for RoutingPrefixList
+- CHARON-565: Add DO support for RoutingAccessList
+- CHARON-341: Add DO support for FirewallPolicy
+- CHARON-363: Add DO support for SyslogRemoteServer
+- CHARON-350: Add DO support for RemoteAuthRole
+- CHARON-359: Add DO support for SnmpCommunity
+- CHARON-360: Add DO support for SnmpTrapDestination
+- CHARON-386: Add function to remove default DO values
+
+## Fixed
+- CHARON-544: Parser breakage with commented line contained { or } in iRule
+- CHARON-567: ([GitHub Issue 77](https://github.com/f5devcentral/f5-automation-config-converter/issues/77)): Error when -v option is used to filter output by virtual server name
+
+## Changed
+
+## Removed
+- CHARON-558: Remove revision history from docs
+
 ## 1.17.0
 
 ## Added

diff --git a/Documentation.md b/Documentation.md
diff --git a/FAQ.md b/FAQ.md
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2014-2021 F5 Networks Inc.
+   Copyright 2014-2022 F5 Networks Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@
 # F5 Automation Config Converter (ACC)
 
 <a href="https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/">
-    <!-- <img src=" ACC SVG " alt="F5 ACC" width="565"> -->
+    <img src="docs/_static/ACC_Robot.svg" alt="F5 ACC" width="200">
 </a>
 
 [Documentation](https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/userguide/getting_started.html) |
-[Installation](https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/userguide/Install.html) |
+[Installation](https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/userguide/install.html) |
 [Usage](https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/userguide/using_acc.html) |
 [Classes](https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/userguide/classes.html) |
 [FAQ](https://clouddocs.f5.com/products/extensions/f5-automation-config-converter/latest/userguide/faq.html) |
@@ -17,7 +17,7 @@
 [![image size](https://img.shields.io/docker/image-size/f5devcentral/f5-automation-config-converter?sort=semver)](https://hub.docker.com/r/f5devcentral/f5-automation-config-converter)
 [![version](https://img.shields.io/docker/v/f5devcentral/f5-automation-config-converter?sort=semver)](https://hub.docker.com/r/f5devcentral/f5-automation-config-converter)
 [![github issues](https://img.shields.io/github/issues-raw/f5devcentral/f5-automation-config-converter)](https://github.com/f5devcentral/f5-automation-config-converter/issues)
-[![license](https://img.shields.io/github/license/f5devcentral/f5-automation-config-converter)](https://github.com/f5devcentral/f5-automation-config-converter/blob/main/LICENSE)
+[![license](https://img.shields.io/badge/license-Apache--2.0-green)](https://github.com/f5devcentral/f5-automation-config-converter/blob/main/LICENSE)
 
 </div>
 

diff --git a/autotoolDeps/AS3/src/lib/adcParser.js b/autotoolDeps/AS3/src/lib/adcParser.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/adcParserComponents.js b/autotoolDeps/AS3/src/lib/adcParserComponents.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/adcParserFetch.js b/autotoolDeps/AS3/src/lib/adcParserFetch.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,8 +80,18 @@ function fetchValue(targetData, dataPath, parent, dest, destPpty, root, that, sc
     case 'reuseFrom': {
         const rv = {};
         try {
-            extractUtil.getAs3Object(targetData[morph], dataPath.concat('/', morph), parent, root,
-                true, rv, 'ptr', ((morph === 'copyFrom') ? 'string' : 'object'), rv, 'val');
+            extractUtil.getAs3Object(
+                targetData[morph],
+                dataPath.concat('/', morph),
+                parent,
+                root,
+                true,
+                rv,
+                'ptr',
+                ((morph === 'copyFrom') ? 'string' : 'object'),
+                rv,
+                'val'
+            );
             if (rv.ptr === '') {
                 return Promise.reject(new Error(`${targetData[morph]} points nowhere`));
             }

diff --git a/autotoolDeps/AS3/src/lib/adcParserFormats.js b/autotoolDeps/AS3/src/lib/adcParserFormats.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/adcParserKeywords.js b/autotoolDeps/AS3/src/lib/adcParserKeywords.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,8 +79,18 @@ const keywords = [
 
                     let tgt;
                     try {
-                        tgt = extractUtil.getAs3Object(data, dataPath, parentData, rootData,
-                            true, parentData, pptyName, '', null, '');
+                        tgt = extractUtil.getAs3Object(
+                            data,
+                            dataPath,
+                            parentData,
+                            rootData,
+                            true,
+                            parentData,
+                            pptyName,
+                            '',
+                            null,
+                            ''
+                        );
                     } catch (e) {
                         myerror.message = e.message;
                         f5pointsTo.errors.push(myerror);
@@ -655,8 +665,18 @@ const keywords = [
                     const rv = { now: mySchema.toString() };
                     if (Object.prototype.hasOwnProperty.call(mySchema, 'when') && (mySchema.when !== '')) {
                         try {
-                            extractUtil.getAs3Object(mySchema.when, dataPath, parentData, rootData,
-                                false, parentData, pptyName, 'string', rv, 'now');
+                            extractUtil.getAs3Object(
+                                mySchema.when,
+                                dataPath,
+                                parentData,
+                                rootData,
+                                false,
+                                parentData,
+                                pptyName,
+                                'string',
+                                rv,
+                                'now'
+                            );
                         } catch (e) {
                             myerror.message = `${mySchema.when} ${e.message}`;
                             f5expand.errors.push(myerror);

diff --git a/autotoolDeps/AS3/src/lib/adcParserSecrets.js b/autotoolDeps/AS3/src/lib/adcParserSecrets.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/config.js b/autotoolDeps/AS3/src/lib/config.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,6 +100,13 @@ class Settings {
             });
     }
 
+    static reloadSettings() {
+        if (storage) {
+            return storage.clearCache();
+        }
+        return Promise.resolve();
+    }
+
     /**
      * This method is exclusively for unit testing, so that we can supply our own storage values
      *

diff --git a/autotoolDeps/AS3/src/lib/constants.js b/autotoolDeps/AS3/src/lib/constants.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/log.js b/autotoolDeps/AS3/src/lib/log.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/postValidator.js b/autotoolDeps/AS3/src/lib/postValidator.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/properties.json b/autotoolDeps/AS3/src/lib/properties.json
@@ -28,7 +28,7 @@
   "ltm data-group external": [
     { "id":"description",               "altId": "remark", "quotedString": true },
     { "id":"type",                      "altId": "keyDataType" },
-    { "id":"source-path",               "altId": "externalFilePath" },
+    { "id":"source-path",               "altId": "externalFilePath", "quotedString": true },
     { "id":"external-file-name",        "altId": "dataGroupFile" }
   ],
   "ltm data-group internal": [

diff --git a/autotoolDeps/AS3/src/lib/tracer.js b/autotoolDeps/AS3/src/lib/tracer.js
@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/autotoolDeps/AS3/src/lib/util/authHeaderUtil.js b/autotoolDeps/AS3/src/lib/util/authHeaderUtil.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 F5 Networks, Inc.
+ * Copyright 2022 F5 Networks, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.