Skip to content

Commit 68cbc68

Browse files
author
Nikita Dugar
authored
Merge pull request #11 from clouddrove/CD-249
upgrade to terraform 0.13
2 parents 8a81fd5 + 24392b7 commit 68cbc68

File tree

9 files changed

+171
-52
lines changed

9 files changed

+171
-52
lines changed

‎.github/workflows/readme.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: 'Create README.md file'
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
readme-create:
8+
name: 'readme-create'
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: 'Checkout'
12+
uses: actions/checkout@master
13+
- name: Set up Python 3.7.
14+
uses: actions/setup-python@v2
15+
with:
16+
python-version: '3.x'
17+
- name: 'create readme'
18+
uses: 'clouddrove/github-actions@v4.0'
19+
with:
20+
actions_subcommand: 'readme'
21+
github_token: '${{ secrets.GITHUB}}'
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
24+
- name: pre-commit check errors
25+
uses: pre-commit/action@v2.0.0
26+
continue-on-error: true
27+
- name: pre-commit fix erros
28+
uses: pre-commit/action@v2.0.0
29+
continue-on-error: true
30+
- name: 'push readme'
31+
uses: 'clouddrove/github-actions@v4.0'
32+
continue-on-error: true
33+
with:
34+
actions_subcommand: 'push'
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
37+
- name: 'Slack Notification'
38+
uses: clouddrove/action-slack@v2
39+
with:
40+
status: ${{ job.status }}
41+
fields: repo,author
42+
author_name: 'CloudDrove'
43+
env:
44+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
45+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
46+
if: always()

‎.github/workflows/terraform.yml‎

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,70 @@
11
name: 'Terraform GitHub Actions'
22
on:
3-
- pull_request
4-
3+
pull_request:
4+
branches:
5+
- master
56
jobs:
67
terraform:
78
name: 'Terraform'
89
runs-on: ubuntu-latest
910
steps:
10-
1111
- name: 'Checkout'
1212
uses: actions/checkout@master
13-
13+
- name: Configure AWS Credentials
14+
uses: clouddrove/configure-aws-credentials@v1
15+
with:
16+
aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
17+
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
18+
aws-region: us-east-2
1419
- name: 'Terraform Format'
15-
uses: clouddrove/github-actions@v2.0
20+
uses: 'clouddrove/github-actions@v4.0'
1621
with:
1722
actions_subcommand: 'fmt'
18-
19-
- name: 'Terraform Init For Generate-certificate-dns'
20-
uses: clouddrove/github-actions@v2.0
23+
- name: 'Terraform init for generate certicate dns'
24+
uses: 'clouddrove/github-actions@v4.0'
2125
with:
2226
actions_subcommand: 'init'
2327
tf_actions_working_dir: ./_example/generate-certificate-dns
24-
25-
- name: 'Terraform Init For Generate-certificate-email'
26-
uses: clouddrove/github-actions@v2.0
27-
with:
28-
actions_subcommand: 'init'
29-
tf_actions_working_dir: ./_example/generate-certificate-email
30-
31-
- name: Configure AWS Credentials
32-
uses: clouddrove/configure-aws-credentials@v1
28+
- name: 'Terraform validate for generate certicate dns'
29+
uses: 'clouddrove/github-actions@v4.0'
3330
with:
34-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
35-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
36-
aws-region: us-east-2
37-
38-
- name: 'Terraform Plan For Generate-certificate-dns'
39-
uses: clouddrove/github-actions@v2.0
31+
actions_subcommand: 'validate'
32+
tf_actions_working_dir: ./_example/generate-certificate-dns
33+
- name: 'Terraform plan for generate certicate dns'
34+
uses: 'clouddrove/github-actions@v4.0'
4035
with:
4136
actions_subcommand: 'plan'
4237
tf_actions_working_dir: ./_example/generate-certificate-dns
43-
env:
44-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4538

46-
- name: 'Terraform Plan For Generate-certificate-email'
47-
uses: clouddrove/github-actions@v2.0
39+
- name: 'Terraform init for generate certicate email'
40+
uses: 'clouddrove/github-actions@v4.0'
4841
with:
49-
actions_subcommand: 'plan'
42+
actions_subcommand: 'init'
5043
tf_actions_working_dir: ./_example/generate-certificate-email
51-
env:
52-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53-
54-
- name: 'Terratest for Generate-certificate-dns'
55-
uses: clouddrove/github-actions@v2.0
44+
- name: 'Terraform validate for generate certicate email'
45+
uses: 'clouddrove/github-actions@v4.0'
46+
with:
47+
actions_subcommand: 'validate'
48+
tf_actions_working_dir: ./_example/generate-certificate-email
49+
- name: 'Terraform plan for generate certicate email'
50+
uses: 'clouddrove/github-actions@v4.0'
5651
with:
57-
actions_subcommand: 'terratest'
58-
tf_actions_working_dir: ./_test/generate-certificate-dns
52+
actions_subcommand: 'plan'
53+
tf_actions_working_dir: ./_example/generate-certificate-email
5954

60-
- name: 'Terratest for Generate-certificate-email'
61-
uses: clouddrove/github-actions@v2.0
55+
- name: 'Terraform init for import certicate'
56+
uses: 'clouddrove/github-actions@v4.0'
6257
with:
63-
actions_subcommand: 'terratest'
64-
tf_actions_working_dir: ./_test/generate-certificate-email
65-
env:
66-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
actions_subcommand: 'init'
59+
tf_actions_working_dir: ./_example/import-certificate
6760

6861
- name: 'Slack Notification'
6962
uses: clouddrove/action-slack@v2
7063
with:
7164
status: ${{ job.status }}
7265
fields: repo,author
73-
author_name: 'Clouddrove'
66+
author_name: 'CloudDrove'
7467
env:
7568
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
76-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} # required
69+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
7770
if: always()

‎.github/workflows/terratest.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: 'Terratest GitHub Actions'
2+
on:
3+
pull_request:
4+
branches:
5+
- master
6+
types: [labeled]
7+
jobs:
8+
terraform:
9+
name: 'Terraform'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: 'Checkout'
13+
uses: actions/checkout@master
14+
- name: Configure AWS Credentials
15+
uses: clouddrove/configure-aws-credentials@v1
16+
with:
17+
aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
18+
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
19+
aws-region: us-east-2
20+
- name: 'Terratest'
21+
if: ${{ github.event.label.name == 'terratest' }}
22+
uses: 'clouddrove/github-actions@v4.0'
23+
with:
24+
actions_subcommand: 'terratest for generate certificate dns'
25+
tf_actions_working_dir: _test/generate-certificate-dns
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
29+
- name: 'Terratest'
30+
if: ${{ github.event.label.name == 'terratest' }}
31+
uses: 'clouddrove/github-actions@v4.0'
32+
with:
33+
actions_subcommand: 'terratest for generate certificate email'
34+
tf_actions_working_dir: _test/generate-certificate-email
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- name: 'Slack Notification'
39+
uses: clouddrove/action-slack@v2
40+
with:
41+
status: ${{ job.status }}
42+
fields: repo,author
43+
author_name: 'CloudDrove'
44+
env:
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
46+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
47+
if: always()

‎README.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-acm
1616
# Badges to display
1717
badges:
1818
- name: "Terraform"
19-
image: "https://img.shields.io/badge/Terraform-v0.12-green"
19+
image: "https://img.shields.io/badge/Terraform-v0.13-green"
2020
url: "https://www.terraform.io"
2121
- name: "Licence"
2222
image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -36,7 +36,8 @@ usage : |-
3636
### ACM with DNS
3737
```hcl
3838
module "acm" {
39-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.5"
39+
source = "clouddrove/acm/aws"
40+
version = "0.13.0"
4041
name = "certificate"
4142
application = "clouddrove"
4243
environment = "test"
@@ -51,7 +52,8 @@ usage : |-
5152
### ACM with Email
5253
```hcl
5354
module "acm" {
54-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
55+
source = "clouddrove/acm/aws"
56+
version = "0.13.0"
5557
name = "certificate"
5658
application = "clouddrove"
5759
environment = "test"
@@ -66,7 +68,8 @@ usage : |-
6668
### ACM with Import Certificate
6769
```hcl
6870
module "acm" {
69-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
71+
source = "clouddrove/acm/aws"
72+
version = "0.13.0"
7073
name = "certificate"
7174
application = "clouddrove"
7275
environment = "test"

‎_test/generate-certificate-dns/go.mod‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module github.com/clouddrove/terraform-aws-acm/_example/generate-certificate-dns
2+
3+
go 1.13
4+
5+
require (
6+
github.com/gruntwork-io/terratest v0.30.6
7+
github.com/stretchr/testify v1.6.1
8+
)

‎_test/generate-certificate-email/go.mod‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module github.com/clouddrove/terraform-aws-acm/_example/generate-certificate-email
2+
3+
go 1.13
4+
5+
require (
6+
github.com/gruntwork-io/terratest v0.30.6
7+
github.com/stretchr/testify v1.6.1
8+
)

‎_test/import-certificate/go.mod‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module github.com/clouddrove/terraform-aws-ecr/_example/import-certificate
2+
3+
go 1.13
4+
5+
require (
6+
github.com/gruntwork-io/terratest v0.30.6
7+
github.com/stretchr/testify v1.6.1
8+
)

‎main.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# for resources. You can use terraform-labels to implement a strict naming
88
# convention.
99
module "labels" {
10-
source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.12.0"
10+
source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.13.0"
1111

1212
name = var.name
1313
application = var.application
@@ -67,9 +67,9 @@ resource "aws_route53_record" "default" {
6767
zone_id = join("", data.aws_route53_zone.default.*.zone_id)
6868
ttl = var.ttl
6969
allow_overwrite = true
70-
name = join("",aws_acm_certificate.cert[0].domain_validation_options.*.resource_record_name)
71-
type = join("",aws_acm_certificate.cert[0].domain_validation_options.*.resource_record_type)
72-
records = [join("",aws_acm_certificate.cert[0].domain_validation_options.*.resource_record_value)]
70+
name = join("", aws_acm_certificate.cert[0].domain_validation_options.*.resource_record_name)
71+
type = join("", aws_acm_certificate.cert[0].domain_validation_options.*.resource_record_type)
72+
records = [join("", aws_acm_certificate.cert[0].domain_validation_options.*.resource_record_value)]
7373
}
7474

7575
# Module : ACM CERTIFICATE VALIDATION

‎versions.tf‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
# Terraform version
22
terraform {
3-
required_version = ">= 0.12"
3+
required_version = ">= 0.13"
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = "3.10.0"
8+
}
9+
}
410
}

0 commit comments

Comments
 (0)