undo last change

ministryofjustice · Sep 25, 2023 · dde5bdf · dde5bdf
1 parent e726143
commit dde5bdf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/reusable-workflow-terraform.yml b/.github/workflows/reusable-workflow-terraform.yml
@@ -1,8 +1,5 @@
 ---
 on: # yamllint disable-line rule:truthy
-  pull_request:
-    branches:
-      - main
   workflow_call:
     inputs:
       component:
@@ -38,14 +35,14 @@ jobs:
         id: checkout
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
 
-      # - name: Prepare Environment
-      #   id: prepare_environment
-      #   shell: bash
-      #   run: |
-      #     workingDirectory=$(yq -e ".${{ inputs.component }}" .github/path-filter/terraform.yml | sed 's/.\{3\}$//')
-      #     export workingDirectory
+      - name: Prepare Environment
+        id: prepare_environment
+        shell: bash
+        run: |
+          workingDirectory=$(yq -e ".${{ inputs.component }}" .github/path-filter/terraform.yml | sed 's/.\{3\}$//')
+          export workingDirectory
 
-      #     echo "working-directory=${workingDirectory}" >>"${GITHUB_ENV}"
+          echo "working-directory=${workingDirectory}" >>"${GITHUB_ENV}"
 
       - name: Checkov
         if: github.ref != 'refs/heads/main'
@@ -68,9 +65,8 @@ jobs:
           ignore-unfixed: true
           format: sarif
           exit-code: '1'
-          output: trivy-results.sarif
-          severity: CRITICAL,HIGH
-          skip-dirs: scripts/,containers/,devcontainer/
+          severity: HIGH
+          skip-dirs: containers/
 
       - name: Check for Static Analysis Override Label
         if: github.ref != 'refs/heads/main'

diff --git a/terraform/pagerduty/business-services.tf b/terraform/pagerduty/business-services.tf
@@ -54,3 +54,4 @@ module "business_services" {
     module.technical_services
   ]
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,3 +54,4 @@ module "business_services" {
		module.technical_services
		]
		}