Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: collab changes #2

Merged
merged 3 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
ref: ${{ github.event.pull_request.merge_commit_sha }}
fetch-depth: '0'

- uses: UKHSA-Internal/devops-github-actions/.github/actions/[email protected]
- uses: ukhsa-collaboration/devops-github-actions/.github/actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
2 changes: 1 addition & 1 deletion .github/workflows/_test-terraform-destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Test using devops-terraform-example-project@main
uses: ./.github/workflows/terraform-destroy.yml
with:
repo: UKHSA-Internal/devops-terraform-example-project
repo: ukhsa-collaboration/devops-terraform-example-project
ref: "main"
execute_terraform_plan: false
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_test-terraform-plan-apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Test using devops-terraform-example-project@main
uses: ./.github/workflows/terraform-plan-apply.yml
with:
repo: UKHSA-Internal/devops-terraform-example-project
repo: ukhsa-collaboration/devops-terraform-example-project
ref: "main"
execute_terraform_plan: true
permissions:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/terraform-code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
name: Lint and Scan Terraform code
runs-on: ${{ inputs.runner_label }}
container:
image: ghcr.io/ukhsa-internal/devops-terraform-ci:latest
image: ghcr.io/ukhsa-collaboration/devops-terraform-ci:latest
# Volume is workaround for https://github.com/actions/runner/issues/716
volumes:
- /home/runner/work/_actions/UKHSA-Internal/devops-github-actions/:/home/runner/work/_actions/UKHSA-Internal/devops-github-actions/
- /home/runner/work/_actions/ukhsa-collaboration/devops-github-actions/:/home/runner/work/_actions/ukhsa-collaboration/devops-github-actions/
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -56,7 +56,7 @@ jobs:
ssh-key: ${{ secrets.REPO_SSH_DEPLOY_KEY }}

- name: Create pending check
uses: UKHSA-Internal/devops-github-actions/.github/actions/github-status-check@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/github-status-check@v0.2.0
id: create_check
with:
name: "terraform-checks"
Expand All @@ -71,7 +71,7 @@ jobs:
| Checkov Scan | :hourglass_flowing_sand: Pending |

- name: Find Terraform version
uses: UKHSA-Internal/devops-github-actions/.github/actions/parse-terraform-version@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/parse-terraform-version@v0.2.0
id: terraform_version
with:
tf_file: "${{ inputs.stack_root_directory }}/terraform.tf"
Expand All @@ -92,14 +92,14 @@ jobs:
- name: Terraform Linting with tflint
id: tf_lint
continue-on-error: true
uses: UKHSA-Internal/devops-github-actions/.github/actions/terraform-tflint@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/terraform-tflint@v0.2.0
with:
tf_directory: ${{ inputs.stack_root_directory }}
scan_modules: ${{ inputs.tflint_module_scan }}

- name: SAST Scan Terraform code
id: tf_scan
uses: UKHSA-Internal/devops-github-actions/.github/actions/terraform-checkov-scan@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/terraform-checkov-scan@v0.2.0
with:
scan_directory: ${{ inputs.stack_root_directory }}
scan_type: "${{ inputs.checkov_deep_scan && 'deep' || 'light' }}"
Expand All @@ -126,7 +126,7 @@ jobs:
echo "tf_scan=$tf_scan" >> $GITHUB_ENV

- name: Update check with result
uses: UKHSA-Internal/devops-github-actions/.github/actions/github-status-check@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/github-status-check@v0.2.0
with:
name: "terraform-checks"
status: "completed"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraform-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:
done

- name: Find Terraform version
uses: UKHSA-Internal/devops-github-actions/.github/actions/parse-terraform-version@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/parse-terraform-version@v0.2.0
id: terraform_version
with:
tf_file: "${{ matrix.directory }}/terraform.tf"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraform-destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
ssh-key: ${{ secrets.REPO_SSH_DEPLOY_KEY }}
- name: Determine order to run Terraform stacks
uses: >-
UKHSA-Internal/devops-github-actions/.github/actions/terraform-dependency-sort@main
ukhsa-collaboration/devops-github-actions/.github/actions/terraform-dependency-sort@v0.2.0
id: directories
with:
reverse: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraform-plan-apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
ssh-key: ${{ secrets.REPO_SSH_DEPLOY_KEY }}
- name: Determine order to run Terraform stacks
uses: >-
UKHSA-Internal/devops-github-actions/.github/actions/terraform-dependency-sort@main
ukhsa-collaboration/devops-github-actions/.github/actions/terraform-dependency-sort@v0.2.0
id: directories

check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/terraform-post-deployment-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

- name: Deep SAST Scan Terraform code
id: tf_scan
uses: UKHSA-Internal/devops-github-actions/.github/actions/terraform-checkov-scan@main
uses: ukhsa-collaboration/devops-github-actions/.github/actions/terraform-checkov-scan@v0.2.0
with:
scan_directory: ${{ matrix.directory }}
scan_type: "deep"
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @UKHSA-Internal/devops-cloud-engineering-team
* @ukhsa-collaboration/devops-cloud-engineering-team
Loading