Testing Passing Promotion

.circleci/config.yml

@@ -1,3 +1,4 @@
+---
 version: 2
 jobs:
   build:
@@ -6,7 +7,7 @@ jobs:
         environment:
           PIPENV_VENV_IN_PROJECT: true
       - image: mockserver/mockserver
-        name: mockserver.mockserver
+        name: mockserver
     steps:
       - checkout # check out source code to working directory
       - run:
@@ -16,11 +17,18 @@ jobs:
       - run:
           command: |
             cp .circleci/mockserver.py user_variables.py
+            cp .circleci/mockserver.yaml user_variables.yaml
+            cp .circleci/mockserver.json user_variables.json
             pip install pipenv
             pipenv install --dev
       - run:
           command: |
-            pipenv run python -m unittest discover
+            COVERAGE_FILE=standard.coverage pipenv run coverage run -m unittest discover
+            COVERAGE_FILE=special1.coverage pipenv run coverage run -m unittest tests/special_test_settings_no_variables.py
+            pipenv run coverage combine *.coverage
+            pipenv run coverage html
+            mkdir test-results
+            tar -cf test-results/coverage_report.tar htmlcov/
       - store_test_results:
           path: test-results
       - store_artifacts:

.circleci/mockserver.json

@@ -0,0 +1,14 @@
+{
+  "FULL_SET": {
+    "mockserver1": {
+      "url": "mockserver.philly:1080",
+      "tenant": {
+        "tenant1": "mockenv"
+      },
+      "verify_ssl": false,
+      "is_managed": true,
+      "cluster_token": "cluster_token_here"
+    }
+  },
+  "LOG_LEVEL": "WARNING"
+}

.circleci/mockserver.py

@@ -3,18 +3,19 @@
     "mockserver1": {
         "url": "mockserver:1080",
         "tenant": {
-            "tenant1": "mockserver",
+            "tenant1": "mockenv",
         },
         "api_token": {
             "tenant1": "sample_api_token",
         },
         "verify_ssl": False,
-        "is_managed": False,
+        "is_managed": True,
         "cluster_token": "Required for Cluster Operations in Managed"
     }
 }
 
-LOG_LEVEL="INFO"
+LOG_OUTPUT = "FILE"
+LOG_LEVEL = "INFO"
 
 # ROLE TYPE KEYS
 # access_env

.circleci/mockserver.yaml

@@ -0,0 +1,37 @@
+---
+FULL_SET:
+  mockserver1:
+    url: mockserver:1080
+    tenant:
+      tenant1: mockenv
+    api_token:
+      tenant1: "sample_api_token"
+    verify_ssl: False
+    is_managed: True
+    cluster_token: "Required for Cluster Operations in Managed"
+
+
+LOG_ENABLED: True
+LOG_LEVEL: "DEBUG"
+LOG_OUTPUT: "FILE"
+
+# ROLE TYPE KEYS
+# access_env
+# change_settings
+# install_agent
+# view_logs
+# view_senstive
+# change_sensitive
+
+USER_GROUPS:
+  role_types:
+    access_env: accessenv
+    change_settings: changesettings
+    view_logs: logviewer
+    view_sensitive: viewsensitive
+  role_tenants:
+    - nonprod
+    - prod
+
+USER_GROUP_TEMPLATE: prefix_{USER_TYPE}_{TENANT}_{APP_NAME}_suffix
+DEFAULT_TIMEZONE: America/Chicago

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 omit =
     # omit anything in a .local directory anywhere
-    */.local/*
+    */lib/python*/*
     # omit everything in /usr
     /usr/*
     # omit in the test tools

.github/workflows/linter.yml

@@ -1,3 +1,4 @@
+---
 ###########################
 ###########################
 ## Linter GitHub Actions ##
@@ -40,12 +41,34 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v2
 
+      - run: mkdir -p super-linter.report
       ################################
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: docker://github/super-linter:v3
+        uses: github/super-linter@v3.11.0
         env:
-          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_ALL_CODEBASE: true
           DEFAULT_BRANCH: master
+          LINTER_RULES_PATH: .
+          PYTHON_PYLINT_CONFIG_FILE: .pylintrc
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LOG_FILE: super-linter.log
+          OUTPUT_FOLDER: super-linter.report
+          OUTPUT_FORMAT: tap
+          OUTPUT_DETAILS: detailed
+          VALIDATE_YAML: true
+          VALIDATE_JSON: true
+          VALIDATE_EDITORCONFIG: true
+          VALIDATE_MARKDOWN: true
+          VALIDATE_PYTHON_PYLINT: true
+      - run: ls
+      ########################
+      # Retreive tap reports #
+      ########################
+      - name: Archive super-linter tap reports
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: linter-report
+          path: super-linter.report

.gitignore

@@ -11,9 +11,12 @@ templates/*
 **venv**
 # Framework log files
 ***.log**
+***.tap**
+.converge
 
-user_variables.py
+user_variables.*
 sandbox_script.py
+htmlcov/*
 
 !variable_sets/template.py
 !scripts/template.py