CCM-6405 Initial PR remediation

NHSDigital · Sep 10, 2024 · af0fa80 · af0fa80
1 parent d82a2fe
commit af0fa80
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 130 deletions.
diff --git a/.github/workflows/scheduled-repository-template-sync.yaml b/.github/workflows/scheduled-repository-template-sync.yaml
@@ -28,6 +28,7 @@ jobs:
     - name: Run syncronisation script
       run: |
         ./scripts/githooks/sync-template-repo.sh
+        rm -Rf ./nhs-notify-repository-template
 
     - name: Create Pull Request
       if: ${{ !env.ACT }}

diff --git a/nhs-notify-repository-template b/nhs-notify-repository-template
diff --git a/scripts/config/.repository-template-sync-ignore b/scripts/config/.repository-template-sync-ignore
@@ -2,6 +2,7 @@
 scripts/config/.repository-template-sync-ignore
 .github/workflows/
 nhs-notify-repository-template/
+*/examples/
 
 # Files and Folders in this repository to ignore
 .vscode/
@@ -13,6 +14,6 @@ VERSION
 # Files and Folders in the template repository to disregard
 .devcontainer/
 .github/workflows/cicd-*.yaml
-*/examples/
 docs/
 infrastructure/terraform/components/
+scripts/config/vale/styles/config/vocabularies/words/
diff --git a/scripts/config/vale/styles/config/vocabularies/words/accept.txt b/scripts/config/vale/styles/config/vocabularies/words/accept.txt
@@ -1,14 +1,14 @@
 [A-Z]+s
 Bitwarden
 bot
-Cognito
+config
 Cyber
 Dependabot
 draw.io
 drawio
-endcapture
 endfor
 endraw
+env
 GitHub
 Gitleaks
 Grype
@@ -19,8 +19,6 @@ Octokit
 onboarding
 Podman
 Python
-rawContent
-sed
 Syft
 Terraform
 toolchain

diff --git a/scripts/docker/examples/python/.tool-versions.example b/scripts/docker/examples/python/.tool-versions.example
diff --git a/scripts/docker/examples/python/Dockerfile b/scripts/docker/examples/python/Dockerfile
diff --git a/scripts/docker/examples/python/Dockerfile.effective b/scripts/docker/examples/python/Dockerfile.effective
diff --git a/scripts/docker/examples/python/VERSION b/scripts/docker/examples/python/VERSION
diff --git a/scripts/docker/examples/python/assets/hello_world/app.py b/scripts/docker/examples/python/assets/hello_world/app.py
diff --git a/scripts/docker/examples/python/assets/hello_world/requirements.txt b/scripts/docker/examples/python/assets/hello_world/requirements.txt
diff --git a/scripts/docker/examples/python/tests/goss.yaml b/scripts/docker/examples/python/tests/goss.yaml
diff --git a/scripts/terraform/terraform.mk b/scripts/terraform/terraform.mk
@@ -59,8 +59,6 @@ terraform-sec: # TFSEC check against Terraform files - optional: terraform_dir|d
 	tfsec infrastructure/terraform \
 		--force-all-dirs \
 		--exclude-downloaded-modules \
-		--tfvars-file infrastructure/terraform/etc/global.tfvars \
-		--tfvars-file infrastructure/terraform/etc/env_eu-west-2_main.tfvars \
 		--config-file scripts/config/tfsec.yml
 
 # ==============================================================================