chore: Uses new Atlas Go SDK version (#1831)

* apply update-atlas-sdk

* revert changes to oldAdmin

* remove atlasSDK alias

* use SlicePtrToSlice and NonEmptySliceToPtrSlice

* fix linter: fieldalignment: struct with 32 pointer bytes could be 24 (govet)

* fix project tests

* user old SDK for online archive as DataProcessRegion was removed

* update templates

* rename to NonEmptySliceToSlicePtr

* tests for slice functions

* use Run in tests

* remove SlicePtrToSlice

* extract results

* implement suggestion preallocating slice

* rename to NonEmptyToPtr as it works for arrays and slices

* add online_archive to old sdk comment

* comment NonEmptyToPtr

* use date to refer to the old sdk version

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/zclconf/go-cty v1.14.1
 	go.mongodb.org/atlas v0.36.0
 	go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0
-	go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0
+	go.mongodb.org/atlas-sdk/v20231115003 v20231115003.1.0
 	go.mongodb.org/realm v0.1.0
 	golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819
 )

go.sum

@@ -761,8 +761,8 @@ go.mongodb.org/atlas v0.36.0 h1:m05S3AO7zkl+bcG1qaNsEKBnAqnKx2FDwLooHpIG3j4=
 go.mongodb.org/atlas v0.36.0/go.mod h1:nfPldE9dSama6G2IbIzmEza02Ly7yFZjMMVscaM0uEc=
 go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0 h1:h1X2CGKyN1UFvNs69vp7xpufbbreq6p7bbrg5uJ1sxw=
 go.mongodb.org/atlas-sdk/v20231001002 v20231001002.0.0/go.mod h1:4TAUPaWPFNSbi8c1hbQLr1wAdkmqi48O7zvyXjBM+a8=
-go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0 h1:x6nnq2pUIP9mN4WLD4/EseBzV88OmSgexxYchPilgno=
-go.mongodb.org/atlas-sdk/v20231115002 v20231115002.1.0/go.mod h1:el7cm23kEiiw72HAYimhNweKqp/ubHsNJk+Mk30yJhM=
+go.mongodb.org/atlas-sdk/v20231115003 v20231115003.1.0 h1:31Li8Xb1THAzYfAVDR9hhAn4z9IhmFs/+AbGqADsyt8=
+go.mongodb.org/atlas-sdk/v20231115003 v20231115003.1.0/go.mod h1:tXE5JorXFSauhnw9Xu+/tNrRh90rTX8rYs9y0i2Jy+c=
 go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M=
 go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=

internal/common/conversion/type_conversion.go

@@ -56,3 +56,11 @@ func IsStringPresent(strPtr *string) bool {
 func MongoDBRegionToAWSRegion(region string) string {
 	return strings.ReplaceAll(strings.ToLower(region), "_", "-")
 }
+
+// NonEmptyToPtr accepts an array or slice and returns a pointer to it, except if it's empty, in that case it returns nil.
+func NonEmptyToPtr[T any](v []T) *[]T {
+	if len(v) == 0 {
+		return nil
+	}
+	return &v
+}

internal/common/conversion/type_conversion_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTimeToStringWithoutNanos(t *testing.T) {
@@ -67,3 +68,25 @@ func TestMongoDBRegionToAWSRegion(t *testing.T) {
 		}
 	}
 }
+
+func TestNonEmptyToPtr(t *testing.T) {
+	var (
+		nilSlice         []string
+		emptyNonNilSlice = []string{}
+	)
+	tests := []struct {
+		name     string
+		expected *[]string
+		given    []string
+	}{
+		{"nil pointer", nil, nil},
+		{"nil slice", nil, nilSlice},
+		{"empty non-nil slice", nil, emptyNonNilSlice},
+		{"slice with content", &[]string{"hello", "there"}, []string{"hello", "there"}},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			assert.Equal(t, tc.expected, conversion.NonEmptyToPtr(tc.given))
+		})
+	}
+}

internal/config/client.go

@@ -12,8 +12,8 @@ import (
 	"github.com/mongodb-forks/digest"
 	"github.com/mongodb/terraform-provider-mongodbatlas/version"
 	"github.com/spf13/cast"
-	oldAtlasSDK "go.mongodb.org/atlas-sdk/v20231001002/admin"
-	atlasSDK "go.mongodb.org/atlas-sdk/v20231115002/admin"
+	admin20231001002 "go.mongodb.org/atlas-sdk/v20231001002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 	matlasClient "go.mongodb.org/atlas/mongodbatlas"
 	realmAuth "go.mongodb.org/realm/auth"
 	"go.mongodb.org/realm/realm"
@@ -29,10 +29,10 @@ var (
 
 // MongoDBClient contains the mongodbatlas clients and configurations
 type MongoDBClient struct {
-	Atlas      *matlasClient.Client
-	AtlasV2    *atlasSDK.APIClient
-	OldAtlasV2 *oldAtlasSDK.APIClient // Needed to avoid sudden breaking changes in federated_settings_identity_provider resource. Will be removed in terraform-provider-1.16.0
-	Config     *Config
+	Atlas            *matlasClient.Client
+	AtlasV2          *admin.APIClient
+	Atlas20231001002 *admin20231001002.APIClient // Needed to avoid breaking changes in federated_settings_identity_provider and online_archive resources.
+	Config           *Config
 }
 
 // Config contains the configurations needed to use SDKs
@@ -89,46 +89,46 @@ func (c *Config) NewClient(ctx context.Context) (any, error) {
 	if err != nil {
 		return nil, err
 	}
-	sdkOldV2Client, err := c.newOldSDKV2Client(client)
+	sdk20231001002Client, err := c.newSDK20231001002Client(client)
 	if err != nil {
 		return nil, err
 	}
 
 	clients := &MongoDBClient{
-		Atlas:      atlasClient,
-		AtlasV2:    sdkV2Client,
-		OldAtlasV2: sdkOldV2Client,
-		Config:     c,
+		Atlas:            atlasClient,
+		AtlasV2:          sdkV2Client,
+		Atlas20231001002: sdk20231001002Client,
+		Config:           c,
 	}
 
 	return clients, nil
 }
 
-func (c *Config) newSDKV2Client(client *http.Client) (*atlasSDK.APIClient, error) {
-	opts := []atlasSDK.ClientModifier{
-		atlasSDK.UseHTTPClient(client),
-		atlasSDK.UseUserAgent(userAgent),
-		atlasSDK.UseBaseURL(c.BaseURL),
-		atlasSDK.UseDebug(false)}
+func (c *Config) newSDKV2Client(client *http.Client) (*admin.APIClient, error) {
+	opts := []admin.ClientModifier{
+		admin.UseHTTPClient(client),
+		admin.UseUserAgent(userAgent),
+		admin.UseBaseURL(c.BaseURL),
+		admin.UseDebug(false)}
 
 	// Initialize the MongoDB Versioned Atlas Client.
-	sdkv2, err := atlasSDK.NewClient(opts...)
+	sdkv2, err := admin.NewClient(opts...)
 	if err != nil {
 		return nil, err
 	}
 
 	return sdkv2, nil
 }
 
-func (c *Config) newOldSDKV2Client(client *http.Client) (*oldAtlasSDK.APIClient, error) {
-	opts := []oldAtlasSDK.ClientModifier{
-		oldAtlasSDK.UseHTTPClient(client),
-		oldAtlasSDK.UseUserAgent(userAgent),
-		oldAtlasSDK.UseBaseURL(c.BaseURL),
-		oldAtlasSDK.UseDebug(false)}
+func (c *Config) newSDK20231001002Client(client *http.Client) (*admin20231001002.APIClient, error) {
+	opts := []admin20231001002.ClientModifier{
+		admin20231001002.UseHTTPClient(client),
+		admin20231001002.UseUserAgent(userAgent),
+		admin20231001002.UseBaseURL(c.BaseURL),
+		admin20231001002.UseDebug(false)}
 
 	// Initialize the MongoDB Versioned Atlas Client.
-	sdkv2, err := oldAtlasSDK.NewClient(opts...)
+	sdkv2, err := admin20231001002.NewClient(opts...)
 	if err != nil {
 		return nil, err
 	}

internal/provider/provider_authentication_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 func TestAccSTSAssumeRole_basic(t *testing.T) {

internal/service/alertconfiguration/data_source_alert_configuration.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	"github.com/zclconf/go-cty/cty"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 var _ datasource.DataSource = &alertConfigurationDS{}
@@ -319,7 +319,7 @@ func outputAlertConfigurationResourceHcl(label string, alert *admin.GroupAlertsC
 		resource.SetAttributeValue("enabled", cty.BoolVal(*alert.Enabled))
 	}
 
-	for _, matcher := range alert.Matchers {
+	for _, matcher := range alert.GetMatchers() {
 		appendBlockWithCtyValues(resource, "matcher", []string{}, convertMatcherToCtyValues(matcher))
 	}
 
@@ -331,8 +331,9 @@ func outputAlertConfigurationResourceHcl(label string, alert *admin.GroupAlertsC
 		appendBlockWithCtyValues(resource, "threshold_config", []string{}, convertThresholdToCtyValues(alert.Threshold))
 	}
 
-	for i := 0; i < len(alert.Notifications); i++ {
-		appendBlockWithCtyValues(resource, "notification", []string{}, convertNotificationToCtyValues(&alert.Notifications[i]))
+	notifications := alert.GetNotifications()
+	for i := 0; i < len(notifications); i++ {
+		appendBlockWithCtyValues(resource, "notification", []string{}, convertNotificationToCtyValues(&notifications[i]))
 	}
 
 	return string(f.Bytes())
@@ -438,16 +439,14 @@ func convertNotificationToCtyValues(notification *admin.AlertsNotificationRootFo
 		values["sms_enabled"] = cty.BoolVal(*notification.SmsEnabled)
 	}
 
-	if len(notification.Roles) > 0 {
-		roles := make([]cty.Value, 0)
-
-		for _, r := range notification.Roles {
+	if roles := notification.GetRoles(); len(roles) > 0 {
+		roleList := make([]cty.Value, 0, len(roles))
+		for _, r := range roles {
 			if r != "" {
-				roles = append(roles, cty.StringVal(r))
+				roleList = append(roleList, cty.StringVal(r))
 			}
 		}
-
-		values["roles"] = cty.TupleVal(roles)
+		values["roles"] = cty.TupleVal(roleList)
 	}
 
 	return values

internal/service/alertconfiguration/data_source_alert_configuration_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 func TestAccConfigDSAlertConfiguration_basic(t *testing.T) {

internal/service/alertconfiguration/data_source_alert_configurations.go

@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 const alertConfigurationsDataSourceName = "alert_configurations"
@@ -143,7 +143,7 @@ func (d *AlertConfigurationsDS) Read(ctx context.Context, req datasource.ReadReq
 	alertConfigurationsConfig.ID = types.StringValue(conversion.EncodeStateID(map[string]string{
 		"project_id": projectID,
 	}))
-	alertConfigurationsConfig.Results = NewTFAlertConfigurationDSModelList(alerts.Results, projectID, alertConfigurationsConfig.OutputType)
+	alertConfigurationsConfig.Results = NewTFAlertConfigurationDSModelList(alerts.GetResults(), projectID, alertConfigurationsConfig.OutputType)
 	if *params.IncludeCount {
 		alertConfigurationsConfig.TotalCount = types.Int64Value(int64(*alerts.TotalCount))
 	}

internal/service/alertconfiguration/model_alert_configuration.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mwielbut/pointy"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 func NewNotificationList(tfNotificationSlice []TfNotificationModel) ([]admin.AlertsNotificationRootForGroup, error) {
@@ -43,7 +43,7 @@ func NewNotificationList(tfNotificationSlice []TfNotificationModel) ([]admin.Ale
 			Username:                 n.Username.ValueStringPointer(),
 			VictorOpsApiKey:          n.VictorOpsAPIKey.ValueStringPointer(),
 			VictorOpsRoutingKey:      n.VictorOpsRoutingKey.ValueStringPointer(),
-			Roles:                    n.Roles,
+			Roles:                    conversion.NonEmptyToPtr(n.Roles),
 			MicrosoftTeamsWebhookUrl: n.MicrosoftTeamsWebhookURL.ValueStringPointer(),
 			WebhookSecret:            n.WebhookSecret.ValueStringPointer(),
 			WebhookUrl:               n.WebhookURL.ValueStringPointer(),
@@ -108,8 +108,8 @@ func NewTFAlertConfigurationModel(apiRespConfig *admin.GroupAlertsConfig, currSt
 		Enabled:               types.BoolPointerValue(apiRespConfig.Enabled),
 		MetricThresholdConfig: NewTFMetricThresholdConfigModel(apiRespConfig.MetricThreshold, currState.MetricThresholdConfig),
 		ThresholdConfig:       NewTFThresholdConfigModel(apiRespConfig.Threshold, currState.ThresholdConfig),
-		Notification:          NewTFNotificationModelList(apiRespConfig.Notifications, currState.Notification),
-		Matcher:               NewTFMatcherModelList(apiRespConfig.Matchers, currState.Matcher),
+		Notification:          NewTFNotificationModelList(apiRespConfig.GetNotifications(), currState.Notification),
+		Matcher:               NewTFMatcherModelList(apiRespConfig.GetMatchers(), currState.Matcher),
 	}
 }
 
@@ -121,7 +121,7 @@ func NewTFNotificationModelList(n []admin.AlertsNotificationRootForGroup, currSt
 			value := n[i]
 			notifications[i] = TfNotificationModel{
 				TeamName:       conversion.StringPtrNullIfEmpty(value.TeamName),
-				Roles:          value.Roles,
+				Roles:          value.GetRoles(),
 				ChannelName:    conversion.StringPtrNullIfEmpty(value.ChannelName),
 				DatadogRegion:  conversion.StringPtrNullIfEmpty(value.DatadogRegion),
 				DelayMin:       types.Int64PointerValue(conversion.IntPtrToInt64Ptr(value.DelayMin)),
@@ -145,7 +145,7 @@ func NewTFNotificationModelList(n []admin.AlertsNotificationRootForGroup, currSt
 		currState := currStateNotifications[i]
 		newState := TfNotificationModel{
 			TeamName: conversion.StringPtrNullIfEmpty(value.TeamName),
-			Roles:    value.Roles,
+			Roles:    value.GetRoles(),
 			// sentive attributes do not use value returned from API
 			APIToken:                 conversion.StringNullIfEmpty(currState.APIToken.ValueString()),
 			DatadogAPIKey:            conversion.StringNullIfEmpty(currState.DatadogAPIKey.ValueString()),
@@ -303,8 +303,8 @@ func NewTfAlertConfigurationDSModel(apiRespConfig *admin.GroupAlertsConfig, proj
 		Enabled:               types.BoolPointerValue(apiRespConfig.Enabled),
 		MetricThresholdConfig: NewTFMetricThresholdConfigModel(apiRespConfig.MetricThreshold, []TfMetricThresholdConfigModel{}),
 		ThresholdConfig:       NewTFThresholdConfigModel(apiRespConfig.Threshold, []TfThresholdConfigModel{}),
-		Notification:          NewTFNotificationModelList(apiRespConfig.Notifications, []TfNotificationModel{}),
-		Matcher:               NewTFMatcherModelList(apiRespConfig.Matchers, []TfMatcherModel{}),
+		Notification:          NewTFNotificationModelList(apiRespConfig.GetNotifications(), []TfNotificationModel{}),
+		Matcher:               NewTFMatcherModelList(apiRespConfig.GetMatchers(), []TfMatcherModel{}),
 	}
 }
 

internal/service/alertconfiguration/model_alert_configuration_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 const (
@@ -45,7 +45,7 @@ func TestNotificationSDKToTFModel(t *testing.T) {
 					SmsEnabled:   admin.PtrBool(disabled),
 					EmailEnabled: admin.PtrBool(enabled),
 					ChannelName:  admin.PtrString("#channel"),
-					Roles:        roles,
+					Roles:        conversion.NonEmptyToPtr(roles),
 					ApiToken:     admin.PtrString("newApiToken"),
 				},
 			},
@@ -290,7 +290,7 @@ func TestNotificationTFModelToSDK(t *testing.T) {
 					DelayMin:     admin.PtrInt(delayMin),
 					SmsEnabled:   admin.PtrBool(disabled),
 					EmailEnabled: admin.PtrBool(enabled),
-					Roles:        roles,
+					Roles:        conversion.NonEmptyToPtr(roles),
 				},
 			},
 		},

internal/service/alertconfiguration/resource_alert_configuration.go

@@ -21,7 +21,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	"github.com/mwielbut/pointy"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 const (
@@ -380,7 +380,7 @@ func (r *alertConfigurationRS) Create(ctx context.Context, req resource.CreateRe
 	apiReq := &admin.GroupAlertsConfig{
 		EventTypeName:   alertConfigPlan.EventType.ValueStringPointer(),
 		Enabled:         alertConfigPlan.Enabled.ValueBoolPointer(),
-		Matchers:        NewMatcherList(alertConfigPlan.Matcher),
+		Matchers:        conversion.NonEmptyToPtr(NewMatcherList(alertConfigPlan.Matcher)),
 		MetricThreshold: NewMetricThreshold(alertConfigPlan.MetricThresholdConfig),
 		Threshold:       NewThreshold(alertConfigPlan.ThresholdConfig),
 	}
@@ -390,7 +390,7 @@ func (r *alertConfigurationRS) Create(ctx context.Context, req resource.CreateRe
 		resp.Diagnostics.AddError(errorCreateAlertConf, err.Error())
 		return
 	}
-	apiReq.Notifications = notifications
+	apiReq.Notifications = conversion.NonEmptyToPtr(notifications)
 
 	apiResp, _, err := connV2.AlertConfigurationsApi.CreateAlertConfiguration(ctx, projectID, apiReq).Execute()
 	if err != nil {
@@ -482,7 +482,7 @@ func (r *alertConfigurationRS) Update(ctx context.Context, req resource.UpdateRe
 	}
 
 	if !reflect.DeepEqual(alertConfigPlan.Matcher, alertConfigState.Matcher) {
-		apiReq.Matchers = NewMatcherList(alertConfigPlan.Matcher)
+		apiReq.Matchers = conversion.NonEmptyToPtr(NewMatcherList(alertConfigPlan.Matcher))
 	}
 
 	// Always refresh structure to handle service keys being obfuscated coming back from read API call
@@ -491,7 +491,7 @@ func (r *alertConfigurationRS) Update(ctx context.Context, req resource.UpdateRe
 		resp.Diagnostics.AddError(errorUpdateAlertConf, err.Error())
 		return
 	}
-	apiReq.Notifications = notifications
+	apiReq.Notifications = conversion.NonEmptyToPtr(notifications)
 
 	var updatedAlertConfigResp *admin.GroupAlertsConfig
 

internal/service/alertconfiguration/resource_alert_configuration_migration_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"

internal/service/alertconfiguration/resource_alert_configuration_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/alertconfiguration"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
-	"go.mongodb.org/atlas-sdk/v20231115002/admin"
+	"go.mongodb.org/atlas-sdk/v20231115003/admin"
 )
 
 func TestAccConfigRSAlertConfiguration_basic(t *testing.T) {