CLOUDP-297918: Move to New Atlas SDK

.licenses-gomod.sha256

@@ -1 +1 @@
-100644 b1190edabf8ad97f199b0eb0358514f45d8c9bb3 go.mod
+100644 7637c1575b33e7df59f34cea7f0782a3ccbf603f 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/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"

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"
 

api/v1/atlasfederatedauth_types_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/go-test/deep"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
-	"go.mongodb.org/atlas-sdk/v20241113001/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer"

api/v1/atlasproject_types_test.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"go.mongodb.org/atlas-sdk/v20231115004/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	"sigs.k8s.io/yaml"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"

api/v1/atlasteam_types.go

@@ -15,7 +15,7 @@
 package v1
 
 import (
-	"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/networkpeer.go

@@ -15,7 +15,7 @@
 package v1
 
 import (
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"

api/v1/privateendpoint.go

@@ -15,7 +15,7 @@
 package v1
 
 import (
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider"
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"

api/v1/project_settings.go

@@ -15,7 +15,7 @@
 package v1
 
 import (
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 )
 
 type ProjectSettings struct {

api/v1/project_teams.go

@@ -15,7 +15,7 @@
 package v1
 
 import (
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
 )

api/v1/status/alert_configurations.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"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/internal/compat"
@@ -160,7 +160,7 @@ type Threshold struct {
 	Threshold string `json:"threshold,omitempty"`
 }
 
-func ThresholdFromAtlas(threshold *admin.GreaterThanRawThreshold) *Threshold {
+func ThresholdFromAtlas(threshold *admin.StreamProcessorMetricThreshold) *Threshold {
 	if threshold == nil {
 		return nil
 	}
@@ -185,7 +185,7 @@ type MetricThreshold struct {
 	Mode string `json:"mode,omitempty"`
 }
 
-func MetricThresholdFromAtlas(threshold *admin.ServerlessMetricThreshold) *MetricThreshold {
+func MetricThresholdFromAtlas(threshold *admin.FlexClusterMetricThreshold) *MetricThreshold {
 	if threshold == nil {
 		return nil
 	}

api/v1/status/networkpeer.go

@@ -15,7 +15,7 @@
 package status
 
 import (
-	"go.mongodb.org/atlas-sdk/v20231115008/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider"
 )

go.mod

@@ -27,9 +27,6 @@ require (
 	github.com/sethvargo/go-password v0.3.1
 	github.com/stretchr/testify v1.10.0
 	go.mongodb.org/atlas v0.38.0
-	go.mongodb.org/atlas-sdk/v20231115004 v20231115004.1.0
-	go.mongodb.org/atlas-sdk/v20231115008 v20231115008.5.0
-	go.mongodb.org/atlas-sdk/v20241113001 v20241113001.0.0
 	go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0
 	go.mongodb.org/mongo-driver v1.17.4
 	go.uber.org/zap v1.27.0

go.sum

@@ -258,12 +258,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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/v20231115004 v20231115004.1.0 h1:vOvfk8bPedcphaTHIm6p8UB/ZPeVOqJZ7+MmTuI1eGs=
-go.mongodb.org/atlas-sdk/v20231115004 v20231115004.1.0/go.mod h1:FzD5DLz+WPB+z3OGgNBjXMPQJjJ7Y+hKn4iupXZuoOc=
-go.mongodb.org/atlas-sdk/v20231115008 v20231115008.5.0 h1:OuV1HfIpZUZa4+BKvtrvDlNqnilkCkdHspuZok6KAbM=
-go.mongodb.org/atlas-sdk/v20231115008 v20231115008.5.0/go.mod h1:0707RpWIrNFZ6Msy/dwRDCzC5JVDon61JoOqcbfCujg=
-go.mongodb.org/atlas-sdk/v20241113001 v20241113001.0.0 h1:G3UZcWwWziGUuaILWp/Gc+jLm1tfu7OUhUOpMWVZSWc=
-go.mongodb.org/atlas-sdk/v20241113001 v20241113001.0.0/go.mod h1:fMiUyCacIAm+XwFkJ4j+rJtYLRsGU7hButtgGv+SBU4=
 go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0 h1:KX8PrYp3/PCSxG4NbGLcc3+EsNcfyhcvylGbe/oRlx8=
 go.mongodb.org/atlas-sdk/v20250312002 v20250312002.0.0/go.mod h1:HHCmHxHPdJRr1bUXlvRIZbm7M4gRujjur1GnjE44YgA=
 go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=

internal/controller/atlas/client.go

@@ -14,7 +14,7 @@
 
 package atlas
 
-import "go.mongodb.org/atlas-sdk/v20231115008/admin"
+import "go.mongodb.org/atlas-sdk/v20250312002/admin"
 
 func NewClient(domain, publicKey, privateKey string) (*admin.APIClient, error) {
 	return admin.NewClient(

internal/controller/atlas/provider.go

@@ -23,9 +23,7 @@ import (
 	"strings"
 
 	"github.com/mongodb-forks/digest"
-	adminv20231115008 "go.mongodb.org/atlas-sdk/v20231115008/admin"
-	adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin"
-	adminv20250312002 "go.mongodb.org/atlas-sdk/v20250312002/admin"
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 	"go.mongodb.org/atlas/mongodbatlas"
 	"go.uber.org/zap"
 
@@ -48,9 +46,7 @@ type Provider interface {
 }
 
 type ClientSet struct {
-	SdkClient20231115008 *adminv20231115008.APIClient
-	SdkClient20241113001 *adminv20241113001.APIClient
-	SdkClient20250312002 *adminv20250312002.APIClient
+	SdkClient20250312002 *admin.APIClient
 }
 
 type ProductionProvider struct {
@@ -148,34 +144,16 @@ func (p *ProductionProvider) SdkClientSet(ctx context.Context, creds *Credential
 
 	httpClient := &http.Client{Transport: transport}
 
-	clientv20231115008, err := adminv20231115008.NewClient(
-		adminv20231115008.UseBaseURL(p.domain),
-		adminv20231115008.UseHTTPClient(httpClient),
-		adminv20231115008.UseUserAgent(operatorUserAgent()))
-	if err != nil {
-		return nil, err
-	}
-
-	clientv20241113001, err := adminv20241113001.NewClient(
-		adminv20241113001.UseBaseURL(p.domain),
-		adminv20241113001.UseHTTPClient(httpClient),
-		adminv20241113001.UseUserAgent(operatorUserAgent()))
-	if err != nil {
-		return nil, err
-	}
-
-	clientv20241113002, err := adminv20250312002.NewClient(
-		adminv20250312002.UseBaseURL(p.domain),
-		adminv20250312002.UseHTTPClient(httpClient),
-		adminv20250312002.UseUserAgent(operatorUserAgent()))
+	clientv20250312002, err := admin.NewClient(
+		admin.UseBaseURL(p.domain),
+		admin.UseHTTPClient(httpClient),
+		admin.UseUserAgent(operatorUserAgent()))
 	if err != nil {
 		return nil, err
 	}
 
 	return &ClientSet{
-		SdkClient20231115008: clientv20231115008,
-		SdkClient20241113001: clientv20241113001,
-		SdkClient20250312002: clientv20241113002,
+		SdkClient20250312002: clientv20250312002,
 	}, nil
 }