Skip to content

Commit 06e28f8

Browse files
yadavprakashyadavprakash
authored
Merge pull request #5 from clouddrove/1.0.1
github-action update & 1.0.1
2 parents 988b4db + 2ef2c4a commit 06e28f8

File tree

7 files changed

+294
-104
lines changed

7 files changed

+294
-104
lines changed

Diff for: ‎.github/workflows/readme.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
python-version: '3.x'
1919

2020
- name: 'create readme'
21-
uses: 'clouddrove/[email protected]'
21+
uses: 'clouddrove/[email protected].1'
2222
with:
2323
actions_subcommand: 'readme'
2424
github_token: '${{ secrets.GITHUB }}'
@@ -35,7 +35,7 @@ jobs:
3535
continue-on-error: true
3636

3737
- name: 'push readme'
38-
uses: 'clouddrove/[email protected]'
38+
uses: 'clouddrove/[email protected].1'
3939
continue-on-error: true
4040
with:
4141
actions_subcommand: 'push'

Diff for: ‎.github/workflows/terraform.yml

+55-76
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,46 @@
1-
name: 'Terraform GitHub Actions'
1+
name: static-checks
2+
23
on:
34
pull_request:
4-
branches:
5-
- master
65

76
jobs:
8-
fmt:
9-
name: 'terraform fmt'
7+
versionExtract:
8+
name: Get min/max versions
109
runs-on: ubuntu-latest
11-
steps:
12-
- name: 'Checkout'
13-
uses: actions/[email protected]
14-
15-
- name: 'Terraform Format'
16-
uses: 'clouddrove/[email protected]'
17-
with:
18-
actions_subcommand: 'fmt'
19-
- name: 'Terraform Format'
20-
uses: 'clouddrove/[email protected]'
21-
with:
22-
actions_subcommand: 'fmt'
2310

24-
validate:
25-
name: 'terraform validate'
26-
runs-on: ubuntu-latest
2711
steps:
28-
- name: 'Checkout'
29-
uses: actions/checkout@v2.3.4
12+
- name: Checkout
13+
uses: actions/checkout@v2
3014

31-
- name: 'Configure AWS Credentials'
32-
uses: clouddrove/configure-aws-credentials@v1
33-
with:
34-
aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
35-
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
36-
aws-region: us-east-2
15+
- name: Terraform min/max versions
16+
id: minMax
17+
uses: clowdhaus/terraform-min-max@main
18+
outputs:
19+
minVersion: ${{ steps.minMax.outputs.minVersion }}
20+
maxVersion: ${{ steps.minMax.outputs.maxVersion }}
3721

38-
- name: 'Terraform init'
39-
uses: 'clouddrove/[email protected]'
40-
with:
41-
actions_subcommand: 'init'
42-
tf_actions_working_dir: ./_example
43-
44-
- name: 'Terraform validate'
45-
uses: 'clouddrove/[email protected]'
46-
with:
47-
actions_subcommand: 'validate'
48-
tf_actions_working_dir: ./_example
4922

50-
plan:
51-
name: 'terraform plan'
23+
versionEvaluate:
24+
name: Evaluate Terraform versions
5225
runs-on: ubuntu-latest
26+
needs: versionExtract
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
version:
31+
- ${{ needs.versionExtract.outputs.minVersion }}
32+
- ${{ needs.versionExtract.outputs.maxVersion }}
33+
directory:
34+
- _example/
35+
5336
steps:
54-
- name: 'Checkout'
55-
uses: actions/checkout@v2.3.4
37+
- name: Checkout
38+
uses: actions/checkout@v2
5639

57-
- name: 'Terraform init'
58-
uses: 'clouddrove/[email protected]'
40+
- name: Install Terraform v${{ matrix.version }}
41+
uses: hashicorp/setup-terraform@v1
5942
with:
60-
actions_subcommand: 'init'
61-
tf_actions_working_dir: ./_example
43+
terraform_version: ${{ matrix.version }}
6244

6345
- name: 'Configure AWS Credentials'
6446
uses: clouddrove/configure-aws-credentials@v1
@@ -67,38 +49,35 @@ jobs:
6749
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
6850
aws-region: us-east-2
6951

70-
- name: 'Terraform plan'
71-
uses: 'clouddrove/[email protected]'
52+
- name: Init & validate v${{ matrix.version }}
53+
run: |
54+
cd ${{ matrix.directory }}
55+
terraform init
56+
terraform validate
57+
58+
59+
- name: tflint
60+
uses: reviewdog/action-tflint@master
7261
with:
73-
actions_subcommand: 'plan'
74-
tf_actions_working_dir: ./_example
62+
github_token: ${{ secrets.GITHUB }}
63+
working_directory: ${{ matrix.directory }}
64+
fail_on_error: 'true'
65+
filter_mode: 'nofilter'
66+
flags: '--module'
7567

76-
pre-commit:
77-
name: 'Pre-Commit'
78-
needs:
79-
- fmt
80-
- plan
81-
- validate
68+
format:
69+
name: Check code format
8270
runs-on: ubuntu-latest
83-
steps:
84-
- name: 'Checkout'
85-
uses: actions/[email protected]
86-
87-
- name: 'Install Tflint'
88-
run: |
89-
curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
71+
needs: versionExtract
9072

91-
- name: 'Pre-Commit 🔎'
92-
uses: pre-commit/[email protected]
93-
continue-on-error: true
73+
steps:
74+
- name: Checkout
75+
uses: actions/checkout@v2
9476

95-
- name: 'Slack Notification'
96-
uses: clouddrove/action-slack@v2
77+
- name: Install Terraform v${{ needs.versionExtract.outputs.maxVersion }}
78+
uses: hashicorp/setup-terraform@v1
9779
with:
98-
status: ${{ job.status }}
99-
fields: repo,author
100-
author_name: 'CloudDrove'
101-
env:
102-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
103-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
104-
if: always()
80+
terraform_version: ${{ needs.versionExtract.outputs.maxVersion }}
81+
82+
- name: Check Terraform format changes
83+
run: terraform fmt --recursive

Diff for: ‎.github/workflows/terratest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
aws-region: us-east-2
2020
- name: 'Terratest'
2121
if: ${{ github.event.label.name == 'terratest' }}
22-
uses: 'clouddrove/[email protected]'
22+
uses: 'clouddrove/[email protected].1'
2323
with:
2424
actions_subcommand: 'terratest'
2525
tf_actions_working_dir: ./_test

Diff for: ‎.github/workflows/tfsec.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: tfsec
2+
on:
3+
pull_request:
4+
5+
jobs:
6+
tfsec:
7+
name: tfsec sarif report
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Clone repo
12+
uses: actions/checkout@master
13+
14+
- name: tfsec
15+
uses: aquasecurity/[email protected]
16+
with:
17+
sarif_file: tfsec.sarif
18+
working_directory: _example
19+
full_repo_scan: true
20+
21+
- name: Upload SARIF file
22+
uses: github/codeql-action/upload-sarif@v1
23+
with:
24+
# Path to SARIF file relative to the root of the repository
25+
sarif_file: tfsec.sarif

0 commit comments

Comments
 (0)