chore: update testdata with separate bundle

Author: mjyocca

internal/stacks/stackconfig/config_test.go

@@ -286,31 +286,32 @@ func TestOmittingBuiltInProviders(t *testing.T) {
 }
 
 func TestComponentSourceResolution(t *testing.T) {
-	bundle, err := sourcebundle.OpenDir("testdata/basics-bundle")
+	stackResourceName := "pet-nulls"
+	bundle, err := sourcebundle.OpenDir("testdata/embedded-stack-bundle")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	rootAddr := sourceaddrs.MustParseSource("git::https://example.com/component-test.git").(sourceaddrs.RemoteSource)
+	rootAddr := sourceaddrs.MustParseSource("git::https://example.com/root.git").(sourceaddrs.RemoteSource)
 	config, diags := LoadConfigDir(rootAddr, bundle)
 	if len(diags) != 0 {
 		t.Fatalf("unexpected diagnostics:\n%s", diags.NonFatalErr().Error())
 	}
 
 	t.Run("component source resolution", func(t *testing.T) {
 		// Verify that the component was loaded
-		if got, want := len(config.Root.Stack.Components), 1; got != want {
+		if got, want := len(config.Root.Stack.EmbeddedStacks), 1; got != want {
 			t.Errorf("wrong number of components %d; want %d", got, want)
 		}
 
 		t.Run("pet-nulls component", func(t *testing.T) {
-			cmpn, ok := config.Root.Stack.Components["pet-nulls"]
+			cmpn, ok := config.Root.Stack.EmbeddedStacks[stackResourceName]
 			if !ok {
-				t.Fatal("Root stack config has no component named \"pet-nulls\".")
+				t.Fatalf("Root stack config has no component named %q.", stackResourceName)
 			}
 
 			// Verify component name
-			if got, want := cmpn.Name, "pet-nulls"; got != want {
+			if got, want := cmpn.Name, stackResourceName; got != want {
 				t.Errorf("wrong component name\ngot:  %s\nwant: %s", got, want)
 			}
 
@@ -320,7 +321,7 @@ func TestComponentSourceResolution(t *testing.T) {
 				t.Fatalf("expected ComponentSource, got %T", cmpn.SourceAddr)
 			}
 
-			expectedSourceStr := "app.staging.terraform.io/component-configurations/pet-nulls"
+			expectedSourceStr := "example.com/awesomecorp/tfstack-pet-nulls"
 			if got := componentSource.String(); got != expectedSourceStr {
 				t.Errorf("wrong source address\ngot:  %s\nwant: %s", got, expectedSourceStr)
 			}

internal/stacks/stackconfig/testdata/basics-bundle/component-test/main.tfcomponent.hcl

@@ -31,16 +31,6 @@
             "local": "builtin",
             "meta": {}
         },
-        {
-            "source": "git::https://example.com/component-test.git",
-            "local": "component-test",
-            "meta": {}
-        },
-        {
-            "source": "git::https://example.com/pet-nulls.git?ref=v0.0.2",
-            "local": "pet-nulls",
-            "meta": {}
-        }
     ],
     "registry": [
         {
@@ -54,18 +44,5 @@
                 }
             }
         }
-    ],
-    "components": [
-        {
-            "source": "app.staging.terraform.io/component-configurations/pet-nulls",
-            "versions": {
-                "0.0.1": {
-                    "source": "git::https://example.com/pet-nulls.git?ref=v0.0.1"
-                },
-                "0.0.2": {
-                    "source": "git::https://example.com/pet-nulls.git?ref=v0.0.2"
-                }
-            }
-        }
     ]
-}
+}

internal/stacks/stackconfig/testdata/basics-bundle/component-test/variables.tfcomponent.hcl

@@ -0,0 +1,17 @@
+variable "name" {
+  type = string
+}
+
+resource "null_resource" "example" {
+  triggers = {
+    name = var.name
+  }
+}
+
+output "greeting" {
+  value = "Hello, ${var.name}!"
+}
+
+output "resource_id" {
+  value = null_resource.example.id
+}

internal/stacks/stackconfig/testdata/basics-bundle/pet-nulls/main.tf

@@ -0,0 +1,22 @@
+
+required_providers {
+  null = {
+    source  = "hashicorp/null"
+    version = "3.2.1"
+  }
+}
+
+variable "name" {
+  type = string
+}
+
+component "a" {
+  source = "./a"
+
+  inputs = {
+    name = var.name
+  }
+  providers = {
+    null = var.provider
+  }
+}

internal/stacks/stackconfig/testdata/basics-bundle/terraform-sources.json

@@ -0,0 +1,24 @@
+required_providers {
+  null = {
+    source  = "hashicorp/null"
+    version = "3.2.1"
+  }
+}
+
+
+stack "pet-nulls" {
+  source  = "example.com/awesomecorp/tfstack-pet-nulls"
+  version = "0.0.2"
+
+  inputs = {
+    name     = var.name
+    provider = provider.null.a
+  }
+}
+
+provider "null" "a" {
+}
+
+locals {
+  sound = "bleep bloop"
+}

internal/stacks/stackconfig/testdata/embedded-stack-bundle/component/a/main.tf

@@ -0,0 +1,29 @@
+{
+  "terraform_source_bundle": 1,
+  "packages": [
+    {
+      "source": "git::https://example.com/root.git",
+      "local": "root",
+      "meta": {}
+    },
+    {
+      "source": "git::https://example.com/pet-nulls.git?ref=0.0.2",
+      "local": "component",
+      "meta": {}
+    }
+  ],
+  "registry": [],
+  "components": [
+    {
+      "source": "example.com/awesomecorp/tfstack-pet-nulls",
+      "versions": {
+        "0.0.1": {
+          "source": "git::https://example.com/pet-nulls.git?ref=0.0.1"
+        },
+        "0.0.2": {
+          "source": "git::https://example.com/pet-nulls.git?ref=0.0.2"
+        }
+      }
+    }
+  ]
+}