Skip to content

Commit

Permalink
updated workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
douglas-f committed Sep 20, 2024
1 parent c1e4f6b commit d2baed1
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 44 deletions.
37 changes: 37 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Pull Request Checklist

> Take your time to read through these, don't just click through them. Only check the boxes if they apply.
## Admin
<!--- Ensure -->
- [ ] **Required:** I have read the [contributing guidelines](https://coalfire.atlassian.net/wiki/spaces/CEHOME/pages/2648440862/Pull+Request+Best+Practices) for submitting a PR.

## Types of changes
<!--- What types of changes does your code introduce? -->
- [ ] :bug: Bug fix (non-breaking change which fixes an issue)
- [ ] :sparkle: New feature (non-breaking change which adds functionality)
- [ ] :collision: Breaking change (fix or feature that would cause existing functionality to change)

## Testing

- [ ] **Required:** I have tested the proposed changes to code (i.e. `packer build`, `terraform apply`), and they are working.
- [ ] **Required:** All GitHub Actions ran successfully. If they didn't, I left a note in the description to address this.
- [ ] **Optional:** I have already applied/deployed the changes in my environment.

### Please check where this code has been tested

- [ ] Locally
- [ ] Customer Environment
- [ ] Coalfire Sandbox Environment (AWS GovCloud, Azure Gov, GCP, etc.)

## Documentation

- [ ] **Optional, recommended:** I have updated ***`README.md`***.
- [ ] **Optional, recommended:** I have updated documentation in ***Confluence/Organization's relevant Wiki***.
- [ ] **Optional, recommended:** I left comments ***in-line in the code*** to help others understand the changes.

## Tagging / Assigning

- [ ] **Required:** I have tagged a ***Reviewer(s)***.
- [ ] **Required:** I have tagged an ***Assignee(s)***.
- [ ] **Optional:** I have tagged relevant stakeholders in a ***Comment***.
15 changes: 8 additions & 7 deletions .github/workflows/org-checkov.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: Markdown Lint
name: Org Checkov
on:
pull_request:
paths:
- '**.tf'
branches:
- main
workflow_call:
push:
branches:
- '**'
pull_request:
branches:
- '**'
workflow_call:

jobs:
check-markdown:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/org-md-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
paths:
- '**.md'
branches:
- main
- '**'
workflow_call:

jobs:
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/org-terraform-fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,13 @@ name: Terraform fmt
on:
push:
branches:
- main
- '**'
pull_request:
branches:
- main
- '**'

jobs:
verify:
name: Check Terraform Formatting
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.5.0
- name: Run Terraform fmt
run: terraform fmt -check -recursive .
terraform-docs:
uses: Coalfire-CF/Actions/.github/workflows/org-terraform-fmt.yml@main
with:
terraform_version: '1.9.5'
30 changes: 8 additions & 22 deletions .github/workflows/org-terraform-validate.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,11 @@
name: Terraform Validate

name: Org Terraform Validate
on:
push:
branches:
- main
pull_request:
branches:
- main
pull_request:
types:
- opened

jobs:
verify:
name: Validate Terraform Configuration
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Setup Terraform
uses: hashicorp/setup-terraform@v1
with:
terraform_version: 1.5.0
- name: Initialise with no backend
run: terraform init -backend=false
- name: Validate the configuration
run: terraform validate
create-release:
uses: Coalfire-CF/Actions/.github/workflows/org-terraform-validate.yml@main
with:
terraform_version: '1.9.5'

0 comments on commit d2baed1

Please sign in to comment.