fixup broken test fixtures

some of the minimal test provider implementations didn't check for null values.
hashicorp · Jun 2, 2022 · bcc0892 · bcc0892
1 parent c15260a
commit bcc0892
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 3 deletions.
diff --git a/internal/backend/local/testing.go b/internal/backend/local/testing.go
@@ -62,7 +62,14 @@ func TestLocalProvider(t *testing.T, b *Local, name string, schema *terraform.Pr
 		p.GetProviderSchemaResponse.DataSources[name] = providers.Schema{Block: dat}
 	}
 
-	p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse {
+	p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) (resp providers.PlanResourceChangeResponse) {
+		// this is a destroy plan,
+		if req.ProposedNewState.IsNull() {
+			resp.PlannedState = req.ProposedNewState
+			resp.PlannedPrivate = req.PriorPrivate
+			return resp
+		}
+
 		rSchema, _ := schema.SchemaForResourceType(addrs.ManagedResourceMode, req.TypeName)
 		if rSchema == nil {
 			rSchema = &configschema.Block{} // default schema is empty

diff --git a/internal/command/show_test.go b/internal/command/show_test.go
@@ -978,7 +978,14 @@ func showFixtureProvider() *terraform.MockProvider {
 			Private: req.Private,
 		}
 	}
-	p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse {
+	p.PlanResourceChangeFn = func(req providers.PlanResourceChangeRequest) (resp providers.PlanResourceChangeResponse) {
+		// this is a destroy plan,
+		if req.ProposedNewState.IsNull() {
+			resp.PlannedState = req.ProposedNewState
+			resp.PlannedPrivate = req.PriorPrivate
+			return resp
+		}
+
 		idVal := req.ProposedNewState.GetAttr("id")
 		amiVal := req.ProposedNewState.GetAttr("ami")
 		if idVal.IsNull() {

diff --git a/internal/moduletest/provider.go b/internal/moduletest/provider.go
@@ -240,9 +240,16 @@ func (p *Provider) UpgradeResourceState(req providers.UpgradeResourceStateReques
 
 // PlanResourceChange takes the current state and proposed state of a
 // resource, and returns the planned final state.
-func (p *Provider) PlanResourceChange(req providers.PlanResourceChangeRequest) providers.PlanResourceChangeResponse {
+func (p *Provider) PlanResourceChange(req providers.PlanResourceChangeRequest) (resp providers.PlanResourceChangeResponse) {
 	log.Print("[TRACE] moduletest.Provider: PlanResourceChange")
 
+	// this is a destroy plan,
+	if req.ProposedNewState.IsNull() {
+		resp.PlannedState = req.ProposedNewState
+		resp.PlannedPrivate = req.PriorPrivate
+		return resp
+	}
+
 	var res providers.PlanResourceChangeResponse
 	if req.TypeName != "test_assertions" { // we only have one resource type
 		res.Diagnostics = res.Diagnostics.Append(fmt.Errorf("unsupported resource type %s", req.TypeName))

diff --git a/internal/provider-simple-v6/provider.go b/internal/provider-simple-v6/provider.go
@@ -85,6 +85,13 @@ func (s simple) ReadResource(req providers.ReadResourceRequest) (resp providers.
 }
 
 func (s simple) PlanResourceChange(req providers.PlanResourceChangeRequest) (resp providers.PlanResourceChangeResponse) {
+	if req.ProposedNewState.IsNull() {
+		// destroy op
+		resp.PlannedState = req.ProposedNewState
+		resp.PlannedPrivate = req.PriorPrivate
+		return resp
+	}
+
 	m := req.ProposedNewState.AsValueMap()
 	_, ok := m["id"]
 	if !ok {

diff --git a/internal/provider-simple/provider.go b/internal/provider-simple/provider.go
@@ -85,6 +85,13 @@ func (s simple) ReadResource(req providers.ReadResourceRequest) (resp providers.
 }
 
 func (s simple) PlanResourceChange(req providers.PlanResourceChangeRequest) (resp providers.PlanResourceChangeResponse) {
+	if req.ProposedNewState.IsNull() {
+		// destroy op
+		resp.PlannedState = req.ProposedNewState
+		resp.PlannedPrivate = req.PriorPrivate
+		return resp
+	}
+
 	m := req.ProposedNewState.AsValueMap()
 	_, ok := m["id"]
 	if !ok {