Merge pull request #29741 from hashicorp/jbardin/test-fix

fix test fixture with multiple provider instances

internal/terraform/context_apply_test.go

@@ -577,12 +577,18 @@ func TestContext2Apply_refCount(t *testing.T) {
 
 func TestContext2Apply_providerAlias(t *testing.T) {
 	m := testModule(t, "apply-provider-alias")
+
+	// Each provider instance must be completely independent to ensure that we
+	// are verifying the correct state of each.
+	p := func() (providers.Interface, error) {
 		p := testProvider("aws")
 		p.PlanResourceChangeFn = testDiffFn
 		p.ApplyResourceChangeFn = testApplyFn
+		return p, nil
+	}
 	ctx := testContext2(t, &ContextOpts{
 		Providers: map[addrs.Provider]providers.Factory{
-			addrs.NewDefaultProvider("aws"): testProviderFuncFixed(p),
+			addrs.NewDefaultProvider("aws"): p,
 		},
 	})
 
@@ -610,13 +616,18 @@ func TestContext2Apply_providerAlias(t *testing.T) {
 func TestContext2Apply_providerAliasConfigure(t *testing.T) {
 	m := testModule(t, "apply-provider-alias-configure")
 
-	p2 := testProvider("another")
+	// Each provider instance must be completely independent to ensure that we
-	p2.ApplyResourceChangeFn = testApplyFn
+	// are verifying the correct state of each.
-	p2.PlanResourceChangeFn = testDiffFn
+	p := func() (providers.Interface, error) {
+		p := testProvider("another")
+		p.ApplyResourceChangeFn = testApplyFn
+		p.PlanResourceChangeFn = testDiffFn
+		return p, nil
+	}
 
 	ctx := testContext2(t, &ContextOpts{
 		Providers: map[addrs.Provider]providers.Factory{
-			addrs.NewDefaultProvider("another"): testProviderFuncFixed(p2),
+			addrs.NewDefaultProvider("another"): p,
 		},
 	})
 
@@ -629,7 +640,11 @@ func TestContext2Apply_providerAliasConfigure(t *testing.T) {
 
 	// Configure to record calls AFTER Plan above
 	var configCount int32
-	p2.ConfigureProviderFn = func(req providers.ConfigureProviderRequest) (resp providers.ConfigureProviderResponse) {
+	p = func() (providers.Interface, error) {
+		p := testProvider("another")
+		p.ApplyResourceChangeFn = testApplyFn
+		p.PlanResourceChangeFn = testDiffFn
+		p.ConfigureProviderFn = func(req providers.ConfigureProviderRequest) (resp providers.ConfigureProviderResponse) {
 			atomic.AddInt32(&configCount, 1)
 
 			foo := req.Config.GetAttr("foo").AsString()
@@ -639,6 +654,14 @@ func TestContext2Apply_providerAliasConfigure(t *testing.T) {
 
 			return
 		}
+		return p, nil
+	}
+
+	ctx = testContext2(t, &ContextOpts{
+		Providers: map[addrs.Provider]providers.Factory{
+			addrs.NewDefaultProvider("another"): p,
+		},
+	})
 
 	state, diags := ctx.Apply(plan, m)
 	if diags.HasErrors() {
@@ -1540,8 +1563,11 @@ func TestContext2Apply_destroySkipsCBD(t *testing.T) {
 
 func TestContext2Apply_destroyModuleVarProviderConfig(t *testing.T) {
 	m := testModule(t, "apply-destroy-mod-var-provider-config")
+	p := func() (providers.Interface, error) {
 		p := testProvider("aws")
 		p.PlanResourceChangeFn = testDiffFn
+		return p, nil
+	}
 	state := states.NewState()
 	child := state.EnsureModule(addrs.RootModuleInstance.Child("child", addrs.NoKey))
 	child.SetResourceInstanceCurrent(
@@ -1554,7 +1580,7 @@ func TestContext2Apply_destroyModuleVarProviderConfig(t *testing.T) {
 	)
 	ctx := testContext2(t, &ContextOpts{
 		Providers: map[addrs.Provider]providers.Factory{
-			addrs.NewDefaultProvider("aws"): testProviderFuncFixed(p),
+			addrs.NewDefaultProvider("aws"): p,
 		},
 	})
 

internal/terraform/context_input_test.go

@@ -85,8 +85,7 @@ func TestContext2Input_provider(t *testing.T) {
 func TestContext2Input_providerMulti(t *testing.T) {
 	m := testModule(t, "input-provider-multi")
 
-	p := testProvider("aws")
+	getProviderSchemaResponse := getProviderSchemaResponseFromProviderSchema(&ProviderSchema{
-	p.GetProviderSchemaResponse = getProviderSchemaResponseFromProviderSchema(&ProviderSchema{
 		Provider: &configschema.Block{
 			Attributes: map[string]*configschema.Attribute{
 				"foo": {
@@ -108,6 +107,17 @@ func TestContext2Input_providerMulti(t *testing.T) {
 		},
 	})
 
+	// In order to update the provider to check only the configure calls during
+	// apply, we will need to inject a new factory function after plan. We must
+	// use a closure around the factory, because in order for the inputs to
+	// work during apply we need to maintain the same context value, preventing
+	// us from assigning a new Providers map.
+	providerFactory := func() (providers.Interface, error) {
+		p := testProvider("aws")
+		p.GetProviderSchemaResponse = getProviderSchemaResponse
+		return p, nil
+	}
+
 	inp := &MockUIInput{
 		InputReturnMap: map[string]string{
 			"provider.aws.foo":      "bar",
@@ -117,7 +127,9 @@ func TestContext2Input_providerMulti(t *testing.T) {
 
 	ctx := testContext2(t, &ContextOpts{
 		Providers: map[addrs.Provider]providers.Factory{
-			addrs.NewDefaultProvider("aws"): testProviderFuncFixed(p),
+			addrs.NewDefaultProvider("aws"): func() (providers.Interface, error) {
+				return providerFactory()
+			},
 		},
 		UIInput: inp,
 	})
@@ -132,12 +144,18 @@ func TestContext2Input_providerMulti(t *testing.T) {
 	plan, diags := ctx.Plan(m, states.NewState(), DefaultPlanOpts)
 	assertNoErrors(t, diags)
 
+	providerFactory = func() (providers.Interface, error) {
+		p := testProvider("aws")
+		p.GetProviderSchemaResponse = getProviderSchemaResponse
 		p.ConfigureProviderFn = func(req providers.ConfigureProviderRequest) (resp providers.ConfigureProviderResponse) {
 			lock.Lock()
 			defer lock.Unlock()
 			actual = append(actual, req.Config.GetAttr("foo").AsString())
 			return
 		}
+		return p, nil
+	}
+
 	if _, diags := ctx.Apply(plan, m); diags.HasErrors() {
 		t.Fatalf("apply errors: %s", diags.Err())
 	}