From a6ca01f49d8af10bd127f273cd011da57a0880c5 Mon Sep 17 00:00:00 2001 From: Martin Atkins Date: Mon, 7 May 2018 17:29:53 -0700 Subject: [PATCH] core: Fix TargetsTransformer tests Resolution of dependencies automatically from expressions now requires a schema to be available. To avoid the need to provide mock schemas for all of these different resource types, we instead use the depends_on argument here to mark the dependencies explicitly. --- .../transform-targets-basic/main.tf | 12 +++++++++--- .../transform-targets-destroy/main.tf | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/terraform/test-fixtures/transform-targets-basic/main.tf b/terraform/test-fixtures/transform-targets-basic/main.tf index b845a1de6..47edc2a7f 100644 --- a/terraform/test-fixtures/transform-targets-basic/main.tf +++ b/terraform/test-fixtures/transform-targets-basic/main.tf @@ -1,16 +1,22 @@ resource "aws_vpc" "me" {} resource "aws_subnet" "me" { - vpc_id = "${aws_vpc.me.id}" + depends_on = [ + aws_vpc.me, + ] } resource "aws_instance" "me" { - subnet_id = "${aws_subnet.me.id}" + depends_on = [ + aws_subnet.me, + ] } resource "aws_vpc" "notme" {} resource "aws_subnet" "notme" {} resource "aws_instance" "notme" {} resource "aws_instance" "notmeeither" { - name = "${aws_instance.me.id}" + depends_on = [ + aws_instance.me, + ] } diff --git a/terraform/test-fixtures/transform-targets-destroy/main.tf b/terraform/test-fixtures/transform-targets-destroy/main.tf index da99de43c..5c1c285e5 100644 --- a/terraform/test-fixtures/transform-targets-destroy/main.tf +++ b/terraform/test-fixtures/transform-targets-destroy/main.tf @@ -1,18 +1,26 @@ resource "aws_vpc" "notme" {} resource "aws_subnet" "notme" { - vpc_id = "${aws_vpc.notme.id}" + depends_on = [ + aws_vpc.notme, + ] } resource "aws_instance" "me" { - subnet_id = "${aws_subnet.notme.id}" + depends_on = [ + aws_subnet.notme, + ] } resource "aws_instance" "notme" {} resource "aws_instance" "metoo" { - name = "${aws_instance.me.id}" + depends_on = [ + aws_instance.me, + ] } resource "aws_elb" "me" { - instances = "${aws_instance.me.*.id}" + depends_on = [ + aws_instance.me, + ] }