Skip to content

Commit bd8aa82

Browse files
author
Sohan
committed
upgrade to 0.14
1 parent 47cb53d commit bd8aa82

File tree

25 files changed

+124
-135
lines changed

25 files changed

+124
-135
lines changed

‎.github/workflows/readme.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,44 @@ on:
33
push:
44
branches:
55
- master
6+
67
jobs:
78
readme-create:
89
name: 'readme-create'
910
runs-on: ubuntu-latest
1011
steps:
1112
- name: 'Checkout'
12-
uses: actions/checkout@master
13+
uses: actions/checkout@v2.3.4
14+
1315
- name: Set up Python 3.7.
1416
uses: actions/setup-python@v2
1517
with:
1618
python-version: '3.x'
19+
1720
- name: 'create readme'
18-
uses: 'clouddrove/github-actions@v4.0'
21+
uses: 'clouddrove/github-actions@v6.0'
1922
with:
2023
actions_subcommand: 'readme'
2124
github_token: '${{ secrets.GITHUB}}'
2225
env:
2326
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
27+
2428
- name: pre-commit check errors
2529
uses: pre-commit/action@v2.0.0
2630
continue-on-error: true
31+
2732
- name: pre-commit fix erros
2833
uses: pre-commit/action@v2.0.0
2934
continue-on-error: true
35+
3036
- name: 'push readme'
31-
uses: 'clouddrove/github-actions@v4.0'
37+
uses: 'clouddrove/github-actions@v6.0'
3238
continue-on-error: true
3339
with:
3440
actions_subcommand: 'push'
3541
env:
3642
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
43+
3744
- name: 'Slack Notification'
3845
uses: clouddrove/action-slack@v2
3946
with:
@@ -43,4 +50,4 @@ jobs:
4350
env:
4451
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
4552
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
46-
if: always()
53+
if: always()

‎.github/workflows/terraform.yml‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,57 @@ on:
44
branches:
55
- master
66
jobs:
7-
terraform:
8-
name: 'Terraform'
7+
fmt:
8+
name: 'terraform fmt'
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout'
12-
uses: actions/checkout@master
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
12+
uses: actions/checkout@v2.3.4
13+
1914
- name: 'Terraform Format'
20-
uses: 'clouddrove/github-actions@v4.0'
15+
uses: 'clouddrove/github-actions@v6.0'
2116
with:
2217
actions_subcommand: 'fmt'
23-
- name: 'Terraform init for generate certicate dns'
18+
19+
DNS:
20+
name: 'DNS'
21+
needs: fmt
22+
runs-on: ubuntu-latest
23+
steps:
24+
25+
- name: 'Terraform init for generate certificate dns'
2426
uses: 'clouddrove/github-actions@v4.0'
2527
with:
2628
actions_subcommand: 'init'
2729
tf_actions_working_dir: ./_example/generate-certificate-dns
28-
- name: 'Terraform validate for generate certicate dns'
30+
- name: 'Terraform validate for generate certificate dns'
2931
uses: 'clouddrove/github-actions@v4.0'
3032
with:
3133
actions_subcommand: 'validate'
3234
tf_actions_working_dir: ./_example/generate-certificate-dns
33-
- name: 'Terraform plan for generate certicate dns'
35+
- name: 'Terraform plan for generate certificate dns'
3436
uses: 'clouddrove/github-actions@v4.0'
3537
with:
3638
actions_subcommand: 'plan'
3739
tf_actions_working_dir: ./_example/generate-certificate-dns
38-
39-
- name: 'Terraform init for generate certicate email'
40+
Email:
41+
name: 'DNS'
42+
needs: fmt
43+
runs-on: ubuntu-latest
44+
steps:
45+
- name: 'Terraform init for generate certificate email'
4046
uses: 'clouddrove/github-actions@v4.0'
4147
with:
4248
actions_subcommand: 'init'
4349
tf_actions_working_dir: ./_example/generate-certificate-email
44-
- name: 'Terraform validate for generate certicate email'
50+
- name: 'Terraform validate for generate certificate email'
4551
uses: 'clouddrove/github-actions@v4.0'
4652
with:
4753
actions_subcommand: 'validate'
4854
tf_actions_working_dir: ./_example/generate-certificate-email
49-
- name: 'Terraform plan for generate certicate email'
55+
56+
- name: 'Terraform plan for generate certificate email'
5057
uses: 'clouddrove/github-actions@v4.0'
5158
with:
5259
actions_subcommand: 'plan'
5360
tf_actions_working_dir: ./_example/generate-certificate-email
54-
55-
- name: 'Terraform init for import certicate'
56-
uses: 'clouddrove/github-actions@v4.0'
57-
with:
58-
actions_subcommand: 'init'
59-
tf_actions_working_dir: ./_example/import-certificate
60-
61-
- name: 'Slack Notification'
62-
uses: clouddrove/action-slack@v2
63-
with:
64-
status: ${{ job.status }}
65-
fields: repo,author
66-
author_name: 'CloudDrove'
67-
env:
68-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
69-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
70-
if: always()

‎.github/workflows/terratest.yml‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ on:
44
branches:
55
- master
66
types: [labeled]
7+
78
jobs:
8-
terraform:
9-
name: 'Terraform'
9+
DNS:
10+
name: 'Terratest for DNS'
1011
runs-on: ubuntu-latest
1112
steps:
13+
1214
- name: 'Checkout'
1315
uses: actions/checkout@master
1416
- name: Configure AWS Credentials
@@ -17,18 +19,35 @@ jobs:
1719
aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
1820
aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
1921
aws-region: us-east-2
22+
2023
- name: 'Terratest Generate Certificate DNS'
2124
if: ${{ github.event.label.name == 'terratest' }}
22-
uses: 'clouddrove/github-actions@v4.0'
25+
uses: 'clouddrove/github-actions@v6.0'
2326
with:
2427
actions_subcommand: 'terratest'
2528
tf_actions_working_dir: _test/generate-certificate-dns
2629
env:
2730
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2831

32+
- name: 'Slack Notification'
33+
uses: clouddrove/action-slack@v2
34+
with:
35+
status: ${{ job.status }}
36+
fields: repo,author
37+
author_name: 'CloudDrove'
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
40+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
41+
if: always()
42+
43+
Email:
44+
name: 'Terratest for Email'
45+
runs-on: ubuntu-latest
46+
steps:
47+
2948
- name: 'Terratest Generate Certificate Email'
3049
if: ${{ github.event.label.name == 'terratest' }}
31-
uses: 'clouddrove/github-actions@v4.0'
50+
uses: 'clouddrove/github-actions@v6.0'
3251
with:
3352
actions_subcommand: 'terratest'
3453
tf_actions_working_dir: _test/generate-certificate-email
@@ -44,4 +63,4 @@ jobs:
4463
env:
4564
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
4665
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
47-
if: always()
66+
if: always()

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
.terraform
55
.idea
66
*.iml
7-
*.sum
7+
*.sum
8+
*.terraform.lock.hcl

‎.pre-commit-config.yaml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
repos:
2-
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.43.0
2+
3+
- repo: https://github.com/gruntwork-io/pre-commit
4+
rev: v0.1.12 # Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
45
hooks:
5-
- id: terraform_fmt
6+
- id: terraform-fmt
7+
- id: shellcheck
68

7-
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v3.2.0
9+
- repo: git://github.com/pre-commit/pre-commit-hooks
10+
rev: v3.4.0 # Use the ref you want to point at
911
hooks:
12+
- id: end-of-file-fixer
13+
- id: trailing-whitespace
14+
- id: mixed-line-ending
15+
- id: check-byte-order-marker
16+
- id: check-executables-have-shebangs
1017
- id: check-merge-conflict
18+
- id: debug-statements
1119
- id: check-yaml
1220
- id: check-added-large-files
13-
- id: trailing-whitespace

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Cloud Drove
3+
Copyright (c) 2021 Cloud Drove
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export GENIE_PATH ?= $(shell 'pwd')/../../../genie
22

3-
include $(GENIE_PATH)/Makefile
3+
include $(GENIE_PATH)/Makefile

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Terraform Aws Acm
88
</h1>
99

10-
<p align="center" style="font-size: 1.2rem;">
10+
<p align="center" style="font-size: 1.2rem;">
1111
This terraform module is used for requesting or importing SSL/TLS certificate with validation.
1212
</p>
1313

@@ -38,7 +38,7 @@
3838
<hr>
3939

4040

41-
We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure.
41+
We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure.
4242

4343
This module is basically combination of [Terraform open source](https://www.terraform.io/) and includes automatation tests and examples. It also helps to create and improve your infrastructure with minimalistic code instead of maintaining the whole infrastructure code yourself.
4444

@@ -49,7 +49,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c
4949

5050
## Prerequisites
5151

52-
This module has a few dependencies:
52+
This module has a few dependencies:
5353

5454
- [Terraform 0.13](https://learn.hashicorp.com/terraform/getting-started/install.html)
5555
- [Go](https://golang.org/doc/install)
@@ -158,7 +158,7 @@ module "acm" {
158158

159159

160160
## Testing
161-
In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system.
161+
In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system.
162162

163163
You need to run the following command in the testing folder:
164164
```hcl
@@ -167,7 +167,7 @@ You need to run the following command in the testing folder:
167167

168168

169169

170-
## Feedback
170+
## Feedback
171171
If you come accross a bug or have any feedback, please log it in our [issue tracker](https://github.com/clouddrove/terraform-aws-acm/issues), or feel free to drop us an email at [hello@clouddrove.com](mailto:hello@clouddrove.com).
172172

173173
If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-aws-acm)!

‎README.yaml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ usage : |-
3737
```hcl
3838
module "acm" {
3939
source = "clouddrove/acm/aws"
40-
version = "0.13.0"
40+
version = "0.14.0"
4141
name = "certificate"
42-
application = "clouddrove"
4342
environment = "test"
44-
label_order = ["environment", "name", "application"]
43+
label_order = ["name","environment"]
4544
domain_name = "clouddrove.com"
4645
validation_method = "DNS"
4746
enable_dns_validation = false
@@ -53,11 +52,10 @@ usage : |-
5352
```hcl
5453
module "acm" {
5554
source = "clouddrove/acm/aws"
56-
version = "0.13.0"
55+
version = "0.14.0"
5756
name = "certificate"
58-
application = "clouddrove"
5957
environment = "test"
60-
label_order = ["environment", "name", "application"]
58+
label_order = ["name","environment"]
6159
domain_name = "clouddrove.com"
6260
validation_method = "EMAIL"
6361
validate_certificate = false
@@ -69,11 +67,10 @@ usage : |-
6967
```hcl
7068
module "acm" {
7169
source = "clouddrove/acm/aws"
72-
version = "0.13.0"
70+
version = "0.14.0"
7371
name = "certificate"
74-
application = "clouddrove"
7572
environment = "test"
76-
label_order = ["environment", "name", "application"]
73+
label_order = ["name","environment"]
7774
private_key = "./../../../clouddrove-private-key.pem"
7875
certificate_body = "./../../../clouddrove-cert.pem"
7976
certificate_chain = "./../../../clouddrove-chain.crt"

‎_example/generate-certificate-dns/example.tf‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ module "acm" {
66
source = "./../../"
77

88
name = "certificate"
9-
application = "clouddrove"
109
environment = "test"
11-
label_order = ["environment", "application", "name"]
10+
label_order = ["name", "environment"]
1211

12+
enable_aws_certificate = true
1313
domain_name = "clouddrove.com"
1414
validation_method = "DNS"
1515
enable_dns_validation = false
16-
enable_aws_certificate = true
1716
}
18-

0 commit comments

Comments
 (0)