From 38569c85082bd895df50b304c7bbe2641d4504b1 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Thu, 21 Sep 2017 13:06:47 -0500
Subject: [PATCH] add tests for get from tar subdir

Test that we can get a subdirectory from a tarball (or any other
"packed" source that we support).

The 'tar-subdir-to-parent' test highlights a regression where the
subdirectory module references a module in its parent directory. This
breaks the intended use ofr the subdirectory and the implementation in
go-getter. We need to fix this in terraform, and possible plan warnings
and deprecations for this type of source.
---
 .../test-fixtures/basic-tar-subdir/foo.tgz    | Bin 0 -> 236 bytes
 .../test-fixtures/basic-tar-subdir/main.tf    |   3 +
 .../tar-subdir-to-parent/foo.tgz              | Bin 0 -> 235 bytes
 .../tar-subdir-to-parent/main.tf              |   4 ++
 config/module/tree_test.go                    |  64 ++++++++++--------
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 config/module/test-fixtures/basic-tar-subdir/foo.tgz
 create mode 100644 config/module/test-fixtures/basic-tar-subdir/main.tf
 create mode 100644 config/module/test-fixtures/tar-subdir-to-parent/foo.tgz
 create mode 100644 config/module/test-fixtures/tar-subdir-to-parent/main.tf

diff --git a/config/module/test-fixtures/basic-tar-subdir/foo.tgz b/config/module/test-fixtures/basic-tar-subdir/foo.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..7ea938b7b3d689b9463009f22ee76ab1f6f8b47e
GIT binary patch
literal 236
zcmV<I02BWoiwFRP_`_KM1MSpJPQx$|hT*Jpict=bPU5k%;xI{nq$1i%NwX>9?wF=3
z0z?2IgAnhtnT-|A<g=$-3}d&*l2X;idpXxIRjqBR7gD(@Xw$g5GSRB`!7}k_+nS8S
zvF&3kw_V$>w)=O_#bcYz%y%wxT<afEp7Zb8Q^Gs&_57VPCI6o=<-cpU`|>z9-gm_R
z5zJ=tx9}=|Q*)VUqJCcZ=lSmrtMP6vMV!8n`&^>oF!sx}+(=PAErue0$bY*_r1HG~
m)9ru{-~XHaZ$Ulp9{>OV000000001h&w2zDNG!GhC;$MV9(o@D

literal 0
HcmV?d00001

diff --git a/config/module/test-fixtures/basic-tar-subdir/main.tf b/config/module/test-fixtures/basic-tar-subdir/main.tf
new file mode 100644
index 000000000..ceb0a19de
--- /dev/null
+++ b/config/module/test-fixtures/basic-tar-subdir/main.tf
@@ -0,0 +1,3 @@
+module "foo" {
+    source = "./foo.tgz//sub"
+}
diff --git a/config/module/test-fixtures/tar-subdir-to-parent/foo.tgz b/config/module/test-fixtures/tar-subdir-to-parent/foo.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..62125bf1a1259dc01162c56f2d29a1fe0392263b
GIT binary patch
literal 235
zcmV<H02KcpiwFR?`NLTN1MSpJYQr!PhGDOLiopkvC3|G8dKkM-ASFLw$D4%Sy{a7o
zrNjh^la{^@g4qZ$qYuX9{m|seqO7&Sdl_prRa@v(FT|CuvLR?y7GhoDgG<CO+ty_0
zk98MYd28yf-Ry7Pi`UlcnRhO8T<afU#{75nW^ayj<NZYZk4kkWe+}3CefZ2@t=B~C
zLj8R4&-33M+F`qrEKZ-vIhCkC4BhKWUL-RnZ|YN)zNgP_6AKv={yqD@ES!$}UjzI9
l5vKf~y#K%Duko<|0RR91000000002E*9UbxW%d9l008ztb?pEE

literal 0
HcmV?d00001

diff --git a/config/module/test-fixtures/tar-subdir-to-parent/main.tf b/config/module/test-fixtures/tar-subdir-to-parent/main.tf
new file mode 100644
index 000000000..c42fca033
--- /dev/null
+++ b/config/module/test-fixtures/tar-subdir-to-parent/main.tf
@@ -0,0 +1,4 @@
+module "foo" {
+	// the module in sub references sibling module baz via "../baz"
+    source = "./foo.tgz//sub"
+}
diff --git a/config/module/tree_test.go b/config/module/tree_test.go
index 87bf1df67..a08dc2cd4 100644
--- a/config/module/tree_test.go
+++ b/config/module/tree_test.go
@@ -209,40 +209,50 @@ func TestTreeLoad_parentRef(t *testing.T) {
 }
 
 func TestTreeLoad_subdir(t *testing.T) {
-	storage := testStorage(t)
-	tree := NewTree("", testConfig(t, "basic-subdir"))
-
-	if tree.Loaded() {
-		t.Fatal("should not be loaded")
+	fixtures := []string{
+		"basic-subdir",
+		"basic-tar-subdir",
+		"tar-sbudir-to-parent",
 	}
 
-	// This should error because we haven't gotten things yet
-	if err := tree.Load(storage, GetModeNone); err == nil {
-		t.Fatal("should error")
-	}
+	for _, tc := range fixtures {
+		t.Run(tc, func(t *testing.T) {
+			storage := testStorage(t)
+			tree := NewTree("", testConfig(t, tc))
 
-	if tree.Loaded() {
-		t.Fatal("should not be loaded")
-	}
+			if tree.Loaded() {
+				t.Fatal("should not be loaded")
+			}
 
-	// This should get things
-	if err := tree.Load(storage, GetModeGet); err != nil {
-		t.Fatalf("err: %s", err)
-	}
+			// This should error because we haven't gotten things yet
+			if err := tree.Load(storage, GetModeNone); err == nil {
+				t.Fatal("should error")
+			}
 
-	if !tree.Loaded() {
-		t.Fatal("should be loaded")
-	}
+			if tree.Loaded() {
+				t.Fatal("should not be loaded")
+			}
 
-	// This should no longer error
-	if err := tree.Load(storage, GetModeNone); err != nil {
-		t.Fatalf("err: %s", err)
-	}
+			// This should get things
+			if err := tree.Load(storage, GetModeGet); err != nil {
+				t.Fatalf("err: %s", err)
+			}
 
-	actual := strings.TrimSpace(tree.String())
-	expected := strings.TrimSpace(treeLoadSubdirStr)
-	if actual != expected {
-		t.Fatalf("bad: \n\n%s", actual)
+			if !tree.Loaded() {
+				t.Fatal("should be loaded")
+			}
+
+			// This should no longer error
+			if err := tree.Load(storage, GetModeNone); err != nil {
+				t.Fatalf("err: %s", err)
+			}
+
+			actual := strings.TrimSpace(tree.String())
+			expected := strings.TrimSpace(treeLoadSubdirStr)
+			if actual != expected {
+				t.Fatalf("bad: \n\n%s", actual)
+			}
+		})
 	}
 }