Skip to content

Commit 84b4ead

Browse files
author
Sohan Yadav
authored
Merge pull request #15 from clouddrove/0.15
add new example and fix terratest
2 parents 4a0adf4 + 38aa50f commit 84b4ead

File tree

24 files changed

+836
-499
lines changed

24 files changed

+836
-499
lines changed

‎.github/workflows/readme.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,32 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: 'Checkout'
13-
uses: actions/checkout@master
13+
uses: actions/checkout@v2.3.4
1414

15-
- name: Set up Python 3.7.
15+
- name: 'Set up Python 3.7'
1616
uses: actions/setup-python@v2
1717
with:
1818
python-version: '3.x'
1919

2020
- name: 'create readme'
21-
uses: 'clouddrove/github-actions@v4.0'
21+
uses: 'clouddrove/github-actions@v8.0'
2222
with:
2323
actions_subcommand: 'readme'
2424
github_token: '${{ secrets.GITHUB}}'
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
2727

2828

29-
- name: pre-commit check errors
29+
- name: 'pre-commit check errors'
3030
uses: pre-commit/action@v2.0.0
3131
continue-on-error: true
3232

33-
- name: pre-commit fix erros
33+
- name: 'pre-commit fix erros'
3434
uses: pre-commit/action@v2.0.0
3535
continue-on-error: true
3636

3737
- name: 'push readme'
38-
uses: 'clouddrove/github-actions@v4.0'
38+
uses: 'clouddrove/github-actions@v8.0'
3939
continue-on-error: true
4040
with:
4141
actions_subcommand: 'push'
@@ -51,4 +51,4 @@ jobs:
5151
env:
5252
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
5353
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
54-
if: always()
54+
if: always()

‎.github/workflows/terraform.yml‎

Lines changed: 94 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
uses: actions/checkout@master
1414

1515
- name: 'Terraform Format'
16-
uses: 'clouddrove/github-actions@v7.0'
16+
uses: 'clouddrove/github-actions@v8.0'
1717
with:
1818
actions_subcommand: 'fmt'
1919

20-
multi-node:
21-
name: 'multi-node'
20+
multi_node_non_vpc:
21+
name: 'multi_node_non_vpc'
2222
needs: fmt
2323
runs-on: ubuntu-latest
2424
steps:
@@ -33,26 +33,26 @@ jobs:
3333
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
3434
aws-region: us-east-2
3535

36-
- name: 'Terraform init multi-node'
37-
uses: 'clouddrove/github-actions@v7.0'
36+
- name: 'Terraform init multi_node_non_vpc'
37+
uses: 'clouddrove/github-actions@v8.0'
3838
with:
3939
actions_subcommand: 'init'
40-
tf_actions_working_dir: ./_example/multi-node
40+
tf_actions_working_dir: ./_example/multi_node_non_vpc
4141

42-
- name: 'Terraform validate multi-node'
43-
uses: 'clouddrove/github-actions@v7.0'
42+
- name: 'Terraform validate multi_node_non_vpc'
43+
uses: 'clouddrove/github-actions@v8.0'
4444
with:
4545
actions_subcommand: 'validate'
46-
tf_actions_working_dir: ./_example/multi-node
46+
tf_actions_working_dir: ./_example/multi_node_non_vpc
4747

48-
- name: 'Terraform plan multi-node'
49-
uses: 'clouddrove/github-actions@v7.0'
48+
- name: 'Terraform plan multi_node_non_vpc'
49+
uses: 'clouddrove/github-actions@v8.0'
5050
with:
5151
actions_subcommand: 'plan'
52-
tf_actions_working_dir: ./_example/multi-node
52+
tf_actions_working_dir: ./_example/multi_node_non_vpc
5353

54-
single-node:
55-
name: 'single-node'
54+
multi_node_vpc:
55+
name: 'multi_node_vpc'
5656
needs: fmt
5757
runs-on: ubuntu-latest
5858
steps:
@@ -66,30 +66,99 @@ jobs:
6666
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
6767
aws-region: us-east-2
6868

69-
- name: 'Terraform init single-node'
70-
uses: 'clouddrove/github-actions@v7.0'
69+
- name: 'Terraform init multi_node_vpc'
70+
uses: 'clouddrove/github-actions@v8.0'
7171
with:
7272
actions_subcommand: 'init'
73-
tf_actions_working_dir: ./_example/single-node
73+
tf_actions_working_dir: ./_example/multi_node_vpc
7474

75-
- name: 'Terraform validate single-node'
76-
uses: 'clouddrove/github-actions@v7.0'
75+
- name: 'Terraform validate multi_node_vpc'
76+
uses: 'clouddrove/github-actions@v8.0'
7777
with:
7878
actions_subcommand: 'validate'
79-
tf_actions_working_dir: ./_example/single-node
79+
tf_actions_working_dir: ./_example/multi_node_vpc
8080

81-
- name: 'Terraform plan single-node'
82-
uses: 'clouddrove/github-actions@v7.0'
81+
- name: 'Terraform plan multi_node_vpc'
82+
uses: 'clouddrove/github-actions@v8.0'
8383
with:
8484
actions_subcommand: 'plan'
85-
tf_actions_working_dir: ./_example/single-node
85+
tf_actions_working_dir: ./_example/multi_node_vpc
86+
87+
single_node_non_vpc:
88+
name: 'single_node_non_vpc'
89+
needs: fmt
90+
runs-on: ubuntu-latest
91+
steps:
92+
- name: 'Checkout'
93+
uses: actions/checkout@master
94+
95+
- name: 'Configure AWS Credentials'
96+
uses: clouddrove/configure-aws-credentials@v1
97+
with:
98+
aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
99+
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
100+
aws-region: us-east-2
101+
102+
- name: 'Terraform init for single_node_non_vpc'
103+
uses: 'clouddrove/github-actions@v8.0'
104+
with:
105+
actions_subcommand: 'init'
106+
tf_actions_working_dir: ./_example/single_node_non_vpc
107+
108+
- name: 'Terraform validate for single_node_non_vpc'
109+
uses: 'clouddrove/github-actions@v8.0'
110+
with:
111+
actions_subcommand: 'validate'
112+
tf_actions_working_dir: ./_example/single_node_non_vpc
113+
114+
- name: 'Terraform plan for single_node_non_vpc'
115+
uses: 'clouddrove/github-actions@v8.0'
116+
with:
117+
actions_subcommand: 'plan'
118+
tf_actions_working_dir: ./_example/single_node_non_vpc
119+
120+
single_node_vpc:
121+
name: 'single_node_non_vpc'
122+
needs: fmt
123+
runs-on: ubuntu-latest
124+
steps:
125+
- name: 'Checkout'
126+
uses: actions/checkout@master
127+
128+
- name: 'Configure AWS Credentials'
129+
uses: clouddrove/configure-aws-credentials@v1
130+
with:
131+
aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
132+
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
133+
aws-region: us-east-2
134+
135+
- name: 'Terraform init for single_node_vpc'
136+
uses: 'clouddrove/github-actions@v8.0'
137+
with:
138+
actions_subcommand: 'init'
139+
tf_actions_working_dir: ./_example/single_node_vpc
140+
141+
- name: 'Terraform validate for single_node_vpc'
142+
uses: 'clouddrove/github-actions@v8.0'
143+
with:
144+
actions_subcommand: 'validate'
145+
tf_actions_working_dir: ./_example/single_node_vpc
146+
147+
- name: 'Terraform plan for single_node_vpc'
148+
uses: 'clouddrove/github-actions@v8.0'
149+
with:
150+
actions_subcommand: 'plan'
151+
tf_actions_working_dir: ./_example/single_node_vpc
152+
86153

87154
pre-commit:
88155
name: 'Pre-Commit'
89156
needs:
90157
- fmt
91-
- multi-node
92-
- single-node
158+
- multi_node_non_vpc
159+
- multi_node_vpc
160+
- single_node_non_vpc
161+
- single_node_vpc
93162
runs-on: ubuntu-latest
94163
steps:
95164
- name: 'Checkout'

‎.github/workflows/terratest.yml‎

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,45 @@ jobs:
2121
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
2222
aws-region: us-east-2
2323

24-
- name: 'Terratest single'
24+
- name: 'Terratest for multi_node_non_vpc'
2525
if: ${{ github.event.label.name == 'terratest' }}
26-
uses: 'clouddrove/github-actions@v7.0'
26+
uses: 'clouddrove/github-actions@v8.0'
2727
with:
2828
actions_subcommand: 'terratest'
29-
tf_actions_working_dir: '_test/single-node'
29+
tf_actions_working_dir: '_test/multi_node_non_vpc'
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3232

33-
- name: 'Terratest multi'
33+
- name: 'Terratest for multi_node_vpc'
3434
if: ${{ github.event.label.name == 'terratest' }}
35-
uses: 'clouddrove/github-actions@v7.0'
35+
uses: 'clouddrove/github-actions@v8.0'
3636
with:
3737
actions_subcommand: 'terratest'
38-
tf_actions_working_dir: '_test/multi-node'
38+
tf_actions_working_dir: '_test/multi_node_vpc'
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4141

42+
43+
- name: 'Terratest for single_node_non_vpc'
44+
if: ${{ github.event.label.name == 'terratest' }}
45+
uses: 'clouddrove/github-actions@v8.0'
46+
with:
47+
actions_subcommand: 'terratest'
48+
tf_actions_working_dir: '_test/single_node_non_vpc'
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
52+
53+
- name: 'Terratest for single_node_vpc'
54+
if: ${{ github.event.label.name == 'terratest' }}
55+
uses: 'clouddrove/github-actions@v8.0'
56+
with:
57+
actions_subcommand: 'terratest'
58+
tf_actions_working_dir: '_test/single_node_vpc'
59+
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
62+
4263
- name: 'Slack Notification'
4364
uses: clouddrove/action-slack@v2
4465
with:

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
.terraform.tfstate.lock.info
88
go.sum
99
*.terrafrom.lock.hcl
10-
*.crash
10+
*.crash
11+
*.log
12+
/_example/multi_node_vpc/.terraform.lock.hcl
13+
/_example/multi_node_non_vpc/.terraform.lock.hcl

0 commit comments

Comments
 (0)