Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Dec 17, 2024
1 parent 3b9caa5 commit 1967b76
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ecs_deployment_apply.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
inputs:
workspace:
description: 'The workspace to terraform against'
description: "The workspace to terraform against"
required: true
type: choice
options:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
UMLS_API_KEY: ${{ secrets.UMLS_API_KEY }}
ERSD_API_KEY: ${{ secrets.ERSD_API_KEY}}
TLS_CERT: ${{ secrets.TLS_CERT}}
TLS_KEY: ${{ secrets.TLS_KEY}}
TLS_KEY: ${{ secrets.TLS_KEY}}
shell: bash
run: |
echo "owner = \"$OWNER\"" >> $WORKSPACE.tfvars
Expand All @@ -82,4 +82,3 @@ jobs:
-var "ersd_api_key=${ERSD_API_KEY}" \
-var "qc_tls_key=${TLS_KEY}" \
-var "qc_tls_cert"=${TLS_CERT}" \
11 changes: 3 additions & 8 deletions .github/workflows/ecs_deployment_plan.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@


name: Terraform Plan
run-name: Terraform plan ${{ inputs.workspace }} by @${{ github.actor }}

on:
workflow_dispatch:
inputs:
workspace:
description: 'The workspace to terraform against'
description: "The workspace to terraform against"
required: true
type: choice
options:
Expand Down Expand Up @@ -64,8 +62,8 @@ jobs:
WORKSPACE: ${{ env.workspace }}
UMLS_API_KEY: ${{ secrets.UMLS_API_KEY }}
ERSD_API_KEY: ${{ secrets.ERSD_API_KEY}}
TLS_CERT : ${{ secrets.TLS_CERT}}
TLS_KEY : ${{ secrets.TLS_KEY}}
TLS_CERT: ${{ secrets.TLS_CERT}}
TLS_KEY: ${{ secrets.TLS_KEY}}
shell: bash
run: |
echo "owner = \"$OWNER\"" >> $WORKSPACE.tfvars
Expand All @@ -84,6 +82,3 @@ jobs:
-var "ersd_api_key=${ERSD_API_KEY}" \
-var "qc_tls_key=${TLS_KEY}" \
-var "qc_tls_cert"=${TLS_CERT}" \
14 changes: 10 additions & 4 deletions .github/workflows/tflint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ jobs:

strategy:
matrix:
dirs: [terraform/modules/oidc, terraform/modules/tfstate, terraform/implementation/setup, terraform/implementation/ecs]
dirs:
[
terraform/modules/oidc,
terraform/modules/tfstate,
terraform/implementation/setup,
terraform/implementation/ecs,
]

steps:
- uses: actions/checkout@v4
Expand All @@ -39,9 +45,9 @@ jobs:
run: tflint --init
# If rate limiting becomes an issue, setup a GitHub token and enable it as an environment variable
# env:
# https://github.com/terraform-linters/tflint/blob/master/docs/user-guide/plugins.md#avoiding-rate-limiting
# GITHUB_TOKEN: ${{ github.token }}
# https://github.com/terraform-linters/tflint/blob/master/docs/user-guide/plugins.md#avoiding-rate-limiting
# GITHUB_TOKEN: ${{ github.token }}

- name: Run TFLint
working-directory: ${{ github.workspace }}/${{matrix.dirs}}
run: tflint -f compact
run: tflint -f compact
15 changes: 7 additions & 8 deletions .github/workflows/trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Trivy Security Scan
on:
pull_request:
push:
branches:
branches:
- main

concurrency:
Expand All @@ -19,14 +19,13 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4


- name: Run Trivy vulnerability scanner
uses: aquasecurity/[email protected]
with:
scan-type: 'fs'
scan-ref: 'terraform/modules/'
scanners: 'vuln,secret,config'
scan-type: "fs"
scan-ref: "terraform/modules/"
scanners: "vuln,secret,config"
ignore-unfixed: false
exit-code: '1'
format: 'table'
severity: 'CRITICAL,HIGH'
exit-code: "1"
format: "table"
severity: "CRITICAL,HIGH"

0 comments on commit 1967b76

Please sign in to comment.