Merge pull request #7273 from terraform-providers/td-aws_instance-dat…

…asource-0.12-syntax service/ec2: Various Terraform 0.12 syntax fixes
hashicorp · Jan 23, 2019 · 51d7335 · 51d7335
2 parents 0b8c5aa + ba4486f
commit 51d7335
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/aws/data_source_aws_instance_test.go b/aws/data_source_aws_instance_test.go
@@ -336,7 +336,7 @@ resource "aws_instance" "web" {
 }
 
 data "aws_instance" "web-instance" {
-  instance_tags {
+  instance_tags = {
     Name = "${aws_instance.web.tags["Name"]}"
     TestSeed = "%d"
   }

diff --git a/aws/data_source_aws_instances_test.go b/aws/data_source_aws_instances_test.go
@@ -87,7 +87,11 @@ resource "aws_instance" "test" {
 data "aws_instances" "test" {
   filter {
     name = "instance-id"
-    values = ["${aws_instance.test.*.id}"]
+    values = [
+      "${aws_instance.test.*.id[0]}",
+      "${aws_instance.test.*.id[1]}",
+      "${aws_instance.test.*.id[2]}",
+    ]
   }
 }
 `
@@ -121,7 +125,7 @@ resource "aws_instance" "test" {
 }
 
 data "aws_instances" "test" {
-  instance_tags {
+  instance_tags = {
     Name      = "${aws_instance.test.0.tags["Name"]}"
     SecondTag = "${aws_instance.test.1.tags["Name"]}"
   }
@@ -157,7 +161,7 @@ resource "aws_instance" "test" {
 }
 
 data "aws_instances" "test" {
-  instance_tags {
+  instance_tags = {
     Name = "${aws_instance.test.0.tags["Name"]}"
   }
   

diff --git a/website/docs/d/instances.html.markdown b/website/docs/d/instances.html.markdown
@@ -25,7 +25,7 @@ and you'd need to re-run `apply` every time an instance comes up or dies.
 
 ```hcl
 data "aws_instances" "test" {
-  instance_tags {
+  instance_tags = {
     Role = "HardWorker"
   }