refactor: Simplify user agent name handling and remove unnecessary string manipulation

Author: EspenAlbert

internal/config/resource_base.go

@@ -150,7 +150,7 @@ func (r *RSCommon) SetClient(client *MongoDBClient) {
 func (r *RSCommon) asUserAgentExtra(ctx context.Context, reqOperation string, reqProviderMeta tfsdk.Config) UserAgentExtra {
 	var meta ProviderMeta
 	uaExtra := UserAgentExtra{
-		Name:      r.ResourceName,
+		Name:      userAgentNameValue(r.ResourceName),
 		Operation: reqOperation,
 	}
 	if reqProviderMeta.Raw.IsNull() {

internal/config/resource_base_sdkv2.go

@@ -178,7 +178,7 @@ func (a *AnalyticsResourceSDKv2) updateContextWithProviderMeta(ctx context.Conte
 	}
 
 	uaExtra := UserAgentExtra{
-		Name:          a.name,
+		Name:          userAgentNameValue(a.name),
 		Operation:     operationName,
 		Extras:        meta.UserAgentExtra,
 		ModuleName:    moduleName,

internal/config/user_agent.go

@@ -33,6 +33,10 @@ type UserAgentExtra struct {
 	ModuleVersion string
 }
 
+func userAgentNameValue(name string) string {
+	return strings.TrimPrefix(name, "mongodbatlas_")
+}
+
 // Combine returns a new UserAgentExtra by merging the receiver with another.
 // Non-empty fields in 'other' take precedence over the receiver's fields.
 func (e UserAgentExtra) Combine(other UserAgentExtra) UserAgentExtra {

internal/provider/provider_sdk2.go

@@ -3,7 +3,6 @@ package provider
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -292,9 +291,8 @@ func getResourcesMap() map[string]*schema.Resource {
 		"mongodbatlas_cluster_outage_simulation":                                   clusteroutagesimulation.Resource(),
 	}
 	analyticsMap := map[string]*schema.Resource{}
-	for fullName, resource := range resourcesMap {
-		name := strings.TrimPrefix(fullName, "mongodbatlas_")
-		analyticsMap[fullName] = config.NewAnalyticsResourceSDKv2(resource, name)
+	for name, resource := range resourcesMap {
+		analyticsMap[name] = config.NewAnalyticsResourceSDKv2(resource, name)
 	}
 	return analyticsMap
 }