Skip to content

Commit b955387

Browse files
authored
Merge pull request #6 from clouddrove/CD-147
fix labels managedby variables
2 parents f557c7b + c99c08f commit b955387

File tree

4 files changed

+38
-30
lines changed

4 files changed

+38
-30
lines changed

README.md

Lines changed: 28 additions & 27 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 stratergies 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.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
5555
- [Go](https://golang.org/doc/install)
@@ -72,7 +72,7 @@ Here are some examples of how you can use this module in your inventory structur
7272
### ACM with DNS
7373
```hcl
7474
module "acm" {
75-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
75+
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
7676
name = "certificate"
7777
application = "clouddrove"
7878
environment = "test"
@@ -87,7 +87,7 @@ module "acm" {
8787
### ACM with Email
8888
```hcl
8989
module "acm" {
90-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
90+
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
9191
name = "certificate"
9292
application = "clouddrove"
9393
environment = "test"
@@ -102,7 +102,7 @@ module "acm" {
102102
### ACM with Import Certificate
103103
```hcl
104104
module "acm" {
105-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
105+
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
106106
name = "certificate"
107107
application = "clouddrove"
108108
environment = "test"
@@ -123,24 +123,25 @@ module "acm" {
123123

124124
| Name | Description | Type | Default | Required |
125125
|------|-------------|:----:|:-----:|:-----:|
126-
| application | Application (e.g. `cd` or `clouddrove`). | string | `` | no |
127-
| attributes | Additional attributes (e.g. `1`). | list | `<list>` | no |
128-
| certificate_body | Path of certificate body. | string | `~` | no |
129-
| certificate_chain | Path of certificate chain. | string | `` | no |
130-
| delimiter | Delimiter to be used between `organization`, `environment`, `name` and `attributes`. | string | `-` | no |
131-
| domain_name | A domain name for which the certificate should be issued. | string | `` | no |
132-
| enable_acm_certificate | Set to false to prevent the creation of a acm certificate. | string | `true` | no |
133-
| enable_aws_certificate | Set to false to prevent the creation of a acm certificate. | bool | `false` | no |
134-
| enable_dns_validation | Set to prevent validation of DNS. | string | `false` | no |
135-
| environment | Environment (e.g. `prod`, `dev`, `staging`). | string | `` | no |
136-
| import_certificate | Set to true or false to decide the creation and import of a acm certificate. | bool | `false` | no |
137-
| label_order | Label order, e.g. `name`,`application`. | list | `<list>` | no |
138-
| name | Name (e.g. `app` or `cluster`). | string | `` | no |
139-
| private_key | Path of private key. | string | `` | no |
140-
| tags | Additional tags (e.g. map(`BusinessUnit`,`XYZ`). | map | `<map>` | no |
141-
| ttl | Time to live. | number | `600` | no |
142-
| validate_certificate | Set to false to prevent the validation of a acm certificate. | string | `false` | no |
143-
| validation_method | Which method to use for validation, DNS or EMAIL. | string | `` | no |
126+
| application | Application \(e.g. `cd` or `clouddrove`\). | string | `""` | no |
127+
| attributes | Additional attributes \(e.g. `1`\). | list | `<list>` | no |
128+
| certificate\_body | Path of certificate body. | string | `"~"` | no |
129+
| certificate\_chain | Path of certificate chain. | string | `""` | no |
130+
| delimiter | Delimiter to be used between `organization`, `environment`, `name` and `attributes`. | string | `"-"` | no |
131+
| domain\_name | A domain name for which the certificate should be issued. | string | `""` | no |
132+
| enable\_acm\_certificate | Set to false to prevent the creation of a acm certificate. | string | `"true"` | no |
133+
| enable\_aws\_certificate | Set to false to prevent the creation of a acm certificate. | bool | `"false"` | no |
134+
| enable\_dns\_validation | Set to prevent validation of DNS. | string | `"false"` | no |
135+
| environment | Environment \(e.g. `prod`, `dev`, `staging`\). | string | `""` | no |
136+
| import\_certificate | Set to true or false to decide the creation and import of a acm certificate. | bool | `"false"` | no |
137+
| label\_order | Label order, e.g. `name`,`application`. | list | `<list>` | no |
138+
| managedby | ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'. | string | `"[email protected]"` | no |
139+
| name | Name \(e.g. `app` or `cluster`\). | string | `""` | no |
140+
| private\_key | Path of private key. | string | `""` | no |
141+
| tags | Additional tags \(e.g. map\(`BusinessUnit`,`XYZ`\). | map | `<map>` | no |
142+
| ttl | Time to live. | number | `"600"` | no |
143+
| validate\_certificate | Set to false to prevent the validation of a acm certificate. | string | `"false"` | no |
144+
| validation\_method | Which method to use for validation, DNS or EMAIL. | string | `""` | no |
144145

145146
## Outputs
146147

@@ -154,7 +155,7 @@ module "acm" {
154155

155156

156157
## 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.
158+
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.
158159

159160
You need to run the following command in the testing folder:
160161
```hcl
@@ -163,7 +164,7 @@ You need to run the following command in the testing folder:
163164

164165

165166

166-
## Feedback
167+
## Feedback
167168
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]).
168169

169170
If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-aws-acm)!
@@ -181,4 +182,4 @@ At [CloudDrove][website], we offer expert guidance, implementation support and s
181182
[linkedin]: https://cpco.io/linkedin
182183
[twitter]: https://twitter.com/clouddrove/
183184
[email]: https://clouddrove.com/contact-us.html
184-
[terraform_modules]: https://github.com/clouddrove?utf8=%E2%9C%93&q=terraform-&type=&language=
185+
[terraform_modules]: https://github.com/clouddrove?utf8=%E2%9C%93&q=terraform-&type=&language=

README.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ 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.2"
39+
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
4040
name = "certificate"
4141
application = "clouddrove"
4242
environment = "test"
@@ -51,7 +51,7 @@ usage : |-
5151
### ACM with Email
5252
```hcl
5353
module "acm" {
54-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
54+
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
5555
name = "certificate"
5656
application = "clouddrove"
5757
environment = "test"
@@ -66,7 +66,7 @@ usage : |-
6666
### ACM with Import Certificate
6767
```hcl
6868
module "acm" {
69-
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
69+
source = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
7070
name = "certificate"
7171
application = "clouddrove"
7272
environment = "test"

main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module "labels" {
1212
name = var.name
1313
application = var.application
1414
environment = var.environment
15+
managedby = var.managedby
1516
label_order = var.label_order
1617
}
1718

variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ variable "tags" {
4242
description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)."
4343
}
4444

45+
variable "managedby" {
46+
type = string
47+
default = "[email protected]"
48+
description = "ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'."
49+
}
50+
4551
# Module : ACM CERTIFICATE
4652
# Description : Terraform ACM Certificate module variables.
4753
variable "domain_name" {

0 commit comments

Comments
 (0)