Fix final dynamic and Terraform CI portability issues

Author: Ibraheem Olasupo

Makefile

@@ -1,9 +1,9 @@
-.PHONY: help setup install format format-check lint type-check test test-coverage auth-test api-security-test terraform-fmt terraform-fmt-check terraform-init terraform-validate terraform-test infrastructure-test infrastructure-evidence verify-infrastructure-evidence infrastructure-report security-tools secrets-scan sast sast-semgrep sast-bandit semgrep-test sca dependency-audit sbom verify-sbom iac-scan checkov-scan container-build-security container-scan appsec-fast appsec-full appsec-evidence verify-appsec-evidence appsec-report dynamic-tools dynamic-server-start dynamic-server-wait dynamic-server-stop schemathesis-test api-schema-security-test zap-baseline zap-api-scan auth-boundary-test authorisation-boundary-test object-access-test input-mutation-test security-header-test cors-test resource-consumption-test audit-dynamic-test dast dynamic-evidence verify-dynamic-evidence dynamic-report dynamic-fast dynamic-full findings-normalise findings-deduplicate findings-enrich findings-validate findings-evidence verify-findings-evidence findings-report findings-full release-policy-validate release-gate-evaluate release-gate-enforce release-evidence verify-release-evidence release-report release-full lifecycle-policy-validate lifecycle-initialise lifecycle-validate lifecycle-expiry lifecycle-evidence verify-lifecycle-evidence lifecycle-report lifecycle-full evidence-source-validate evidence-aggregate evidence-generate verify-consolidated-evidence evidence-report evidence-full integration-policy-validate integration-export integration-validate verify-integration-evidence integration-report integration-full portfolio-evidence verify-portfolio-evidence portfolio-report portfolio-full final-validation security-assurance-full security-doctor developer-docs-validate developer-enablement-evidence verify-developer-enablement-evidence developer-enablement-report developer-enablement-full champions-policy-validate champions-metrics champions-evidence verify-champions-evidence champions-report champions-full pre-commit-install pre-commit-run quality run docker-build docker-run threat-model-validate threat-model-evidence verify-threat-model-evidence threat-model-report api-security-evidence verify-api-security-evidence api-security-report dev-token-researcher dev-token-approver dev-token-auditor clean
+.PHONY: help setup install format format-check lint type-check test test-coverage auth-test api-security-test terraform-fmt terraform-fmt-check terraform-init terraform-validate terraform-test infrastructure-test infrastructure-evidence verify-infrastructure-evidence infrastructure-report security-tools secrets-scan sast sast-semgrep sast-bandit semgrep-test sca dependency-audit sbom verify-sbom iac-scan checkov-scan container-build-security container-scan appsec-fast appsec-full appsec-evidence verify-appsec-evidence appsec-report dynamic-tools dynamic-server-start dynamic-server-wait dynamic-server-stop schemathesis-test api-schema-security-test zap-baseline zap-api-scan auth-boundary-test authorisation-boundary-test object-access-test input-mutation-test security-header-test cors-test resource-consumption-test audit-dynamic-test dast dynamic-evidence verify-dynamic-evidence dynamic-report dynamic-pytest dynamic-fast dynamic-full findings-normalise findings-deduplicate findings-enrich findings-validate findings-evidence verify-findings-evidence findings-report findings-full release-policy-validate release-gate-evaluate release-gate-enforce release-evidence verify-release-evidence release-report release-full lifecycle-policy-validate lifecycle-initialise lifecycle-validate lifecycle-expiry lifecycle-evidence verify-lifecycle-evidence lifecycle-report lifecycle-full evidence-source-validate evidence-aggregate evidence-generate verify-consolidated-evidence evidence-report evidence-full integration-policy-validate integration-export integration-validate verify-integration-evidence integration-report integration-full portfolio-evidence verify-portfolio-evidence portfolio-report portfolio-full final-validation security-assurance-full security-doctor developer-docs-validate developer-enablement-evidence verify-developer-enablement-evidence developer-enablement-report developer-enablement-full champions-policy-validate champions-metrics champions-evidence verify-champions-evidence champions-report champions-full pre-commit-install pre-commit-run quality run docker-build docker-run threat-model-validate threat-model-evidence verify-threat-model-evidence threat-model-report api-security-evidence verify-api-security-evidence api-security-report dev-token-researcher dev-token-approver dev-token-auditor clean
 
 PYTHON ?= python3
 VENV ?= .venv
 PIP := $(VENV)/bin/pip
-PYTEST := $(VENV)/bin/pytest
+PYTEST := $(PYTHON) -m pytest
 RUFF := $(VENV)/bin/ruff
 MYPY := $(VENV)/bin/mypy
 UVICORN := $(VENV)/bin/uvicorn
@@ -185,6 +185,8 @@ dynamic-report:
 dynamic-fast:
 	PYTHONPATH=src $(PYTHON) scripts/dynamic_security_tools.py pytest
 
+dynamic-pytest: dynamic-fast
+
 dynamic-full:
 	PYTHONPATH=src $(PYTHON) scripts/dynamic_security_tools.py full
 

outputs/portfolio/evidence-index.json

@@ -21,7 +21,7 @@
     },
     {
       "path": "outputs/security/appsec/evidence-manifest.json",
-      "sha256": "5fabe9b4f87bed5f27d33f3d0d1a352bf6b972a3eb5ae6e9f5656a7afcc810ba",
+      "sha256": "801db0c54efd0971a3eb050dbc82d983d806de6c79a302fd0b5c37634d334078",
       "size_bytes": 3564,
       "type": "evidence"
     },
@@ -33,25 +33,25 @@
     },
     {
       "path": "outputs/security/findings/evidence-manifest.json",
-      "sha256": "fdc17e894e9f4584c0e3aabcd46ba0847bda77258b7bf34ccd0c31b8b94a727a",
+      "sha256": "c5cd2be8e31435a508c80b9acf8d4a0452fd57af52d56ea0e18a47b04a6cb092",
       "size_bytes": 7093,
       "type": "evidence"
     },
     {
       "path": "outputs/security/release/evidence-manifest.json",
-      "sha256": "1f91e58f8f4858e4608b1e3be80d4e4fb63d0109d16c0e0f8ee0786256fbfaae",
+      "sha256": "feb2afaf95502bd8273ecd584376f66c5f23c56c366cb2210e94f7e66888d559",
       "size_bytes": 3296,
       "type": "evidence"
     },
     {
       "path": "outputs/security/lifecycle/evidence-manifest.json",
-      "sha256": "c03b0ae99cd224ef61ec5d3c12a31c680cb6fb3c5128e9eb30c697ae355092b9",
+      "sha256": "9b16246239c3d3683ae1672038dfef65b9a1f67ace6842cb613917f30b0c32d3",
       "size_bytes": 5829,
       "type": "evidence"
     },
     {
       "path": "outputs/security/evidence/evidence-manifest.json",
-      "sha256": "11faf87b2dc3c9167c149752548d51b4339217e59a5427e44ec5a204fd5b249d",
+      "sha256": "fab14c811a10c3b15487476f0636e59521e8e69f4b9c2dc1a8793dc3060128b3",
       "size_bytes": 6303,
       "type": "evidence"
     },
@@ -63,7 +63,7 @@
     },
     {
       "path": "outputs/security/integration/integration-manifest.json",
-      "sha256": "fe56e9a11461bd6ea2a1483e3b0e984c5af6852d5f2510b6206e0ebc8779fe6c",
+      "sha256": "f82307a0d75e0e5e5a8556a69ac76c0fe60ae74a3c6dabb587e2250b94f2b0b7",
       "size_bytes": 4620,
       "type": "evidence"
     }

outputs/portfolio/portfolio-manifest.json

@@ -14,7 +14,7 @@
   ],
   "git": {
     "branch": "main",
-    "commit": "c1af18199c2e",
+    "commit": "6ab1c20203dc",
     "dirty": "true"
   },
   "input_files": {
@@ -38,7 +38,7 @@
   "output_files": {
     "evidence-index.json": {
       "path": "outputs/security/portfolio/evidence-index.json",
-      "sha256": "baeaedb303a4fc1a5249f586ae79a8b8d568a0f7d9519315d2c1a32091a48813",
+      "sha256": "4a662938e85cccbc59991e270b3fb5190db6e43c39b7743d143faebe72776d87",
       "size_bytes": 2487
     },
     "milestone-completion.json": {
@@ -58,12 +58,12 @@
     },
     "portfolio-summary.json": {
       "path": "outputs/security/portfolio/portfolio-summary.json",
-      "sha256": "9608493fe01a2055e33f3b27d444223def8a56c9f5ac695aaea635f37f1047ff",
+      "sha256": "6314f2fbf723002fc1a2a4f67fa096ff86f655222a5119d3ad11d463ee2448f9",
       "size_bytes": 930
     },
     "report-index.json": {
       "path": "outputs/security/portfolio/report-index.json",
-      "sha256": "9974c2834c1bdc7fb5a02033e77adfc7ddc9e9d02f8b368ba64fdfead5c191c7",
+      "sha256": "71f9e37ec30baa17acecd09483cbf255af828c086e6d39d388a667abcabd3f50",
       "size_bytes": 3239
     },
     "security-capability-matrix.json": {
@@ -72,6 +72,6 @@
       "size_bytes": 7933
     }
   },
-  "portfolio_id": "PF-2d2dc093d22ce96b",
+  "portfolio_id": "PF-4a027c5dc900892c",
   "schema_version": "1.0"
 }

outputs/portfolio/portfolio-summary.json

@@ -6,7 +6,7 @@
   "deployment_status": "not_deployed",
   "evidence_sources": 11,
   "milestones_completed": 14,
-  "portfolio_id": "PF-2d2dc093d22ce96b",
+  "portfolio_id": "PF-4a027c5dc900892c",
   "portfolio_package": "outputs/portfolio",
   "project_name": "DevSecOps Application Security Pipeline",
   "readiness_limitations": [

outputs/portfolio/report-index.json

@@ -3,43 +3,43 @@
   "items": [
     {
       "path": "reports/portfolio/final-project-report.md",
-      "sha256": "d56313a8e333d6d0a9f2653f24034c9d0cefa14732e1dccf23959f28a1841a62",
+      "sha256": "daff94456391caf62db48c9ad7d787278e38b285411ce247699c67c3f5cebbc8",
       "size_bytes": 712,
       "type": "report"
     },
     {
       "path": "reports/portfolio/final-security-assurance-report.md",
-      "sha256": "e394e35a6f55a3e764c027f4499adc1b81348ffbf647e9926193453e7d428141",
+      "sha256": "fb454c93772494fd9f5d974fd41b83a9d1d3dcdd706d34f2db8e5f8f219e03dd",
       "size_bytes": 723,
       "type": "report"
     },
     {
       "path": "reports/portfolio/final-architecture-report.md",
-      "sha256": "c9ec071589b45192221c9fe0a43fb0ee52583a4b97d01896dffa211a8d7134d2",
+      "sha256": "7a6538fa2214451c89cfd9aaffa510ce4a399fee70864fdb86074c813f1ccb24",
       "size_bytes": 717,
       "type": "report"
     },
     {
       "path": "reports/portfolio/final-testing-report.md",
-      "sha256": "fc5151cd92b4109b23bc38b6225bc7388ecca5d0f87d4244f404780a6c9ff9d9",
+      "sha256": "cfa15a86355c6be9ce2bccc5d70dbba11c3a3b3fa185b10f2dc4ab79ceba6682",
       "size_bytes": 712,
       "type": "report"
     },
     {
       "path": "reports/portfolio/final-evidence-report.md",
-      "sha256": "61a1eef0fcf1e70da0e7600850d7000ae1a312cf4d4116711aa0ce6ea79bf698",
+      "sha256": "476390ed464b3f1a833418c5a12c542f19e8ef7383c8f140d6cfbb15661f2b16",
       "size_bytes": 713,
       "type": "report"
     },
     {
       "path": "reports/portfolio/final-limitations-report.md",
-      "sha256": "543e1670d7c60cf8e5fa77eb4ea19408d7c06e491568baaa5192dd600b3e4076",
+      "sha256": "b9e7a344e5a718450383389f7d3920d262199c30a7f24758242294520365932a",
       "size_bytes": 716,
       "type": "report"
     },
     {
       "path": "reports/portfolio/final-portfolio-readiness-report.md",
-      "sha256": "4f927d1f3350172f9236fa221349522b18902605f9d9e7c0066b562d0ecc6856",
+      "sha256": "3f68d4d1d8b865aa44174423f8c5f5dc8f6b7d2804cf1a1e711c485b94695485",
       "size_bytes": 724,
       "type": "report"
     },
@@ -51,13 +51,13 @@
     },
     {
       "path": "reports/security/security-evidence-report.md",
-      "sha256": "e2171c9ce62a64036e3a7e9998015cdb3b49f72a79700b97e6f843a7c8cf571c",
+      "sha256": "9a15e0bbb83f362486be83b77f00c28d384e74e4152a974d5d18a2f292eed741",
       "size_bytes": 260,
       "type": "report"
     },
     {
       "path": "reports/security/portfolio-assurance-report.md",
-      "sha256": "ab326a3803bd5e68d7e3eb948da35e47956620e0f1423f20c1652e7000724021",
+      "sha256": "2f647c733f8fd6f58ec14a1cba607f4a8b7f81dc08e7f38aa688489368e03d2c",
       "size_bytes": 178,
       "type": "report"
     },
@@ -75,7 +75,7 @@
     },
     {
       "path": "reports/security/release-gate-report.md",
-      "sha256": "733dd79b5a5e98d7a0b5154e6e96d1427d980b664961aaab7168105b9ccbf95e",
+      "sha256": "7e5c61a63f78f493bc713a4e08bffac2c06b1f834c7c55a2e1b6a06cc48a54e6",
       "size_bytes": 8502,
       "type": "report"
     },
@@ -87,8 +87,8 @@
     },
     {
       "path": "reports/security/dynamic-security-report.md",
-      "sha256": "d7c03916fb00da13ff174b13a847802c5203a52bfb9e0ea4964b99f8cb2c135b",
-      "size_bytes": 154,
+      "sha256": "d7de6b7af43332066a07b9b0764ee735d407c8802aa2f2026ac1017325a1de72",
+      "size_bytes": 372,
       "type": "report"
     }
   ],

outputs/portfolio/reports/final-architecture-report.md

@@ -1,6 +1,6 @@
 # Final Architecture Report
 
-Portfolio ID: `PF-2d2dc093d22ce96b`
+Portfolio ID: `PF-4a027c5dc900892c`
 
 Readiness status: `ready_with_limitations`
 

outputs/portfolio/reports/final-evidence-report.md

@@ -1,6 +1,6 @@
 # Final Evidence Report
 
-Portfolio ID: `PF-2d2dc093d22ce96b`
+Portfolio ID: `PF-4a027c5dc900892c`
 
 Readiness status: `ready_with_limitations`
 

outputs/portfolio/reports/final-project-report.md

@@ -1,6 +1,6 @@
 # Final Project Report
 
-Portfolio ID: `PF-2d2dc093d22ce96b`
+Portfolio ID: `PF-4a027c5dc900892c`
 
 Readiness status: `ready_with_limitations`
 

outputs/portfolio/reports/final-security-assurance-report.md

@@ -1,6 +1,6 @@
 # Final Security Assurance Report
 
-Portfolio ID: `PF-2d2dc093d22ce96b`
+Portfolio ID: `PF-4a027c5dc900892c`
 
 Readiness status: `ready_with_limitations`
 

outputs/portfolio/reports/final-testing-report.md

@@ -1,6 +1,6 @@
 # Final Testing Report
 
-Portfolio ID: `PF-2d2dc093d22ce96b`
+Portfolio ID: `PF-4a027c5dc900892c`
 
 Readiness status: `ready_with_limitations`