Merge pull request #6 from clouddrove/CD-147

fix labels managedby variables
clouddrove · Mar 27, 2020 · b955387 · b955387
2 parents f557c7b + c99c08f
commit b955387
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
     Terraform Aws Acm
 </h1>
 
-<p align="center" style="font-size: 1.2rem;"> 
+<p align="center" style="font-size: 1.2rem;">
     This terraform module is used for requesting or importing SSL/TLS certificate with validation.
      </p>
 
@@ -38,7 +38,7 @@
 <hr>
 
 
-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. 
+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.
 
 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.
 
@@ -49,7 +49,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c
 
 ## Prerequisites
 
-This module has a few dependencies: 
+This module has a few dependencies:
 
 - [Terraform 0.12](https://learn.hashicorp.com/terraform/getting-started/install.html)
 - [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
 ### ACM with DNS
 ```hcl
 module "acm" {
-  source                   = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
+  source                   = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
   name                     = "certificate"
   application              = "clouddrove"
   environment              = "test"
@@ -87,7 +87,7 @@ module "acm" {
 ### ACM with Email
 ```hcl
 module "acm" {
-  source                = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
+  source                = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
   name                  = "certificate"
   application           = "clouddrove"
   environment           = "test"
@@ -102,7 +102,7 @@ module "acm" {
 ### ACM with Import Certificate
 ```hcl
 module "acm" {
-  source              = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
+  source              = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
   name                = "certificate"
   application         = "clouddrove"
   environment         = "test"
@@ -123,24 +123,25 @@ module "acm" {
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| application | Application (e.g. `cd` or `clouddrove`). | string | `` | no |
-| attributes | Additional attributes (e.g. `1`). | list | `<list>` | no |
-| certificate_body | Path of certificate body. | string | `~` | no |
-| certificate_chain | Path of certificate chain. | string | `` | no |
-| delimiter | Delimiter to be used between `organization`, `environment`, `name` and `attributes`. | string | `-` | no |
-| domain_name | A domain name for which the certificate should be issued. | string | `` | no |
-| enable_acm_certificate | Set to false to prevent the creation of a acm certificate. | string | `true` | no |
-| enable_aws_certificate | Set to false to prevent the creation of a acm certificate. | bool | `false` | no |
-| enable_dns_validation | Set to prevent validation of DNS. | string | `false` | no |
-| environment | Environment (e.g. `prod`, `dev`, `staging`). | string | `` | no |
-| import_certificate | Set to true or false to decide the creation and import of a acm certificate. | bool | `false` | no |
-| label_order | Label order, e.g. `name`,`application`. | list | `<list>` | no |
-| name | Name  (e.g. `app` or `cluster`). | string | `` | no |
-| private_key | Path of private key. | string | `` | no |
-| tags | Additional tags (e.g. map(`BusinessUnit`,`XYZ`). | map | `<map>` | no |
-| ttl | Time to live. | number | `600` | no |
-| validate_certificate | Set to false to prevent the validation of a acm certificate. | string | `false` | no |
-| validation_method | Which method to use for validation, DNS or EMAIL. | string | `` | no |
+| application | Application \(e.g. `cd` or `clouddrove`\). | string | `""` | no |
+| attributes | Additional attributes \(e.g. `1`\). | list | `<list>` | no |
+| certificate\_body | Path of certificate body. | string | `"~"` | no |
+| certificate\_chain | Path of certificate chain. | string | `""` | no |
+| delimiter | Delimiter to be used between `organization`, `environment`, `name` and `attributes`. | string | `"-"` | no |
+| domain\_name | A domain name for which the certificate should be issued. | string | `""` | no |
+| enable\_acm\_certificate | Set to false to prevent the creation of a acm certificate. | string | `"true"` | no |
+| enable\_aws\_certificate | Set to false to prevent the creation of a acm certificate. | bool | `"false"` | no |
+| enable\_dns\_validation | Set to prevent validation of DNS. | string | `"false"` | no |
+| environment | Environment \(e.g. `prod`, `dev`, `staging`\). | string | `""` | no |
+| import\_certificate | Set to true or false to decide the creation and import of a acm certificate. | bool | `"false"` | no |
+| label\_order | Label order, e.g. `name`,`application`. | list | `<list>` | no |
+| managedby | ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'. | string | `"anmol@clouddrove.com"` | no |
+| name | Name  \(e.g. `app` or `cluster`\). | string | `""` | no |
+| private\_key | Path of private key. | string | `""` | no |
+| tags | Additional tags \(e.g. map\(`BusinessUnit`,`XYZ`\). | map | `<map>` | no |
+| ttl | Time to live. | number | `"600"` | no |
+| validate\_certificate | Set to false to prevent the validation of a acm certificate. | string | `"false"` | no |
+| validation\_method | Which method to use for validation, DNS or EMAIL. | string | `""` | no |
 
 ## Outputs
 
@@ -154,7 +155,7 @@ module "acm" {
 
 
 ## Testing
-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. 
+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.
 
 You need to run the following command in the testing folder:
 ```hcl
@@ -163,7 +164,7 @@ You need to run the following command in the testing folder:
 
 
 
-## Feedback 
+## Feedback
 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).
 
 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
   [linkedin]: https://cpco.io/linkedin
   [twitter]: https://twitter.com/clouddrove/
   [email]: https://clouddrove.com/contact-us.html
-  [terraform_modules]: https://github.com/clouddrove?utf8=%E2%9C%93&q=terraform-&type=&language=
+  [terraform_modules]: https://github.com/clouddrove?utf8=%E2%9C%93&q=terraform-&type=&language=
diff --git a/README.yaml b/README.yaml
@@ -36,7 +36,7 @@ usage : |-
   ### ACM with DNS
   ```hcl
   module "acm" {
-    source                   = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
+    source                   = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
     name                     = "certificate"
     application              = "clouddrove"
     environment              = "test"
@@ -51,7 +51,7 @@ usage : |-
   ### ACM with Email
   ```hcl
   module "acm" {
-    source                = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
+    source                = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
     name                  = "certificate"
     application           = "clouddrove"
     environment           = "test"
@@ -66,7 +66,7 @@ usage : |-
   ### ACM with Import Certificate
   ```hcl
   module "acm" {
-    source              = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
+    source              = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.4"
     name                = "certificate"
     application         = "clouddrove"
     environment         = "test"

diff --git a/main.tf b/main.tf
@@ -12,6 +12,7 @@ module "labels" {
   name        = var.name
   application = var.application
   environment = var.environment
+  managedby   = var.managedby
   label_order = var.label_order
 }
 

diff --git a/variables.tf b/variables.tf
@@ -42,6 +42,12 @@ variable "tags" {
   description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)."
 }
 
+variable "managedby" {
+  type        = string
+  default     = "anmol@clouddrove.com"
+  description = "ManagedBy, eg 'CloudDrove' or 'AnmolNagpal'."
+}
+
 # Module      : ACM CERTIFICATE
 # Description : Terraform ACM Certificate module variables.
 variable "domain_name" {