chore: Adds example of wrapping resource classes

Author: EspenAlbert

internal/config/resource_base.go

@@ -25,9 +25,17 @@ type ProviderMeta struct {
 	ScriptLocation types.String `tfsdk:"script_location"`
 }
 
+func AnalyticsResource(name string, resource resource.ResourceWithImportState) resource.Resource {
+	return &RSCommon{
+		ResourceName: name,
+		Resource:     resource,
+	}
+}
+
 type RSCommon struct {
 	Client       *MongoDBClient
 	ResourceName string
+	Resource     resource.ResourceWithImportState
 }
 
 func (r *RSCommon) ReadProviderMetaCreate(ctx context.Context, req *resource.CreateRequest, diags *diag.Diagnostics) ProviderMeta {
@@ -64,6 +72,34 @@ func (r *RSCommon) Metadata(ctx context.Context, req resource.MetadataRequest, r
 	resp.TypeName = fmt.Sprintf("%s_%s", req.ProviderTypeName, r.ResourceName)
 }
 
+func (r *RSCommon) Schema(ctx context.Context, req resource.SchemaRequest, resp *resource.SchemaResponse) {
+	r.Resource.Schema(ctx, req, resp)
+}
+
+func (r *RSCommon) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
+	meta := r.ReadProviderMetaCreate(ctx, &req, &resp.Diagnostics)
+	ctx = AddUserAgentExtra(ctx, UserAgentExtra{
+		ModuleName:    meta.ModuleName.ValueString(),
+		ModuleVersion: meta.ModuleVersion.ValueString(),
+		Name:          r.ResourceName,
+		Operation:     "create",
+	})
+	r.Resource.Create(ctx, req, resp) // Call original create
+}
+
+func (r *RSCommon) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
+	r.Resource.Read(ctx, req, resp)
+}
+func (r *RSCommon) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
+	r.Resource.Update(ctx, req, resp)
+}
+func (r *RSCommon) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
+	r.Resource.ImportState(ctx, req, resp)
+}
+func (r *RSCommon) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
+	r.Resource.Delete(ctx, req, resp)
+}
+
 func (r *RSCommon) Configure(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
 	client, err := configureClient(req.ProviderData)
 	if err != nil {

internal/provider/provider_sdk2.go

@@ -327,6 +327,49 @@ func providerConfigure(provider *schema.Provider) func(ctx context.Context, d *s
 	}
 }
 
+func NewAnalyticsResource(d *schema.Resource) *schema.Resource {
+	analyticsResource := AnalyticsResource{
+		resource: d,
+	}
+	return &schema.Resource{
+		// Original field mapping
+		Schema: d.Schema,
+		SchemaFunc: d.SchemaFunc,
+		// Overriding the CRUDI methods
+		CreateContext: analyticsResource.CreateContext,
+		ReadContext: analyticsResource.ReadContext,
+		UpdateContext: analyticsResource.UpdateContext,
+		DeleteContext: analyticsResource.DeleteContext,
+
+	}
+}
+
+type AnalyticsResource struct {
+	resource *schema.Resource
+}
+
+func (a *AnalyticsResource) CreateContext(ctx context.Context, r *schema.ResourceData, m interface{}) diag.Diagnostics {
+	// TODO: Add analytics
+	return a.resource.CreateContext(ctx, r, m)
+}
+
+// See Resource documentation.
+func (a *AnalyticsResource) ReadContext(ctx context.Context, r *schema.ResourceData, m interface{}) diag.Diagnostics {
+	return a.resource.ReadContext(ctx, r, m)
+}
+
+// See Resource documentation.
+func (a *AnalyticsResource) UpdateContext(ctx context.Context, r *schema.ResourceData, m interface{}) diag.Diagnostics {
+	return a.resource.UpdateContext(ctx, r, m)
+}
+
+// See Resource documentation.
+func (a *AnalyticsResource) DeleteContext(ctx context.Context, r *schema.ResourceData, m interface{}) diag.Diagnostics {
+	return a.resource.DeleteContext(ctx, r, m)
+}
+
+
+
 func setDefaultsAndValidations(d *schema.ResourceData) diag.Diagnostics {
 	diagnostics := []diag.Diagnostic{}
 

internal/service/federateddatabaseinstance/resource_federated_database_instance.go

@@ -13,6 +13,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
+	"github.com/mongodb/terraform-provider-mongodbatlas/internal/provider"
 )
 
 const (
@@ -24,7 +25,7 @@ const (
 )
 
 func Resource() *schema.Resource {
-	return &schema.Resource{
+	return provider.NewAnalyticsResource(&schema.Resource{
 		CreateContext: resourceCreate,
 		ReadContext:   resourceRead,
 		UpdateContext: resourceUpdate,
@@ -113,7 +114,7 @@ func Resource() *schema.Resource {
 			"storage_databases": schemaFederatedDatabaseInstanceDatabases(),
 			"storage_stores":    schemaFederatedDatabaseInstanceStores(),
 		},
-	}
+	})
 }
 
 func schemaFederatedDatabaseInstanceDatabases() *schema.Schema {

internal/service/project/resource_project.go

@@ -37,11 +37,7 @@ var _ resource.ResourceWithConfigure = &projectRS{}
 var _ resource.ResourceWithImportState = &projectRS{}
 
 func Resource() resource.Resource {
-	return &projectRS{
-		RSCommon: config.RSCommon{
-			ResourceName: projectResourceName,
-		},
-	}
+	return config.AnalyticsResource(projectResourceName, &projectRS{})
 }
 
 type projectRS struct {