CLOUDP-297918: Move to New Atlas SDK (#2304)

* mass update sdk

* update cluster var names

* more var name updates

* update other sdk versions

* cleanup delete calls

* fix alert config changes

* fix search index

* fix teams

* fix network container

* fix datafederation

* update direct sdk client references

* fix stream

* fix cloud provider integrations

* fix private endpoint

* fix x509

* fix e2e helper

* fix network peering

* fix API error

* clean up e2e tests

* Add warnings for removed process args

* duplicate replication specs per num shards

* cleanup missed delete call

* handle new diskSizeGB location

* fix tests

* remove old sdk from test helper

* update licenses

* fix tools/clean

* appease linter

* fix off by one

* fix missed changes from merge

* fixes for review

* fix database user ToAtlas

* ignore default read concern and failindexkeytoolong

* use zoneIDs for copy settings

* fix assertions

* fix unit test

* Fix deployment comparison and search node timeout

* fix e2e test for changed api contract in search nodes

* appease linter

---------

Co-authored-by: Sergiusz Urbaniak <[email protected]>

Author: roothorp

.licenses-gomod.sha256

@@ -1 +1 @@
-100644 1e3a470d5dd0b4422abf666dce72d7b6d425dc54 go.mod
+100644 f6972c85355d6523fb323533ab44f0e23d4dd9aa go.mod

api/v1/alert_configurations.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	"go.uber.org/zap"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
@@ -61,14 +61,14 @@ func (in *AlertConfiguration) ToAtlas() (*admin.GroupAlertsConfig, error) {
 	result.SetEnabled(in.Enabled)
 	result.SetEventTypeName(in.EventTypeName)
 
-	matchers := make([]map[string]interface{}, 0, len(in.Matchers))
+	matchers := make([]admin.StreamsMatcher, 0, len(in.Matchers))
 	for _, m := range in.Matchers {
 		matchers = append(
 			matchers,
-			map[string]interface{}{
-				"fieldName": m.FieldName,
-				"operator":  m.Operator,
-				"value":     m.Value,
+			admin.StreamsMatcher{
+				FieldName: m.FieldName,
+				Operator:  m.Operator,
+				Value:     m.Value,
 			},
 		)
 	}
@@ -134,7 +134,7 @@ func (in Threshold) Key() string {
 	return in.Operator + "|" + in.Units + "|" + in.Threshold
 }
 
-func (in *Threshold) IsEqual(threshold *admin.GreaterThanRawThreshold) bool {
+func (in *Threshold) IsEqual(threshold *admin.StreamProcessorMetricThreshold) bool {
 	logger := zap.NewExample().Sugar()
 	if in == nil {
 		return threshold == nil
@@ -161,21 +161,20 @@ func (in *Threshold) IsEqual(threshold *admin.GreaterThanRawThreshold) bool {
 	return true
 }
 
-func (in *Threshold) ToAtlas() (*admin.GreaterThanRawThreshold, error) {
+func (in *Threshold) ToAtlas() (*admin.StreamProcessorMetricThreshold, error) {
 	if in == nil {
 		return nil, nil
 	}
 
-	tr64, err := strconv.ParseInt(in.Threshold, 10, 64)
+	tr64, err := strconv.ParseFloat(in.Threshold, 64)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse threshold value: %w. should be float", err)
 	}
 
-	tr := int(tr64)
-	result := &admin.GreaterThanRawThreshold{
+	result := &admin.StreamProcessorMetricThreshold{
 		Operator:  &in.Operator,
 		Units:     &in.Units,
-		Threshold: &tr,
+		Threshold: &tr64,
 	}
 
 	return result, nil
@@ -367,7 +366,7 @@ func (in MetricThreshold) Key() string {
 		in.Mode
 }
 
-func (in *MetricThreshold) IsEqual(threshold *admin.ServerlessMetricThreshold) bool {
+func (in *MetricThreshold) IsEqual(threshold *admin.FlexClusterMetricThreshold) bool {
 	if in == nil {
 		return threshold == nil
 	}
@@ -388,7 +387,7 @@ func (in *MetricThreshold) IsEqual(threshold *admin.ServerlessMetricThreshold) b
 		in.Mode == threshold.GetMode()
 }
 
-func (in *MetricThreshold) ToAtlas() (*admin.ServerlessMetricThreshold, error) {
+func (in *MetricThreshold) ToAtlas() (*admin.FlexClusterMetricThreshold, error) {
 	if in == nil {
 		return nil, nil
 	}
@@ -398,7 +397,7 @@ func (in *MetricThreshold) ToAtlas() (*admin.ServerlessMetricThreshold, error) {
 		return nil, fmt.Errorf("failed to parse threshold value: %w. should be float", err)
 	}
 
-	result := &admin.ServerlessMetricThreshold{
+	result := &admin.FlexClusterMetricThreshold{
 		MetricName: in.MetricName,
 		Operator:   &in.Operator,
 		Threshold:  &tr,

api/v1/alert_configurations_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"
 )
@@ -27,12 +27,12 @@ func TestServerlessMetricThreshold(t *testing.T) {
 	tests := []struct {
 		name      string
 		akoData   *MetricThreshold
-		atlasData *admin.ServerlessMetricThreshold
+		atlasData *admin.FlexClusterMetricThreshold
 		equal     bool
 	}{
 		{
 			name: "Should be able to parse float Theshold",
-			atlasData: &admin.ServerlessMetricThreshold{
+			atlasData: &admin.FlexClusterMetricThreshold{
 				MetricName: "test",
 				Mode:       pointer.MakePtr("test"),
 				Operator:   pointer.MakePtr("IN"),
@@ -50,7 +50,7 @@ func TestServerlessMetricThreshold(t *testing.T) {
 		},
 		{
 			name: "Should be able to parse int Theshold",
-			atlasData: &admin.ServerlessMetricThreshold{
+			atlasData: &admin.FlexClusterMetricThreshold{
 				MetricName: "test",
 				Mode:       pointer.MakePtr("test"),
 				Operator:   pointer.MakePtr("IN"),
@@ -68,7 +68,7 @@ func TestServerlessMetricThreshold(t *testing.T) {
 		},
 		{
 			name: "Should be false if Theshold is not a number",
-			atlasData: &admin.ServerlessMetricThreshold{
+			atlasData: &admin.FlexClusterMetricThreshold{
 				MetricName: "test",
 				Mode:       pointer.MakePtr("test"),
 				Operator:   pointer.MakePtr("IN"),
@@ -98,7 +98,7 @@ func TestServerlessMetricThreshold(t *testing.T) {
 		},
 		{
 			name: "Should be false if operator mismatched",
-			atlasData: &admin.ServerlessMetricThreshold{
+			atlasData: &admin.FlexClusterMetricThreshold{
 				MetricName: "test",
 				Mode:       pointer.MakePtr("test"),
 				Operator:   pointer.MakePtr("IN"),
@@ -116,7 +116,7 @@ func TestServerlessMetricThreshold(t *testing.T) {
 		},
 		{
 			name: "Should fail if Threshold mismatched",
-			atlasData: &admin.ServerlessMetricThreshold{
+			atlasData: &admin.FlexClusterMetricThreshold{
 				MetricName: "test",
 				Mode:       pointer.MakePtr("test"),
 				Operator:   pointer.MakePtr("IN"),

api/v1/atlasbackupcompliancepolicy_types.go

@@ -17,7 +17,7 @@ package v1
 import (
 	"strings"
 
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"

api/v1/atlasbackupcompliancepolicy_types_test.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"

api/v1/atlasbackupschedule_types.go

@@ -17,12 +17,13 @@ package v1
 import (
 	"strings"
 
-	"go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"
 )
 
 // AtlasBackupScheduleSpec defines the desired state of AtlasBackupSchedule
@@ -108,47 +109,50 @@ type AtlasBackupSchedule struct {
 	Status status.BackupScheduleStatus `json:"status,omitempty"`
 }
 
-func (in *AtlasBackupSchedule) ToAtlas(clusterID, clusterName, replicaSetID string, policy *AtlasBackupPolicy) *mongodbatlas.CloudProviderSnapshotBackupPolicy {
-	atlasPolicy := mongodbatlas.Policy{}
+func (in *AtlasBackupSchedule) ToAtlas(clusterID, clusterName, zoneID string, policy *AtlasBackupPolicy) *admin.DiskBackupSnapshotSchedule20240805 {
+	atlasPolicy := admin.AdvancedDiskBackupSnapshotSchedulePolicy{}
 
+	items := make([]admin.DiskBackupApiPolicyItem, 0, len(policy.Spec.Items))
 	for _, bpItem := range policy.Spec.Items {
-		atlasPolicy.PolicyItems = append(atlasPolicy.PolicyItems, mongodbatlas.PolicyItem{
+		items = append(items, admin.DiskBackupApiPolicyItem{
 			FrequencyInterval: bpItem.FrequencyInterval,
 			FrequencyType:     strings.ToLower(bpItem.FrequencyType),
-			RetentionValue:    bpItem.RetentionValue,
 			RetentionUnit:     strings.ToLower(bpItem.RetentionUnit),
+			RetentionValue:    bpItem.RetentionValue,
 		})
 	}
-
-	result := &mongodbatlas.CloudProviderSnapshotBackupPolicy{
-		ClusterName:                       clusterName,
-		ClusterID:                         clusterID,
-		ReferenceHourOfDay:                &in.Spec.ReferenceHourOfDay,
-		ReferenceMinuteOfHour:             &in.Spec.ReferenceMinuteOfHour,
-		RestoreWindowDays:                 &in.Spec.RestoreWindowDays,
-		UpdateSnapshots:                   &in.Spec.UpdateSnapshots,
-		Policies:                          []mongodbatlas.Policy{atlasPolicy},
-		AutoExportEnabled:                 &in.Spec.AutoExportEnabled,
-		UseOrgAndGroupNamesInExportPrefix: &in.Spec.UseOrgAndGroupNamesInExportPrefix,
-		CopySettings:                      make([]mongodbatlas.CopySetting, 0, len(in.Spec.CopySettings)),
+	atlasPolicy.PolicyItems = &items
+
+	result := &admin.DiskBackupSnapshotSchedule20240805{
+		ClusterName:                       pointer.MakePtrOrNil(clusterName),
+		ClusterId:                         pointer.MakePtrOrNil(clusterID),
+		ReferenceHourOfDay:                pointer.MakePtr(int(in.Spec.ReferenceHourOfDay)),
+		ReferenceMinuteOfHour:             pointer.MakePtr(int(in.Spec.ReferenceMinuteOfHour)),
+		RestoreWindowDays:                 pointer.MakePtr(int(in.Spec.RestoreWindowDays)),
+		UpdateSnapshots:                   pointer.MakePtr(in.Spec.UpdateSnapshots),
+		Policies:                          &[]admin.AdvancedDiskBackupSnapshotSchedulePolicy{atlasPolicy},
+		AutoExportEnabled:                 pointer.MakePtr(in.Spec.AutoExportEnabled),
+		UseOrgAndGroupNamesInExportPrefix: pointer.MakePtr(in.Spec.UseOrgAndGroupNamesInExportPrefix),
 	}
 
 	if in.Spec.Export != nil {
-		result.Export = &mongodbatlas.Export{
-			ExportBucketID: in.Spec.Export.ExportBucketID,
-			FrequencyType:  in.Spec.Export.FrequencyType,
+		result.Export = &admin.AutoExportPolicy{
+			ExportBucketId: pointer.MakePtr(in.Spec.Export.ExportBucketID),
+			FrequencyType:  pointer.MakePtr(in.Spec.Export.FrequencyType),
 		}
 	}
 
+	copySettings := make([]admin.DiskBackupCopySetting20240805, 0, len(in.Spec.CopySettings))
 	for _, copySetting := range in.Spec.CopySettings {
-		result.CopySettings = append(result.CopySettings, mongodbatlas.CopySetting{
-			CloudProvider:     copySetting.CloudProvider,
-			RegionName:        copySetting.RegionName,
-			ReplicationSpecID: &replicaSetID,
-			ShouldCopyOplogs:  copySetting.ShouldCopyOplogs,
-			Frequencies:       copySetting.Frequencies,
+		copySettings = append(copySettings, admin.DiskBackupCopySetting20240805{
+			CloudProvider:    copySetting.CloudProvider,
+			RegionName:       copySetting.RegionName,
+			ZoneId:           zoneID,
+			ShouldCopyOplogs: copySetting.ShouldCopyOplogs,
+			Frequencies:      &copySetting.Frequencies,
 		})
 	}
+	result.CopySettings = &copySettings
 
 	return result
 }

api/v1/atlasbackupschedule_types_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/go-test/deep"
-	"go.mongodb.org/atlas/mongodbatlas"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"
 )
@@ -49,21 +49,19 @@ func Test_BackupScheduleToAtlas(t *testing.T) {
 		}
 		clusterName := "testCluster"
 		replicaSetID := "test-cluster-replica-set-id"
-		output := &mongodbatlas.CloudProviderSnapshotBackupPolicy{
-			ClusterID:                         "test-id",
-			ClusterName:                       "testCluster",
+		output := &admin.DiskBackupSnapshotSchedule20240805{
+			ClusterId:                         pointer.MakePtr("test-id"),
+			ClusterName:                       pointer.MakePtr("testCluster"),
 			AutoExportEnabled:                 pointer.MakePtr(true),
-			ReferenceHourOfDay:                pointer.MakePtr[int64](10),
-			ReferenceMinuteOfHour:             pointer.MakePtr[int64](10),
-			RestoreWindowDays:                 pointer.MakePtr[int64](7),
+			ReferenceHourOfDay:                pointer.MakePtr(10),
+			ReferenceMinuteOfHour:             pointer.MakePtr(10),
+			RestoreWindowDays:                 pointer.MakePtr(7),
 			UpdateSnapshots:                   pointer.MakePtr(false),
 			UseOrgAndGroupNamesInExportPrefix: pointer.MakePtr(false),
-			Policies: []mongodbatlas.Policy{
+			Policies: &[]admin.AdvancedDiskBackupSnapshotSchedulePolicy{
 				{
-					ID: "",
-					PolicyItems: []mongodbatlas.PolicyItem{
+					PolicyItems: &[]admin.DiskBackupApiPolicyItem{
 						{
-							ID:                "",
 							FrequencyType:     "hourly",
 							FrequencyInterval: 10,
 							RetentionUnit:     "weeks",
@@ -72,10 +70,10 @@ func Test_BackupScheduleToAtlas(t *testing.T) {
 					},
 				},
 			},
-			CopySettings: []mongodbatlas.CopySetting{},
+			CopySettings: &[]admin.DiskBackupCopySetting20240805{},
 		}
 
-		result := inSchedule.ToAtlas(output.ClusterID, clusterName, replicaSetID, inPolicy)
+		result := inSchedule.ToAtlas(output.GetClusterId(), clusterName, replicaSetID, inPolicy)
 		if diff := deep.Equal(result, output); diff != nil {
 			t.Error(diff)
 		}

api/v1/atlasdatabaseuser_types.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -28,6 +28,7 @@ import (
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
+	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"
 )
 
 // Important:
@@ -240,6 +241,9 @@ func (p AtlasDatabaseUser) ToAtlasSDK(ctx context.Context, kubeClient client.Cli
 	}
 
 	result.Password = &password
+	if result.Description == nil {
+		result.Description = pointer.MakePtr("")
+	}
 
 	return result, nil
 }

api/v1/atlasdeployment_types.go

@@ -17,7 +17,7 @@ package v1
 import (
 	"errors"
 
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	"go.mongodb.org/atlas/mongodbatlas"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"

api/v1/atlasfederatedauth_types.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 
-	"go.mongodb.org/atlas-sdk/v20241113001/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"