Use string comparison for booleans (#24)

Author: aknysh

.gitignore

@@ -1,3 +1,4 @@
 # Module directory
 .terraform/
 .idea
+*.iml

README.md

@@ -67,6 +67,7 @@ resource "aws_ami_from_instance" "example" {
 
 | Name                            |                    Default                     | Description                                                                                            | Required |
 |:--------------------------------|:----------------------------------------------:|:-------------------------------------------------------------------------------------------------------|:--------:|
+| `region`                        |                       ``                       | AWS Region the instance is launched in. Optional. If not provided, the current region will be used     |   No     |
 | `namespace`                     |                       ``                       | Namespace (e.g. `cp` or `cloudposse`)                                                                  |   Yes    |
 | `stage`                         |                       ``                       | Stage (e.g. `prod`, `dev`, `staging`                                                                   |   Yes    |
 | `name`                          |                       ``                       | Name  (e.g. `bastion` or `db`)                                                                         |   Yes    |

eni.tf

@@ -1,13 +1,13 @@
 locals {
-  additional_ips_count = "${var.associate_public_ip_address && var.instance_enabled && var.additional_ips_count > 0 ? var.additional_ips_count : 0}"
+  additional_ips_count = "${var.associate_public_ip_address == "true" && var.instance_enabled == "true" && var.additional_ips_count > 0 ? var.additional_ips_count : 0}"
 }
 
 resource "aws_network_interface" "additional" {
   count     = "${local.additional_ips_count}"
   subnet_id = "${var.subnet}"
 
   security_groups = [
-    "${compact(concat(list(var.create_default_security_group ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}",
+    "${compact(concat(list(var.create_default_security_group == "true" ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}",
   ]
 
   tags = "${module.label.tags}"

main.tf

@@ -1,6 +1,6 @@
 locals {
-  instance_count       = "${var.instance_enabled ? 1 : 0}"
-  security_group_count = "${var.create_default_security_group ? 1 : 0}"
+  instance_count       = "${var.instance_enabled == "true" ? 1 : 0}"
+  security_group_count = "${var.create_default_security_group == "true" ? 1 : 0}"
   region               = "${var.region != "" ? var.region : data.aws_region.default.name}"
   root_iops            = "${var.root_volume_type == "io1" ? var.root_iops : "0"}"
   ebs_iops             = "${var.ebs_volume_type == "io1" ? var.ebs_iops : "0"}"
@@ -68,7 +68,7 @@ module "label" {
   attributes = "${var.attributes}"
   delimiter  = "${var.delimiter}"
   tags       = "${merge(map("AZ", "${local.availability_zone}"), var.tags)}"
-  enabled    = "${local.instance_count ? "true" : "false"}"
+  enabled    = "${local.instance_count > 0 ? "true" : "false"}"
 }
 
 resource "aws_iam_instance_profile" "default" {
@@ -103,7 +103,7 @@ resource "aws_instance" "default" {
   ipv6_addresses              = "${var.ipv6_addresses}"
 
   vpc_security_group_ids = [
-    "${compact(concat(list(var.create_default_security_group ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}",
+    "${compact(concat(list(var.create_default_security_group == "true" ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}",
   ]
 
   root_block_device {
@@ -117,13 +117,13 @@ resource "aws_instance" "default" {
 }
 
 resource "aws_eip" "default" {
-  count             = "${var.associate_public_ip_address && var.instance_enabled ? 1 : 0}"
+  count             = "${var.associate_public_ip_address == "true" && var.instance_enabled == "true" ? 1 : 0}"
   network_interface = "${aws_instance.default.primary_network_interface_id}"
   vpc               = "true"
 }
 
 resource "null_resource" "eip" {
-  count = "${var.associate_public_ip_address && var.instance_enabled ? 1 : 0}"
+  count = "${var.associate_public_ip_address == "true" && var.instance_enabled == "true" ? 1 : 0}"
 
   triggers {
     public_dns = "ec2-${replace(aws_eip.default.public_ip, ".", "-")}.${local.region == "us-east-1" ? "compute-1" : "${local.region}.compute"}.amazonaws.com"

outputs.tf

@@ -30,7 +30,7 @@ output "ssh_key_pair" {
 
 output "security_group_ids" {
   description = "ID on the new AWS Security Group associated with creating instance"
-  value       = "${compact(concat(list(var.create_default_security_group ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}"
+  value       = "${compact(concat(list(var.create_default_security_group == "true" ? join("", aws_security_group.default.*.id) : ""), var.security_groups))}"
 }
 
 output "role" {

variables.tf

@@ -28,6 +28,7 @@ variable "security_groups" {
 }
 
 variable "allowed_ports" {
+  type        = "list"
   description = "List of allowed ingress ports"
   default     = []
 }
@@ -65,7 +66,7 @@ variable "tags" {
 }
 
 variable "region" {
-  description = "Region of instance launched in"
+  description = "AWS Region the instance is launched in"
   default     = ""
 }
 
@@ -110,6 +111,7 @@ variable "ipv6_address_count" {
 }
 
 variable "ipv6_addresses" {
+  type        = "list"
   description = "List of IPv6 addresses from the range of the subnet to associate with the primary network interface"
   default     = []
 }
@@ -130,6 +132,7 @@ variable "root_iops" {
 }
 
 variable "ebs_device_name" {
+  type        = "list"
   description = "Name of the ebs device to mount"
   default     = ["/dev/xvdb", "/dev/xvdc", "/dev/xvdd", "/dev/xvde", "/dev/xvdf", "/dev/xvdg", "/dev/xvdh", "/dev/xvdi", "/dev/xvdj", "/dev/xvdk", "/dev/xvdl", "/dev/xvdm", "/dev/xvdn", "/dev/xvdo", "/dev/xvdp", "/dev/xvdq", "/dev/xvdr", "/dev/xvds", "/dev/xvdt", "/dev/xvdu", "/dev/xvdv", "/dev/xvdw", "/dev/xvdx", "/dev/xvdy", "/dev/xvdz"]
 }