Merge pull request #22 from fsperling/master

fix deprecated syntax warnings

Author: egarbi

main.tf

@@ -1,32 +1,32 @@
 resource "aws_security_group" "elasticsearch" {
-  name        = "${var.name}"
+  name        = var.name
   description = "Security Group to allow traffic to ElasticSearch"
 
-  vpc_id = "${var.vpc_id}"
+  vpc_id = var.vpc_id
 }
 
 resource "aws_security_group_rule" "secure_cidrs" {
-  count = "${length(var.ingress_allow_cidr_blocks) > 0 ? 1 : 0}"
+  count = length(var.ingress_allow_cidr_blocks) > 0 ? 1 : 0
 
   type        = "ingress"
   from_port   = 443
   to_port     = 443
   protocol    = "TCP"
   cidr_blocks = var.ingress_allow_cidr_blocks
 
-  security_group_id = "${aws_security_group.elasticsearch.id}"
+  security_group_id = aws_security_group.elasticsearch.id
 }
 
 resource "aws_security_group_rule" "secure_sgs" {
-  count = "${length(var.ingress_allow_security_groups)}"
+  count = length(var.ingress_allow_security_groups)
 
   type                     = "ingress"
   from_port                = 443
   to_port                  = 443
   protocol                 = "tcp"
-  source_security_group_id = "${element(var.ingress_allow_security_groups, count.index)}"
+  source_security_group_id = element(var.ingress_allow_security_groups, count.index)
 
-  security_group_id = "${aws_security_group.elasticsearch.id}"
+  security_group_id = aws_security_group.elasticsearch.id
 }
 
 resource "aws_security_group_rule" "egress_all" {
@@ -36,7 +36,7 @@ resource "aws_security_group_rule" "egress_all" {
   protocol    = "-1"
   cidr_blocks = ["0.0.0.0/0"]
 
-  security_group_id = "${aws_security_group.elasticsearch.id}"
+  security_group_id = aws_security_group.elasticsearch.id
 }
 
 # https://github.com/terraform-providers/terraform-provider-aws/issues/5218
@@ -47,62 +47,62 @@ resource "aws_iam_service_linked_role" "default" {
 }
 
 resource "aws_elasticsearch_domain" "es" {
-  domain_name           = "${var.name}"
-  elasticsearch_version = "${var.elasticsearch_version}"
+  domain_name           = var.name
+  elasticsearch_version = var.elasticsearch_version
 
   encrypt_at_rest {
-    enabled    = "${var.encryption_enabled}"
-    kms_key_id = "${var.encryption_kms_key_id}"
+    enabled    = var.encryption_enabled
+    kms_key_id = var.encryption_kms_key_id
   }
 
   cluster_config {
-    instance_type            = "${var.itype}"
-    instance_count           = "${var.icount}"
-    dedicated_master_enabled = "${var.dedicated_master}"
-    dedicated_master_type    = "${var.mtype}"
-    dedicated_master_count   = "${var.mcount}"
-    zone_awareness_enabled   = "${var.zone_awareness}"
+    instance_type            = var.itype
+    instance_count           = var.icount
+    dedicated_master_enabled = var.dedicated_master
+    dedicated_master_type    = var.mtype
+    dedicated_master_count   = var.mcount
+    zone_awareness_enabled   = var.zone_awareness
   }
 
-  access_policies = "${var.access_policies}"
+  access_policies = var.access_policies
 
   vpc_options {
-    security_group_ids = ["${aws_security_group.elasticsearch.id}"]
+    security_group_ids = [aws_security_group.elasticsearch.id]
     subnet_ids         = var.subnet_ids
   }
 
   advanced_options = {
-    "rest.action.multi.allow_explicit_index" = "${var.rest_action_multi_allow_explicit_index}"
-    "indices.fielddata.cache.size"           = "${var.indices_fielddata_cache_size}"
-    "indices.query.bool.max_clause_count"    = "${var.indices_query_bool_max_clause_count}"
+    "rest.action.multi.allow_explicit_index" = var.rest_action_multi_allow_explicit_index
+    "indices.fielddata.cache.size"           = var.indices_fielddata_cache_size
+    "indices.query.bool.max_clause_count"    = var.indices_query_bool_max_clause_count
   }
 
   ebs_options {
     ebs_enabled = true
-    volume_type = "${var.volume_type}"
-    volume_size = "${var.volume_size}"
+    volume_type = var.volume_type
+    volume_size = var.volume_size
   }
 
   snapshot_options {
-    automated_snapshot_start_hour = "${var.snapshot_start}"
+    automated_snapshot_start_hour = var.snapshot_start
   }
 
   tags = {
-    Domain = "${var.name}"
+    Domain = var.name
   }
 
   depends_on = [
-    "aws_iam_service_linked_role.default",
+    aws_iam_service_linked_role.default,
   ]
 }
 
 # Add ALB record on DNS
 resource "aws_route53_record" "main" {
-  count = "${length(var.zone_id) > 0 ? 1 : 0}"
-  zone_id = "${var.zone_id}"
-  name    = "${var.name}"
+  count = length(var.zone_id) > 0 ? 1 : 0
+  zone_id = var.zone_id
+  name    = var.name
   type    = "CNAME"
   ttl     = "300"
 
-  records = ["${aws_elasticsearch_domain.es.endpoint}"]
+  records = [aws_elasticsearch_domain.es.endpoint]
 }

variables.tf

@@ -1,17 +1,17 @@
 // Required
 variable "name" {
   description = "Elastic Search Service cluster name."
-  type        = "string"
+  type        = string
 }
 
 variable "subnet_ids" {
   description = "List of VPC Subnet IDs for the Elastic Search Service EndPoints will be created."
-  type        = "list"
+  type        = list
 }
 
 variable "vpc_id" {
   description = "Vpc id where the Elastic Search Service cluster will be launched."
-  type        = "string"
+  type        = string
 }
 
 // Optional
@@ -23,113 +23,113 @@ variable "create_iam_service_linked_role" {
 variable "zone_id" {
   default     = ""
   description = "Route 53 zone id where the DNS record will be created."
-  type        = "string"
+  type        = string
 }
 
 variable "access_policies" {
   default     = ""
   description = "IAM policy document specifying the access policies for the domain."
-  type        = "string"
+  type        = string
 }
 
 variable "dedicated_master" {
   default     = false
   description = "Indicates whether our cluster have dedicated master nodes enabled."
-  type        = "string"
+  type        = string
 }
 
 variable "encryption_enabled" {
   default     = "false"
   description = "Enable encription in Elastic Search."
-  type        = "string"
+  type        = string
 }
 
 variable "encryption_kms_key_id" {
   default     = ""
   description = "Enable encription in Elastic Search."
-  type        = "string"
+  type        = string
 }
 
 variable "elasticsearch_version" {
   default     = "5.5"
   description = "Elastic Search Service cluster version number."
-  type        = "string"
+  type        = string
 }
 
 variable "icount" {
   default     = 1
   description = "Elastic Search Service cluster Ec2 instance number."
-  type        = "string"
+  type        = string
 }
 
 variable "indices_fielddata_cache_size" {
   default     = ""
   description = "Percentage of Java heap space allocated to field data."
-  type        = "string"
+  type        = string
 }
 
 variable "indices_query_bool_max_clause_count" {
   default     = 1024
   description = "Maximum number of clauses allowed in a Lucene boolean query."
-  type        = "string"
+  type        = string
 }
 
 variable "ingress_allow_cidr_blocks" {
   default     = []
   description = "Specifies the ingress CIDR blocks allowed."
-  type        = "list"
+  type        = list
 }
 
 variable "ingress_allow_security_groups" {
   default     = []
   description = "Specifies the ingress security groups allowed."
-  type        = "list"
+  type        = list
 }
 
 variable "itype" {
   default     = "m4.large.elasticsearch"
   description = "Elastic Search Service cluster Ec2 instance type."
-  type        = "string"
+  type        = string
 }
 
 variable "mcount" {
   default     = 0
   description = "Elastic Search Service cluster dedicated master Ec2 instance number."
-  type        = "string"
+  type        = string
 }
 
 variable "mtype" {
   default     = ""
   description = "Elastic Search Service cluster dedicated master Ec2 instance type."
-  type        = "string"
+  type        = string
 }
 
 variable "zone_awareness" {
   default     = false
   description = "Indicates whether zone awareness is enabled."
-  type        = "string"
+  type        = string
 }
 
 variable "rest_action_multi_allow_explicit_index" {
   default     = "true"
   description = "Specifies whether explicit references to indices are allowed inside the body of HTTP requests."
-  type        = "string"
+  type        = string
 }
 
 variable "snapshot_start" {
   default     = 0
   description = "Elastic Search Service maintenance/snapshot start time."
-  type        = "string"
+  type        = string
 }
 
 variable "volume_size" {
   default     = "35"
   description = "Default size of the EBS volumes."
-  type        = "string"
+  type        = string
 }
 
 variable "volume_type" {
   default     = "gp2"
   description = "Default type of the EBS volumes."
-  type        = "string"
+  type        = string
 }