Merge pull request #17 from ec2dream/master

egarbi · web-flow · commit fa44d9e0054f · 2019-10-31T13:59:33.000+01:00
terraform v0.12 support
diff --git a/main.tf b/main.tf
@@ -12,7 +12,7 @@ resource "aws_security_group_rule" "secure_cidrs" {
   from_port   = 443
   to_port     = 443
   protocol    = "TCP"
-  cidr_blocks = ["${var.ingress_allow_cidr_blocks}"]
+  cidr_blocks = var.ingress_allow_cidr_blocks
 
   security_group_id = "${aws_security_group.elasticsearch.id}"
 }
@@ -61,10 +61,10 @@ resource "aws_elasticsearch_domain" "es" {
 
   vpc_options {
     security_group_ids = ["${aws_security_group.elasticsearch.id}"]
-    subnet_ids         = ["${var.subnet_ids}"]
+    subnet_ids         = var.subnet_ids
   }
 
-  advanced_options {
+  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}"
@@ -80,7 +80,7 @@ resource "aws_elasticsearch_domain" "es" {
     automated_snapshot_start_hour = "${var.snapshot_start}"
   }
 
-  tags {
+  tags = {
     Domain = "${var.name}"
   }
 }
diff --git a/versions.tf b/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ resource "aws_security_group_rule" "secure_cidrs" {`
`12`	`12`	`from_port = 443`
`13`	`13`	`to_port = 443`
`14`	`14`	`protocol = "TCP"`
`15`		`- cidr_blocks = ["${var.ingress_allow_cidr_blocks}"]`
	`15`	`+ cidr_blocks = var.ingress_allow_cidr_blocks`
`16`	`16`
`17`	`17`	`security_group_id = "${aws_security_group.elasticsearch.id}"`
`18`	`18`	`}`
`@@ -61,10 +61,10 @@ resource "aws_elasticsearch_domain" "es" {`
`61`	`61`
`62`	`62`	`vpc_options {`
`63`	`63`	`security_group_ids = ["${aws_security_group.elasticsearch.id}"]`
`64`		`- subnet_ids = ["${var.subnet_ids}"]`
	`64`	`+ subnet_ids = var.subnet_ids`
`65`	`65`	`}`
`66`	`66`
`67`		`- advanced_options {`
	`67`	`+ advanced_options = {`
`68`	`68`	`"rest.action.multi.allow_explicit_index" = "${var.rest_action_multi_allow_explicit_index}"`
`69`	`69`	`"indices.fielddata.cache.size" = "${var.indices_fielddata_cache_size}"`
`70`	`70`	`"indices.query.bool.max_clause_count" = "${var.indices_query_bool_max_clause_count}"`
`@@ -80,7 +80,7 @@ resource "aws_elasticsearch_domain" "es" {`
`80`	`80`	`automated_snapshot_start_hour = "${var.snapshot_start}"`
`81`	`81`	`}`
`82`	`82`
`83`		`- tags {`
	`83`	`+ tags = {`
`84`	`84`	`Domain = "${var.name}"`
`85`	`85`	`}`
`86`	`86`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +terraform {
 +  required_version = ">= 0.12"
 +}