Merge pull request #5 from clouddrove/CD-118

fix bool
clouddrove · Mar 6, 2020 · f557c7b · f557c7b
2 parents 50cb064 + 5f887ab
commit f557c7b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -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.1"
+  source                   = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
   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.1"
+  source                = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
   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.1"
+  source              = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
   name                = "certificate"
   application         = "clouddrove"
   environment         = "test"
@@ -128,7 +128,7 @@ module "acm" {
 | 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 | - | yes |
+| 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 |
@@ -140,7 +140,7 @@ module "acm" {
 | 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 | - | yes |
+| validation_method | Which method to use for validation, DNS or EMAIL. | string | `` | no |
 
 ## Outputs
 

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.1"
+    source                   = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
     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.1"
+    source                = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
     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.1"
+    source              = "git::https://github.com/clouddrove/terraform-aws-acm.git?ref=tags/0.12.2"
     name                = "certificate"
     application         = "clouddrove"
     environment         = "test"

diff --git a/main.tf b/main.tf
@@ -34,7 +34,7 @@ resource "aws_acm_certificate" "import-cert" {
 # Description : This terraform module is used for requesting or importing SSL/TLS
 #               certificate with validation.
 resource "aws_acm_certificate" "cert" {
-  count = var.enable_acm_certificate && var.enable_aws_certificate == false ? 1 : 0
+  count = var.enable_acm_certificate && var.enable_aws_certificate ? 1 : 0
 
   domain_name       = var.domain_name
   validation_method = var.validation_method

diff --git a/variables.tf b/variables.tf
@@ -47,11 +47,13 @@ variable "tags" {
 variable "domain_name" {
   type        = string
   description = "A domain name for which the certificate should be issued."
+  default     = ""
 }
 
 variable "validation_method" {
   type        = string
   description = "Which method to use for validation, DNS or EMAIL."
+  default     = ""
 }
 
 variable "enable_dns_validation" {