Merge branch 'main' of github.com:advanced-security/policy-as-code

Author: GeekMasher

.github/workflows/main.yml

@@ -36,6 +36,20 @@ jobs:
         run: |
           pipenv run lint
 
+  e2e-tests:
+    runs-on: ubuntu-latest
+    needs: run 
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run action
+      uses: ./
+      with:
+        action: continue
+        policy: advanced-security/policy-as-code-testing
+        policy-path: policy.yml
+        token: "${{ secrets.POLICY_AS_CODE_TESTING_TOKEN }}"
+        argvs: --display --github-repository advanced-security/policy-as-code-testing --github-ref refs/heads/main
 
   action-test:
     runs-on: ubuntu-latest

Pipfile

@@ -5,7 +5,7 @@ verify_ssl = true
 
 [packages]
 pyyaml = "*"
-ghastoolkit = "==0.1.14"
+ghastoolkit = "==0.2.1"
 
 [dev-packages]
 sphinx = "*"
@@ -14,7 +14,11 @@ black = "*"
 
 [scripts]
 main = "python -m ghascompliance"
+# generate license files
+license-gen = "python vendor/ghastoolkit/supplychain/licensing.py -o ./ghascompliance/data/clearlydefined.json"
+# vendor the deps
+vendor = "./vendor/update.sh"
+# tests / linting
 test = "python -m unittest discover -s ./tests -p 'test_*.py'"
 fmt = "black ghascompliance tests"
 lint = "black --check ghascompliance tests"
-vendor = "./vendor/update.sh"

Pipfile.lock

@@ -1,5 +1,4 @@
 import os
-import json
 import argparse
 import logging
 
@@ -201,7 +200,7 @@
         Octokit.error("Unacceptable Threshold of Risk has been hit!")
         exit(1)
     elif arguments.action == "continue":
-        Octokit.debug("Skipping threshold break check...")
+        Octokit.info("Skipping threshold break check...")
     elif errors == 0:
         Octokit.info("Acceptable risk and no threshold reached.")
     else:

ghascompliance/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 
 __title__ = "GitHub Advanced Security Policy as Code"
 __name__ = "ghascompliance"
@@ -22,19 +22,17 @@
 __license__ = "MIT License"
 __copyright__ = "Copyright (c) 2023, GitHub"
 
-__banner__ = """\
+__banner__ = f"""\
  _____  _   _   ___   _____ _____                       _ _                      
 |  __ \| | | | / _ \ /  ___/  __ \                     | (_)                     
 | |  \/| |_| |/ /_\ \\\\ `--.| /  \/ ___  _ __ ___  _ __ | |_  __ _ _ __   ___ ___ 
 | | __ |  _  ||  _  | `--. \ |    / _ \| '_ ` _ \| '_ \| | |/ _` | '_ \ / __/ _ \\
 | |_\ \| | | || | | |/\__/ / \__/\ (_) | | | | | | |_) | | | (_| | | | | (_|  __/
  \____/\_| |_/\_| |_/\____/ \____/\___/|_| |_| |_| .__/|_|_|\__,_|_| |_|\___\___|
                                                  | |                             
-                                                 |_|         {}
-    {}
-""".format(
-    "v" + __version__, __description__
-)
+                                                 |_|         v{__version__}
+    {__description__} by {','.join(__contributors__)}
+"""
 
 __all__ = [
     "__author__",