Rename ResourceObject to Resource

Author: bbasata

list/list_resource.go

@@ -94,9 +94,9 @@ type ListResourceRequest struct {
 	// instances.
 	Config tfsdk.Config
 
-	// IncludeResourceObject indicates whether the provider should populate
-	// the ResourceObject field in the ListResourceEvent struct.
-	IncludeResourceObject bool
+	// IncludeResource indicates whether the provider should populate the
+	// Resource field in the ListResourceEvent struct.
+	IncludeResource bool
 }
 
 // ListResourceStream represents a streaming response to a ListResourceRequest.
@@ -123,12 +123,12 @@ type ListResourceEvent struct {
 	// A nil value will raise will raise a diagnostic.
 	Identity *tfsdk.ResourceIdentity
 
-	// ResourceObject is the provider's representation of the attributes of the
+	// Resource is the provider's representation of the attributes of the
 	// listed managed resource instance.
 	//
-	// If ListResourceRequest.IncludeResourceObject is true, a nil value will raise
+	// If ListResourceRequest.IncludeResource is true, a nil value will raise
 	// a warning diagnostic.
-	ResourceObject *tfsdk.ResourceObject
+	Resource *tfsdk.Resource
 
 	// DisplayName is a provider-defined human-readable description of the
 	// listed managed resource instance, intended for CLI and browser UIs.

tfsdk/resource_object.go renamed to tfsdk/resource.go

@@ -13,14 +13,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
-// ResourceObject represents a Terraform resource.
-type ResourceObject struct {
+// Resource represents a Terraform resource.
+type Resource struct {
 	Raw    tftypes.Value
 	Schema fwschema.Schema
 }
 
 // Get populates the struct passed as `target` with the resource.
-func (c ResourceObject) Get(ctx context.Context, target interface{}) diag.Diagnostics {
+func (c Resource) Get(ctx context.Context, target interface{}) diag.Diagnostics {
 	return c.data().Get(ctx, target)
 }
 
@@ -31,7 +31,7 @@ func (c ResourceObject) Get(ctx context.Context, target interface{}) diag.Diagno
 //
 // Attributes or elements under null or unknown collections return null
 // values, however this behavior is not protected by compatibility promises.
-func (c ResourceObject) GetAttribute(ctx context.Context, path path.Path, target interface{}) diag.Diagnostics {
+func (c Resource) GetAttribute(ctx context.Context, path path.Path, target interface{}) diag.Diagnostics {
 	return c.data().GetAtPath(ctx, path, target)
 }
 
@@ -40,11 +40,11 @@ func (c ResourceObject) GetAttribute(ctx context.Context, path path.Path, target
 // If a parent path is null or unknown, which would prevent a full expression
 // from matching, the parent path is returned rather than no match to prevent
 // false positives.
-func (c ResourceObject) PathMatches(ctx context.Context, pathExpr path.Expression) (path.Paths, diag.Diagnostics) {
+func (c Resource) PathMatches(ctx context.Context, pathExpr path.Expression) (path.Paths, diag.Diagnostics) {
 	return c.data().PathMatches(ctx, pathExpr)
 }
 
-func (c ResourceObject) data() fwschemadata.Data {
+func (c Resource) data() fwschemadata.Data {
 	return fwschemadata.Data{
 		Description:    fwschemadata.DataDescriptionConfiguration,
 		Schema:         c.Schema,