Skip to content

Commit 5bef467

Browse files
authored
Merge pull request #17 from clouddrove/0.15
add-mutipal-domain
2 parents 23b6391 + 6017c36 commit 5bef467

File tree

6 files changed

+48
-26
lines changed

6 files changed

+48
-26
lines changed

.github/workflows/terraform.yml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: actions/[email protected]
1313

1414
- name: 'Terraform Format'
15-
uses: 'clouddrove/github-actions@v6.0'
15+
uses: 'clouddrove/github-actions@v7.0'
1616
with:
1717
actions_subcommand: 'fmt'
1818

@@ -32,24 +32,24 @@ jobs:
3232
aws-region: us-east-2
3333

3434
- name: 'Terraform init for generate certificate dns'
35-
uses: 'clouddrove/github-actions@v6.0'
35+
uses: 'clouddrove/github-actions@v7.0'
3636
with:
3737
actions_subcommand: 'init'
3838
tf_actions_working_dir: ./_example/generate-certificate-dns
3939

4040
- name: 'Terraform validate for generate certificate dns'
41-
uses: 'clouddrove/github-actions@v6.0'
41+
uses: 'clouddrove/github-actions@v7.0'
4242
with:
4343
actions_subcommand: 'validate'
4444
tf_actions_working_dir: ./_example/generate-certificate-dns
4545

4646
- name: 'Terraform plan for generate certificate dns'
47-
uses: 'clouddrove/github-actions@v6.0'
47+
uses: 'clouddrove/github-actions@v7.0'
4848
with:
4949
actions_subcommand: 'plan'
5050
tf_actions_working_dir: ./_example/generate-certificate-dns
5151
Email:
52-
name: 'DNS'
52+
name: 'Email'
5353
needs: fmt
5454
runs-on: ubuntu-latest
5555
steps:
@@ -65,19 +65,38 @@ jobs:
6565
aws-region: us-east-2
6666

6767
- name: 'Terraform init for generate certificate email'
68-
uses: 'clouddrove/github-actions@v6.0'
68+
uses: 'clouddrove/github-actions@v7.0'
6969
with:
7070
actions_subcommand: 'init'
7171
tf_actions_working_dir: ./_example/generate-certificate-email
7272

7373
- name: 'Terraform validate for generate certificate email'
74-
uses: 'clouddrove/github-actions@v6.0'
74+
uses: 'clouddrove/github-actions@v7.0'
7575
with:
7676
actions_subcommand: 'validate'
7777
tf_actions_working_dir: ./_example/generate-certificate-email
7878

7979
- name: 'Terraform plan for generate certificate email'
80-
uses: 'clouddrove/github-actions@v6.0'
80+
uses: 'clouddrove/github-actions@v7.0'
8181
with:
8282
actions_subcommand: 'plan'
8383
tf_actions_working_dir: ./_example/generate-certificate-email
84+
85+
pre-commit:
86+
name: 'Pre-Commit'
87+
needs:
88+
- fmt
89+
- DNS
90+
- Email
91+
runs-on: ubuntu-latest
92+
steps:
93+
- name: 'Checkout'
94+
uses: actions/[email protected]
95+
96+
- name: 'Install Tflint'
97+
run: |
98+
curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
99+
100+
- name: 'Pre-Commit 🔎'
101+
uses: pre-commit/[email protected]
102+
continue-on-error: true

.pre-commit-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ repos:
55
hooks:
66
- id: terraform-fmt
77
- id: shellcheck
8+
- id: tflint
89

910
- repo: git://github.com/pre-commit/pre-commit-hooks
10-
rev: v3.4.0 # Use the ref you want to point at
11+
rev: v4.0.1 # Use the ref you want to point at
1112
hooks:
1213
- id: end-of-file-fixer
1314
- id: trailing-whitespace

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)
@@ -154,7 +154,7 @@ module "acm" {
154154

155155

156156
## Testing
157-
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.
157+
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.
158158

159159
You need to run the following command in the testing folder:
160160
```hcl
@@ -163,7 +163,7 @@ You need to run the following command in the testing folder:
163163

164164

165165

166-
## Feedback
166+
## Feedback
167167
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 [[email protected]](mailto:[email protected]).
168168

169169
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: 4 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.14-green"
19+
image: "https://img.shields.io/badge/Terraform-v0.15-green"
2020
url: "https://www.terraform.io"
2121
- name: "Licence"
2222
image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -37,7 +37,7 @@ usage : |-
3737
```hcl
3838
module "acm" {
3939
source = "clouddrove/acm/aws"
40-
version = "0.14.0"
40+
version = "0.15.0"
4141
name = "certificate"
4242
environment = "test"
4343
label_order = ["name","environment"]
@@ -52,7 +52,7 @@ usage : |-
5252
```hcl
5353
module "acm" {
5454
source = "clouddrove/acm/aws"
55-
version = "0.14.0"
55+
version = "0.15.0"
5656
name = "certificate"
5757
environment = "test"
5858
label_order = ["name","environment"]
@@ -67,7 +67,7 @@ usage : |-
6767
```hcl
6868
module "acm" {
6969
source = "clouddrove/acm/aws"
70-
version = "0.14.0"
70+
version = "0.15.0"
7171
name = "certificate"
7272
environment = "test"
7373
label_order = ["name","environment"]

_example/generate-certificate-dns/example.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ module "acm" {
99
environment = "test"
1010
label_order = ["name", "environment"]
1111

12-
enable_aws_certificate = true
13-
domain_name = "clouddrove.com"
14-
validation_method = "DNS"
15-
enable_dns_validation = false
12+
enable_aws_certificate = true
13+
domain_name = "clouddrove.com"
14+
subject_alternative_names = ["www.clouddrove.com"]
15+
validation_method = "DNS"
16+
enable_dns_validation = false
1617
}

_example/generate-certificate-email/example.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ module "acm" {
99
environment = "test"
1010
label_order = ["name", "environment"]
1111

12-
validate_certificate = false
13-
domain_name = "clouddrove.com"
14-
validation_method = "EMAIL"
15-
enable_aws_certificate = true
12+
validate_certificate = false
13+
domain_name = "clouddrove.com"
14+
subject_alternative_names = ["www.clouddrove.com"]
15+
validation_method = "EMAIL"
16+
enable_aws_certificate = true
1617
}

0 commit comments

Comments
 (0)