chore: Remove unneeded Atlas versions (#3752)

* remove Atlas version 20240805

* remove admin20240530 version from resources except cluster

* NormalizeBaseURL

Author: lantoli

go.mod

@@ -33,7 +33,6 @@ require (
 	github.com/zclconf/go-cty v1.17.0
 	go.mongodb.org/atlas v0.38.0
 	go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
-	go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.1-0.20250402112219-2468c5354718 // uses api-bot-update-v20240805-backport-cluster to support AdvancedConfiguration in create/updateCluster APIs
 	go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0
 	go.mongodb.org/realm v0.1.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -43,6 +42,7 @@ require (
 	github.com/hashicorp/terraform-json v0.27.2
 	github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0
 	go.mongodb.org/atlas-sdk/v20250312007 v20250312007.0.0
+	golang.org/x/oauth2 v0.31.0
 )
 
 require (
@@ -163,7 +163,6 @@ require (
 	golang.org/x/crypto v0.42.0 // indirect
 	golang.org/x/mod v0.27.0 // indirect
 	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/oauth2 v0.31.0 // indirect
 	golang.org/x/sync v0.17.0 // indirect
 	golang.org/x/sys v0.36.0 // indirect
 	golang.org/x/text v0.29.0 // indirect

go.sum

@@ -1364,8 +1364,6 @@ go.mongodb.org/atlas v0.38.0 h1:zfwymq20GqivGwxPZfypfUDry+WwMGVui97z1d8V4bU=
 go.mongodb.org/atlas v0.38.0/go.mod h1:DJYtM+vsEpPEMSkQzJnFHrT0sP7ev6cseZc/GGjJYG8=
 go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0 h1:d/gbYJ+obR0EM/3DZf7+ZMi2QWISegm3mid7Or708cc=
 go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0/go.mod h1:O47ZrMMfcWb31wznNIq2PQkkdoFoK0ea2GlmRqGJC2s=
-go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.1-0.20250402112219-2468c5354718 h1:M2mNSBdTkP+paQ1qZ6FliiPdTEbDR9m9qvv4vsWoJAw=
-go.mongodb.org/atlas-sdk/v20240805005 v20240805005.0.1-0.20250402112219-2468c5354718/go.mod h1:PeByRxdvzfvz7xhG5vDn60j836EoduWqTqs76okUc9c=
 go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0 h1:aaU2E4rtzYXuEDxv9MoSON2gOEAA9M2gsDf2CqjcGj8=
 go.mongodb.org/atlas-sdk/v20241113005 v20241113005.0.0/go.mod h1:eV9REWR36iVMrpZUAMZ5qPbXEatoVfmzwT+Ue8yqU+U=
 go.mongodb.org/atlas-sdk/v20250312007 v20250312007.0.0 h1:2k6eXWQzTpbc/maZotRIoyXq3l/pbCF1RBMt+WnuB0I=

internal/config/client.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	admin20240530 "go.mongodb.org/atlas-sdk/v20240530005/admin"
-	admin20240805 "go.mongodb.org/atlas-sdk/v20240805005/admin"
 	admin20241113 "go.mongodb.org/atlas-sdk/v20241113005/admin"
 	"go.mongodb.org/atlas-sdk/v20250312007/admin"
 	matlasClient "go.mongodb.org/atlas/mongodbatlas"
@@ -71,17 +70,16 @@ func tfLoggingInterceptor(base http.RoundTripper) http.RoundTripper {
 	return logging.NewTransport("Atlas", base)
 }
 
-// MongoDBClient contains the mongodbatlas clients and configurations
+// MongoDBClient contains the mongodbatlas clients and configurations.
 type MongoDBClient struct {
 	Atlas            *matlasClient.Client
 	AtlasV2          *admin.APIClient
 	AtlasPreview     *adminpreview.APIClient
-	AtlasV220240805  *admin20240805.APIClient // used in advanced_cluster to avoid adopting 2024-10-23 release with ISS autoscaling
-	AtlasV220240530  *admin20240530.APIClient // used in advanced_cluster and cloud_backup_schedule for avoiding breaking changes (supporting deprecated replication_specs.id)
-	AtlasV220241113  *admin20241113.APIClient // used in teams and atlas_users to avoiding breaking changes
+	AtlasV220240530  *admin20240530.APIClient // Used in cluster to support deprecated attributes default_read_concern and fail_index_key_too_long in advanced_configuration.
+	AtlasV220241113  *admin20241113.APIClient // Used in teams and atlas_users to avoiding breaking changes.
 	Realm            *RealmClient
-	BaseURL          string // needed by organization resource
-	TerraformVersion string // needed by organization resource
+	BaseURL          string // Needed by organization resource.
+	TerraformVersion string // Needed by organization resource.
 }
 
 type RealmClient struct {
@@ -121,10 +119,6 @@ func NewClient(c *Credentials, terraformVersion string) (*MongoDBClient, error)
 	if err != nil {
 		return nil, err
 	}
-	sdkV220240805Client, err := newSDKV220240805Client(client, c.BaseURL, userAgent)
-	if err != nil {
-		return nil, err
-	}
 	sdkV220241113Client, err := newSDKV220241113Client(client, c.BaseURL, userAgent)
 	if err != nil {
 		return nil, err
@@ -135,14 +129,13 @@ func NewClient(c *Credentials, terraformVersion string) (*MongoDBClient, error)
 		AtlasV2:          sdkV2Client,
 		AtlasPreview:     sdkPreviewClient,
 		AtlasV220240530:  sdkV220240530Client,
-		AtlasV220240805:  sdkV220240805Client,
 		AtlasV220241113:  sdkV220241113Client,
 		BaseURL:          c.BaseURL,
 		TerraformVersion: terraformVersion,
 		Realm: &RealmClient{
 			publicKey:        c.PublicKey,
 			privateKey:       c.PrivateKey,
-			realmBaseURL:     c.RealmBaseURL,
+			realmBaseURL:     NormalizeBaseURL(c.RealmBaseURL),
 			terraformVersion: terraformVersion,
 		},
 	}
@@ -204,15 +197,6 @@ func newSDKV220240530Client(client *http.Client, baseURL, userAgent string) (*ad
 	)
 }
 
-func newSDKV220240805Client(client *http.Client, baseURL, userAgent string) (*admin20240805.APIClient, error) {
-	return admin20240805.NewClient(
-		admin20240805.UseHTTPClient(client),
-		admin20240805.UseUserAgent(userAgent),
-		admin20240805.UseBaseURL(baseURL),
-		admin20240805.UseDebug(false),
-	)
-}
-
 func newSDKV220241113Client(client *http.Client, baseURL, userAgent string) (*admin20241113.APIClient, error) {
 	return admin20241113.NewClient(
 		admin20241113.UseHTTPClient(client),
@@ -234,9 +218,9 @@ func (r *RealmClient) Get(ctx context.Context) (*realm.Client, error) {
 
 	authConfig := realmAuth.NewConfig(nil)
 	if r.realmBaseURL != "" {
-		adminURL := r.realmBaseURL + "api/admin/v3.0/"
+		adminURL := r.realmBaseURL + "/api/admin/v3.0/"
 		optsRealm = append(optsRealm, realm.SetBaseURL(adminURL))
-		authConfig.AuthURL, _ = url.Parse(adminURL + "auth/providers/mongodb-cloud/login")
+		authConfig.AuthURL, _ = url.Parse(adminURL + "/auth/providers/mongodb-cloud/login")
 	}
 
 	token, err := authConfig.NewTokenFromCredentials(ctx, r.publicKey, r.privateKey)

internal/config/service_account.go

@@ -28,7 +28,7 @@ func getTokenSource(clientID, clientSecret, baseURL string, tokenRenewalBase htt
 	saInfo.mu.Lock()
 	defer saInfo.mu.Unlock()
 
-	baseURL = strings.TrimRight(baseURL, "/")
+	baseURL = NormalizeBaseURL(baseURL)
 	if saInfo.tokenSource != nil { // Token source in cache.
 		if saInfo.clientID != clientID || saInfo.clientSecret != clientSecret || saInfo.baseURL != baseURL {
 			return nil, fmt.Errorf("service account credentials changed")
@@ -53,3 +53,7 @@ func getTokenSource(clientID, clientSecret, baseURL string, tokenRenewalBase htt
 	saInfo.tokenSource = tokenSource
 	return saInfo.tokenSource, nil
 }
+
+func NormalizeBaseURL(baseURL string) string {
+	return strings.TrimRight(baseURL, "/")
+}

internal/service/advancedcluster/common.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"time"
 
-	admin20240530 "go.mongodb.org/atlas-sdk/v20240530005/admin"
 	"go.mongodb.org/atlas-sdk/v20250312007/admin"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -27,7 +26,6 @@ var (
 )
 
 type ProcessArgs struct {
-	ArgsLegacy            *admin20240530.ClusterDescriptionProcessArgs
 	ArgsDefault           *admin.ClusterDescriptionProcessArgs20240805
 	ClusterAdvancedConfig *admin.ApiAtlasClusterAdvancedConfiguration
 }