always set RawExpr, test file-based mocks

Author: dsa0x

internal/command/test_test.go

@@ -52,7 +52,6 @@ func TestTest_Runs(t *testing.T) {
 		initCode              int
 		skip                  bool
 		description           string
-		selectFiles           []string
 	}{
 		"simple_pass": {
 			expectedOut: []string{"1 passed, 0 failed."},
@@ -429,6 +428,10 @@ func TestTest_Runs(t *testing.T) {
 			},
 			code: 1,
 		},
+		"mock-sources-inline": {
+			expectedOut: []string{"2 passed, 0 failed."},
+			code:        0,
+		},
 	}
 	for name, tc := range tcs {
 		t.Run(name, func(t *testing.T) {

internal/command/testdata/test/mock-sources-inline/main.tf

@@ -0,0 +1,27 @@
+terraform {
+  required_providers {
+    test = {
+      source = "hashicorp/test"
+    }
+  }
+}
+
+provider "test" {
+  alias = "secondary"
+}
+
+resource "test_resource" "foo" {
+  value = "foo"
+}
+
+resource "test_resource" "bar" {
+  provider = test.secondary
+  value    = "bar"
+}
+
+output "foo" {
+  value = test_resource.foo.id
+}
+output "bar" {
+  value = test_resource.bar.id
+}

internal/command/testdata/test/mock-sources-inline/main.tftest.hcl

@@ -0,0 +1,30 @@
+
+mock_provider "test" {
+  source = "./testing/base"
+
+  mock_resource "test_resource" {
+    defaults = {
+      id = "local-mock-id" // should override the file-based mock
+    }
+  }
+}
+
+mock_provider "test" {
+  source = "./testing/base"
+  alias = "secondary"
+}
+
+run "test_foo" {
+  assert {
+    condition     = output.foo == "local-mock-id"
+    error_message = "invalid value"
+  }
+}
+
+
+run "test_bar" {
+  assert {
+    condition     = output.bar == "file-mock-id"
+    error_message = "invalid value"
+  }
+}

internal/command/testdata/test/mock-sources-inline/testing/base/.ignored.tfmock.hcl

@@ -0,0 +1,9 @@
+# If read, this file should cause issues. But, it should be ignored.
+
+mock_resource "test_resource" {}
+
+mock_data "test_resource" {}
+
+override_resource {
+  target = test_resource.foo
+}

internal/command/testdata/test/mock-sources-inline/testing/base/resource.tfmock.hcl

@@ -0,0 +1,5 @@
+mock_resource "test_resource" {
+  defaults = {
+    id = "file-mock-id"
+  }
+}

internal/configs/config_build_test.go

@@ -14,7 +14,6 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/zclconf/go-cty/cty"
 
 	version "github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl/v2"
@@ -394,19 +393,6 @@ func TestBuildConfig_WithMockDataSourcesInline(t *testing.T) {
 	if cfg == nil {
 		t.Fatal("got nil config; want non-nil")
 	}
-
-	provider := cfg.Module.Tests["main.tftest.hcl"].Providers["aws"]
-
-	// This time we want to check that the mock data defined inline took
-	// precedence over the mock data defined in the data files.
-	defaults := provider.MockData.MockResources["aws_s3_bucket"].Defaults
-	expected := cty.ObjectVal(map[string]cty.Value{
-		"arn": cty.StringVal("aws:s3:::bucket"),
-	})
-
-	if !defaults.RawEquals(expected) {
-		t.Errorf("expected: %s\nactual:   %s", expected.GoString(), defaults.GoString())
-	}
 }
 
 func TestBuildConfig_WithNestedTestModules(t *testing.T) {

internal/configs/mock_provider.go

@@ -181,7 +181,7 @@ type MockResource struct {
 	Type string
 
 	Defaults cty.Value
-	RawValue hcl.Expression
+	RawExpr  hcl.Expression
 
 	// UseForPlan is true if the values should be computed during the planning
 	// phase.
@@ -332,11 +332,11 @@ func decodeMockResourceBlock(block *hcl.Block, useForPlanDefault bool) (*MockRes
 
 	if defaults, exists := content.Attributes["defaults"]; exists {
 		resource.DefaultsRange = defaults.Range
-		resource.RawValue = defaults.Expr
+		resource.RawExpr = defaults.Expr
 	} else {
 		// It's fine if we don't have any defaults, just means we'll generate
 		// values for everything ourselves.
-		resource.Defaults = cty.NilVal
+		resource.RawExpr = hcl.StaticExpr(cty.EmptyObjectVal, hcl.Range{})
 	}
 
 	useForPlan, useForPlanDiags := useForPlan(content, useForPlanDefault)
@@ -480,6 +480,11 @@ func decodeOverrideBlock(block *hcl.Block, attributeName string, blockName strin
 	if attribute, exists := content.Attributes[attributeName]; exists {
 		override.ValuesRange = attribute.Range
 		override.RawExpr = attribute.Expr
+	} else {
+		// It's fine if we don't have any values, just means we'll generate
+		// values for everything ourselves. We set this to an empty object so
+		// it's equivalent to `values = {}` which makes later processing easier.
+		override.RawExpr = hcl.StaticExpr(cty.EmptyObjectVal, hcl.Range{})
 	}
 
 	useForPlan, useForPlanDiags := useForPlan(content, useForPlanDefault)

internal/configs/parser_config_dir_test.go

@@ -280,12 +280,6 @@ func TestParserLoadTestFiles_Invalid(t *testing.T) {
 			"invalid_data_override_target.tftest.hcl:8,3-24: Invalid override target; You can only target data sources from override_data blocks, not module.child.",
 			"invalid_data_override_target.tftest.hcl:3,3-31: Invalid override target; You can only target data sources from override_data blocks, not aws_instance.target.",
 		},
-		"invalid_mock_data_sources": {
-			"invalid_mock_data_sources.tftest.hcl:7,13-16: Variables not allowed; Variables may not be used here.",
-		},
-		"invalid_mock_resources": {
-			"invalid_mock_resources.tftest.hcl:7,13-16: Variables not allowed; Variables may not be used here.",
-		},
 		"invalid_module_override": {
 			"invalid_module_override.tftest.hcl:5,1-16: Missing target attribute; override_module blocks must specify a target address.",
 			"invalid_module_override.tftest.hcl:11,3-9: Unsupported argument; An argument named \"values\" is not expected here.",

internal/moduletest/graph/node_provider.go

@@ -82,12 +82,12 @@ func (n *NodeProviderConfigure) Execute(ctx *EvalContext) {
 	// mock data, so we will evaluate the data here.
 	if mock, ok := n.Provider.(*providers.Mock); ok {
 		for _, res := range mock.Data.MockResources {
-			values, hclDiags := res.RawValue.Value(hclContext)
+			values, hclDiags := res.RawExpr.Value(hclContext)
 			n.File.Diagnostics.Append(hclDiags)
 			res.Defaults = values
 		}
 		for _, res := range mock.Data.MockDataSources {
-			values, hclDiags := res.RawValue.Value(hclContext)
+			values, hclDiags := res.RawExpr.Value(hclContext)
 			n.File.Diagnostics.Append(hclDiags)
 			res.Defaults = values
 		}

internal/moduletest/graph/transform_providers.go

@@ -44,14 +44,12 @@ func (t *TestProvidersTransformer) Transform(g *terraform.Graph) error {
 		if err != nil {
 			return fmt.Errorf("could not create provider instance: %w", err)
 		}
-		var mock *providers.Mock
 
 		if config.Mock {
-			mock = &providers.Mock{
+			impl = &providers.Mock{
 				Provider: impl,
 				Data:     config.MockData,
 			}
-			impl = mock
 		}
 
 		addr := addrs.RootProviderConfig{