diff --git a/api/v1/alert_configurations.go b/api/v1/alert_configurations.go index 67a2c6e1ea..35c9c6e587 100644 --- a/api/v1/alert_configurations.go +++ b/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, diff --git a/api/v1/alert_configurations_test.go b/api/v1/alert_configurations_test.go index 823c950b1b..f366a533fe 100644 --- a/api/v1/alert_configurations_test.go +++ b/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"), diff --git a/api/v1/atlasbackupcompliancepolicy_types.go b/api/v1/atlasbackupcompliancepolicy_types.go index f81c14c650..593dd667d7 100644 --- a/api/v1/atlasbackupcompliancepolicy_types.go +++ b/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" diff --git a/api/v1/atlasbackupcompliancepolicy_types_test.go b/api/v1/atlasbackupcompliancepolicy_types_test.go index f1df6fac78..5b9526305d 100644 --- a/api/v1/atlasbackupcompliancepolicy_types_test.go +++ b/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" diff --git a/api/v1/atlasdatabaseuser_types.go b/api/v1/atlasdatabaseuser_types.go index 3c0d1e9e9c..c3c17167e7 100644 --- a/api/v1/atlasdatabaseuser_types.go +++ b/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" diff --git a/api/v1/atlasdeployment_types.go b/api/v1/atlasdeployment_types.go index 09f5484407..348aa12b78 100644 --- a/api/v1/atlasdeployment_types.go +++ b/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" diff --git a/api/v1/atlasfederatedauth_types.go b/api/v1/atlasfederatedauth_types.go index 4be9d2e328..5feaa426a0 100644 --- a/api/v1/atlasfederatedauth_types.go +++ b/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" diff --git a/api/v1/atlasfederatedauth_types_test.go b/api/v1/atlasfederatedauth_types_test.go index ae5345ed4a..0adba4cc7a 100644 --- a/api/v1/atlasfederatedauth_types_test.go +++ b/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" diff --git a/api/v1/atlasproject_types_test.go b/api/v1/atlasproject_types_test.go index e41a88ee3a..939b7d8150 100644 --- a/api/v1/atlasproject_types_test.go +++ b/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" diff --git a/api/v1/atlasteam_types.go b/api/v1/atlasteam_types.go index 87953d0524..fe0fa4551f 100644 --- a/api/v1/atlasteam_types.go +++ b/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" diff --git a/api/v1/networkpeer.go b/api/v1/networkpeer.go index ff4554ad02..1a07a2f7b5 100644 --- a/api/v1/networkpeer.go +++ b/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" diff --git a/api/v1/privateendpoint.go b/api/v1/privateendpoint.go index b9ab10c603..027d38692c 100644 --- a/api/v1/privateendpoint.go +++ b/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" diff --git a/api/v1/project_settings.go b/api/v1/project_settings.go index 1196ade6ee..835437c232 100644 --- a/api/v1/project_settings.go +++ b/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 { diff --git a/api/v1/project_teams.go b/api/v1/project_teams.go index 5c2d4889f7..2d2a215766 100644 --- a/api/v1/project_teams.go +++ b/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" ) diff --git a/api/v1/status/alert_configurations.go b/api/v1/status/alert_configurations.go index 8f148c72f9..99602363a2 100644 --- a/api/v1/status/alert_configurations.go +++ b/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 } diff --git a/api/v1/status/networkpeer.go b/api/v1/status/networkpeer.go index 8208f19ee9..b120109c8b 100644 --- a/api/v1/status/networkpeer.go +++ b/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" ) diff --git a/go.mod b/go.mod index 289c83bb3b..9ff56b83c8 100644 --- a/go.mod +++ b/go.mod @@ -25,9 +25,7 @@ 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.3 go.uber.org/zap v1.27.0 golang.org/x/sync v0.13.0 diff --git a/go.sum b/go.sum index ead52fc900..63452d8643 100644 --- a/go.sum +++ b/go.sum @@ -260,12 +260,8 @@ 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.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ= go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= diff --git a/internal/controller/atlas/client.go b/internal/controller/atlas/client.go index fa7f474147..36239c76ff 100644 --- a/internal/controller/atlas/client.go +++ b/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( diff --git a/internal/controller/atlas/provider.go b/internal/controller/atlas/provider.go index 929a8aa0ca..4d94af8d4b 100644 --- a/internal/controller/atlas/provider.go +++ b/internal/controller/atlas/provider.go @@ -23,8 +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" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" @@ -47,8 +46,7 @@ type Provider interface { } type ClientSet struct { - SdkClient20231115008 *adminv20231115008.APIClient - SdkClient20241113001 *adminv20241113001.APIClient + SdkClient20250312002 *admin.APIClient } type ProductionProvider struct { @@ -144,25 +142,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())) + 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: clientv20250312002, }, nil } diff --git a/internal/controller/atlascustomrole/atlascustomrole_controller.go b/internal/controller/atlascustomrole/atlascustomrole_controller.go index 8463eee0b6..37c29a255a 100644 --- a/internal/controller/atlascustomrole/atlascustomrole_controller.go +++ b/internal/controller/atlascustomrole/atlascustomrole_controller.go @@ -149,8 +149,8 @@ func (r *AtlasCustomRoleReconciler) Reconcile(ctx context.Context, req ctrl.Requ if err != nil { return r.terminate(workflowCtx, atlasCustomRole, api.ProjectCustomRolesReadyType, workflow.AtlasAPIAccessNotConfigured, true, err), nil } - service := customroles.NewCustomRoles(atlasSdkClientSet.SdkClient20231115008.CustomDatabaseRolesApi) - project, err := r.ResolveProject(ctx, atlasSdkClientSet.SdkClient20231115008, atlasCustomRole) + service := customroles.NewCustomRoles(atlasSdkClientSet.SdkClient20250312002.CustomDatabaseRolesApi) + project, err := r.ResolveProject(ctx, atlasSdkClientSet.SdkClient20250312002, atlasCustomRole) if err != nil { return r.terminate(workflowCtx, atlasCustomRole, api.ProjectCustomRolesReadyType, workflow.AtlasAPIAccessNotConfigured, true, err), nil } diff --git a/internal/controller/atlascustomrole/atlascustomrole_controller_test.go b/internal/controller/atlascustomrole/atlascustomrole_controller_test.go index 51da1469fe..409ef530e4 100644 --- a/internal/controller/atlascustomrole/atlascustomrole_controller_test.go +++ b/internal/controller/atlascustomrole/atlascustomrole_controller_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -398,7 +398,7 @@ func TestAtlasCustomRoleReconciler_Reconcile(t *testing.T) { pAPI.EXPECT().GetProjectExecute(admin.GetProjectApiRequest{ApiService: pAPI}). Return(grp, nil, nil) } - return &atlas.ClientSet{SdkClient20231115008: &admin.APIClient{ + return &atlas.ClientSet{SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: cdrAPI, ProjectsApi: pAPI, }}, nil diff --git a/internal/controller/atlascustomrole/custom_role_test.go b/internal/controller/atlascustomrole/custom_role_test.go index 86e2a61e18..65b7445e2f 100644 --- a/internal/controller/atlascustomrole/custom_role_test.go +++ b/internal/controller/atlascustomrole/custom_role_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -757,7 +757,7 @@ func Test_handleCustomRole(t *testing.T) { Log: zap.S(), OrgID: "", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: func() admin.CustomDatabaseRolesApi { cdrAPI := mockadmin.NewCustomDatabaseRolesApi(t) cdrAPI.EXPECT().GetCustomDatabaseRole(context.Background(), "testProjectID", "testRole"). @@ -826,7 +826,7 @@ func Test_handleCustomRole(t *testing.T) { Log: zap.S(), OrgID: "", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: func() admin.CustomDatabaseRolesApi { cdrAPI := mockadmin.NewCustomDatabaseRolesApi(t) cdrAPI.EXPECT().GetCustomDatabaseRole(context.Background(), "testProjectID", "testRole"). @@ -916,14 +916,14 @@ func Test_handleCustomRole(t *testing.T) { Log: zap.S(), OrgID: "", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: func() admin.CustomDatabaseRolesApi { cdrAPI := mockadmin.NewCustomDatabaseRolesApi(t) return cdrAPI }(), ProjectsApi: func() admin.ProjectsApi { notFound := &admin.GenericOpenAPIError{} - notFound.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("RESOURCE_NOT_FOUND")}) + notFound.SetModel(admin.ApiError{ErrorCode: "RESOURCE_NOT_FOUND"}) projectAPI := mockadmin.NewProjectsApi(t) projectAPI.EXPECT().GetProjectByName(mock.Anything, "testProject"). @@ -976,7 +976,7 @@ func Test_handleCustomRole(t *testing.T) { Log: zap.S(), OrgID: "", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: func() admin.CustomDatabaseRolesApi { cdrAPI := mockadmin.NewCustomDatabaseRolesApi(t) return cdrAPI @@ -1014,7 +1014,7 @@ func Test_handleCustomRole(t *testing.T) { WithScheme(testScheme). WithObjects(tt.args.k8sObjects...). Build() - service := customroles.NewCustomRoles(tt.args.ctx.SdkClientSet.SdkClient20231115008.CustomDatabaseRolesApi) + service := customroles.NewCustomRoles(tt.args.ctx.SdkClientSet.SdkClient20250312002.CustomDatabaseRolesApi) r := AtlasCustomRoleReconciler{ AtlasReconciler: reconciler.AtlasReconciler{Client: k8sClient}, } @@ -1036,5 +1036,5 @@ func solveProjectID(t *testing.T, r *AtlasCustomRoleReconciler, args args) (*pro if args.akoCustomRole.Spec.ProjectDualReference.ExternalProjectRef != nil { return &project.Project{ID: args.akoCustomRole.Spec.ExternalProjectRef.ID}, nil } - return r.ResolveProject(args.ctx.Context, args.ctx.SdkClientSet.SdkClient20231115008, args.akoCustomRole) + return r.ResolveProject(args.ctx.Context, args.ctx.SdkClientSet.SdkClient20250312002, args.akoCustomRole) } diff --git a/internal/controller/atlasdatabaseuser/databaseuser.go b/internal/controller/atlasdatabaseuser/databaseuser.go index bd48a513f6..54315aaa70 100644 --- a/internal/controller/atlasdatabaseuser/databaseuser.go +++ b/internal/controller/atlasdatabaseuser/databaseuser.go @@ -66,9 +66,9 @@ func (r *AtlasDatabaseUserReconciler) handleDatabaseUser(ctx *workflow.Context, if err != nil { return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.AtlasAPIAccessNotConfigured, true, err) } - dbUserService := dbuser.NewAtlasUsers(sdkClientSet.SdkClient20231115008.DatabaseUsersApi) - deploymentService := deployment.NewAtlasDeployments(sdkClientSet.SdkClient20231115008.ClustersApi, sdkClientSet.SdkClient20231115008.ServerlessInstancesApi, sdkClientSet.SdkClient20231115008.GlobalClustersApi, sdkClientSet.SdkClient20241113001.FlexClustersApi, r.AtlasProvider.IsCloudGov()) - atlasProject, err := r.ResolveProject(ctx.Context, sdkClientSet.SdkClient20231115008, atlasDatabaseUser) + dbUserService := dbuser.NewAtlasUsers(sdkClientSet.SdkClient20250312002.DatabaseUsersApi) + deploymentService := deployment.NewAtlasDeployments(sdkClientSet.SdkClient20250312002.ClustersApi, sdkClientSet.SdkClient20250312002.ServerlessInstancesApi, sdkClientSet.SdkClient20250312002.GlobalClustersApi, sdkClientSet.SdkClient20250312002.FlexClustersApi, r.AtlasProvider.IsCloudGov()) + atlasProject, err := r.ResolveProject(ctx.Context, sdkClientSet.SdkClient20250312002, atlasDatabaseUser) if err != nil { return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.AtlasAPIAccessNotConfigured, true, err) } diff --git a/internal/controller/atlasdatabaseuser/databaseuser_test.go b/internal/controller/atlasdatabaseuser/databaseuser_test.go index f3ac450846..822fdb5530 100644 --- a/internal/controller/atlasdatabaseuser/databaseuser_test.go +++ b/internal/controller/atlasdatabaseuser/databaseuser_test.go @@ -24,9 +24,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" @@ -202,8 +201,7 @@ func TestHandleDatabaseUser(t *testing.T) { clusterAPI := mockadmin.NewClustersApi(t) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ProjectsApi: projectAPI, ClustersApi: clusterAPI, DatabaseUsersApi: userAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{ProjectsApi: projectAPI, ClustersApi: clusterAPI, DatabaseUsersApi: userAPI}, }, nil }, }, @@ -2282,12 +2280,11 @@ func DefaultTestProvider(t *testing.T) *atlasmock.TestProvider { Return(&admin.Group{Id: pointer.MakePtr("my-project")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectsApi: projectAPI, ClustersApi: clusterAPI, DatabaseUsersApi: userAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{}, }, nil }, } diff --git a/internal/controller/atlasdatafederation/datafederation_controller.go b/internal/controller/atlasdatafederation/datafederation_controller.go index b27fdf2a72..918b632c54 100644 --- a/internal/controller/atlasdatafederation/datafederation_controller.go +++ b/internal/controller/atlasdatafederation/datafederation_controller.go @@ -125,8 +125,8 @@ func (r *AtlasDataFederationReconciler) Reconcile(context context.Context, req c ctx.SetConditionFromResult(api.DatabaseUserReadyType, result) return result.ReconcileResult(), nil } - endpointService := datafederation.NewDatafederationPrivateEndpoint(clientSet.SdkClient20231115008.DataFederationApi) - dataFederationService := datafederation.NewAtlasDataFederation(clientSet.SdkClient20231115008.DataFederationApi) + endpointService := datafederation.NewDatafederationPrivateEndpoint(clientSet.SdkClient20250312002.DataFederationApi) + dataFederationService := datafederation.NewAtlasDataFederation(clientSet.SdkClient20250312002.DataFederationApi) if result = r.ensureDataFederation(ctx, project, dataFederation, dataFederationService); !result.IsOk() { ctx.SetConditionFromResult(api.DataFederationReadyType, result) diff --git a/internal/controller/atlasdeployment/advanced_deployment.go b/internal/controller/atlasdeployment/advanced_deployment.go index 56644b1d27..6c26de356a 100644 --- a/internal/controller/atlasdeployment/advanced_deployment.go +++ b/internal/controller/atlasdeployment/advanced_deployment.go @@ -89,7 +89,7 @@ func (r *AtlasDeploymentReconciler) handleAdvancedDeployment(ctx *workflow.Conte results = append(results, searchNodeResult) } - searchService := searchindex.NewSearchIndexes(ctx.SdkClientSet.SdkClient20241113001.AtlasSearchApi) + searchService := searchindex.NewSearchIndexes(ctx.SdkClientSet.SdkClient20250312002.AtlasSearchApi) result := handleSearchIndexes(ctx, r.Client, searchService, akoCluster.GetCustomResource(), akoCluster.GetProjectID()) results = append(results, result) diff --git a/internal/controller/atlasdeployment/advanced_deployment_test.go b/internal/controller/atlasdeployment/advanced_deployment_test.go index 7fee1c8e35..b3a1936acb 100644 --- a/internal/controller/atlasdeployment/advanced_deployment_test.go +++ b/internal/controller/atlasdeployment/advanced_deployment_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -751,7 +751,7 @@ func TestHandleAdvancedDeployment(t *testing.T) { Context: context.Background(), Log: logger, SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: tt.sdkMock(), + SdkClient20250312002: tt.sdkMock(), }, } diff --git a/internal/controller/atlasdeployment/atlasdeployment_controller.go b/internal/controller/atlasdeployment/atlasdeployment_controller.go index e1ebbdf269..ab0af9bb82 100644 --- a/internal/controller/atlasdeployment/atlasdeployment_controller.go +++ b/internal/controller/atlasdeployment/atlasdeployment_controller.go @@ -143,9 +143,9 @@ func (r *AtlasDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Requ if err != nil { return r.terminate(workflowCtx, workflow.AtlasAPIAccessNotConfigured, err) } - projectService := project.NewProjectAPIService(sdkClientSet.SdkClient20231115008.ProjectsApi) - deploymentService := deployment.NewAtlasDeployments(sdkClientSet.SdkClient20231115008.ClustersApi, sdkClientSet.SdkClient20231115008.ServerlessInstancesApi, sdkClientSet.SdkClient20231115008.GlobalClustersApi, sdkClientSet.SdkClient20241113001.FlexClustersApi, r.AtlasProvider.IsCloudGov()) - atlasProject, err := r.ResolveProject(workflowCtx.Context, sdkClientSet.SdkClient20231115008, atlasDeployment) + projectService := project.NewProjectAPIService(sdkClientSet.SdkClient20250312002.ProjectsApi) + deploymentService := deployment.NewAtlasDeployments(sdkClientSet.SdkClient20250312002.ClustersApi, sdkClientSet.SdkClient20250312002.ServerlessInstancesApi, sdkClientSet.SdkClient20250312002.GlobalClustersApi, sdkClientSet.SdkClient20250312002.FlexClustersApi, r.AtlasProvider.IsCloudGov()) + atlasProject, err := r.ResolveProject(workflowCtx.Context, sdkClientSet.SdkClient20250312002, atlasDeployment) if err != nil { return r.terminate(workflowCtx, workflow.AtlasAPIAccessNotConfigured, err) } diff --git a/internal/controller/atlasdeployment/atlasdeployment_controller_test.go b/internal/controller/atlasdeployment/atlasdeployment_controller_test.go index a015a4bbc5..f397372528 100644 --- a/internal/controller/atlasdeployment/atlasdeployment_controller_test.go +++ b/internal/controller/atlasdeployment/atlasdeployment_controller_test.go @@ -26,10 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" - mockadminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -400,22 +398,22 @@ func TestRegularClusterReconciliation(t *testing.T) { Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().GetClusterExecute(mock.AnythingOfType("admin.GetClusterApiRequest")). Return( - &admin.AdvancedClusterDescription{ + &admin.ClusterDescription20240805{ GroupId: pointer.MakePtr(project.ID()), Name: pointer.MakePtr(d.GetDeploymentName()), ClusterType: pointer.MakePtr(d.Spec.DeploymentSpec.ClusterType), BackupEnabled: pointer.MakePtr(true), StateName: pointer.MakePtr("IDLE"), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { ZoneName: pointer.MakePtr("Zone 1"), NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(3), }, @@ -431,7 +429,7 @@ func TestRegularClusterReconciliation(t *testing.T) { Return(admin.GetClusterAdvancedConfigurationApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().GetClusterAdvancedConfigurationExecute(mock.AnythingOfType("admin.GetClusterAdvancedConfigurationApiRequest")). Return( - &admin.ClusterDescriptionProcessArgs{}, + &admin.ClusterDescriptionProcessArgs20240805{}, &http.Response{}, nil, ) @@ -465,16 +463,16 @@ func TestRegularClusterReconciliation(t *testing.T) { globalAPI.EXPECT().GetManagedNamespace(mock.Anything, project.ID(), d.Spec.DeploymentSpec.Name). Return(admin.GetManagedNamespaceApiRequest{ApiService: globalAPI}) globalAPI.EXPECT().GetManagedNamespaceExecute(mock.Anything). - Return(&admin.GeoSharding{}, nil, nil) + Return(&admin.GeoSharding20240805{}, nil, nil) - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return &atlas.ClientSet{ - SdkClient20241113001: &adminv20241113001.APIClient{FlexClustersApi: flexAPI}, - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ + FlexClustersApi: flexAPI, ClustersApi: clusterAPI, AtlasSearchApi: searchAPI, ServerlessInstancesApi: mockadmin.NewServerlessInstancesApi(t), @@ -630,7 +628,7 @@ func TestServerlessInstanceReconciliation(t *testing.T) { atlasProvider := &atlasmock.TestProvider{ SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { err := &admin.GenericOpenAPIError{} - err.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr(atlas.ServerlessInstanceFromClusterAPI)}) + err.SetModel(admin.ApiError{ErrorCode: atlas.ServerlessInstanceFromClusterAPI}) clusterAPI := mockadmin.NewClustersApi(t) serverlessAPI := mockadmin.NewServerlessInstancesApi(t) @@ -668,16 +666,16 @@ func TestServerlessInstanceReconciliation(t *testing.T) { projectAPI.EXPECT().GetProjectByNameExecute(mock.Anything). Return(&admin.Group{Id: pointer.MakePtr("abc123")}, nil, nil) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ + FlexClustersApi: flexAPI, ClustersApi: clusterAPI, ServerlessInstancesApi: serverlessAPI, ServerlessPrivateEndpointsApi: speClient, ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{FlexClustersApi: flexAPI}, }, nil }, ClientFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*mongodbatlas.Client, error) { @@ -766,16 +764,16 @@ func TestFlexClusterReconciliation(t *testing.T) { atlasProvider := &atlasmock.TestProvider{ SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(mock.Anything, project.ID(), mock.Anything). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return( - &adminv20241113001.FlexClusterDescription20241113{ + &admin.FlexClusterDescription20241113{ GroupId: pointer.MakePtr(project.ID()), Name: pointer.MakePtr(d.GetDeploymentName()), - ProviderSettings: adminv20241113001.FlexProviderSettings20241113{ + ProviderSettings: admin.FlexProviderSettings20241113{ BackingProviderName: pointer.MakePtr("AWS"), ProviderName: pointer.MakePtr("FLEX"), RegionName: pointer.MakePtr("US_EAST_1"), @@ -797,12 +795,12 @@ func TestFlexClusterReconciliation(t *testing.T) { Return(&admin.Group{Id: pointer.MakePtr("abc123")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ + FlexClustersApi: flexAPI, ClustersApi: clusterAPI, ServerlessInstancesApi: serverlessAPI, ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{FlexClustersApi: flexAPI}, }, nil }, ClientFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*mongodbatlas.Client, error) { @@ -932,32 +930,32 @@ func TestDeletionReconciliation(t *testing.T) { logger := zaptest.NewLogger(t).Sugar() atlasProvider := &atlasmock.TestProvider{ SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(mock.Anything, project.ID(), mock.Anything). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().GetClusterExecute(mock.AnythingOfType("admin.GetClusterApiRequest")). Return( - &admin.AdvancedClusterDescription{ + &admin.ClusterDescription20240805{ GroupId: pointer.MakePtr(project.ID()), Name: pointer.MakePtr(d.GetDeploymentName()), ClusterType: pointer.MakePtr(d.Spec.DeploymentSpec.ClusterType), BackupEnabled: pointer.MakePtr(true), StateName: pointer.MakePtr("IDLE"), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { ZoneName: pointer.MakePtr("Zone 1"), NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(3), }, @@ -981,12 +979,12 @@ func TestDeletionReconciliation(t *testing.T) { Return(&admin.Group{Id: pointer.MakePtr("abc123")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ + FlexClustersApi: flexAPI, ClustersApi: clusterAPI, ServerlessInstancesApi: mockadmin.NewServerlessInstancesApi(t), ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{FlexClustersApi: flexAPI}, }, nil }, ClientFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*mongodbatlas.Client, error) { @@ -1327,7 +1325,7 @@ func TestChangeDeploymentType(t *testing.T) { Return(admin.GetServerlessInstanceApiRequest{ApiService: serverlessAPI}) err := &admin.GenericOpenAPIError{} - err.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr(atlas.ClusterInstanceFromServerlessAPI)}) + err.SetModel(admin.ApiError{ErrorCode: atlas.ClusterInstanceFromServerlessAPI}) err.SetError("wrong API") serverlessAPI.EXPECT().GetServerlessInstanceExecute(mock.Anything).Return(nil, nil, err) @@ -1338,11 +1336,10 @@ func TestChangeDeploymentType(t *testing.T) { Return(&admin.Group{Id: pointer.MakePtr("abc123")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessInstancesApi: serverlessAPI, ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{}, }, nil }, }, @@ -1385,7 +1382,7 @@ func TestChangeDeploymentType(t *testing.T) { Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) err := &admin.GenericOpenAPIError{} - err.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr(atlas.ServerlessInstanceFromClusterAPI)}) + err.SetModel(admin.ApiError{ErrorCode: atlas.ServerlessInstanceFromClusterAPI}) err.SetError("wrong API") clusterAPI.EXPECT().GetClusterExecute(mock.Anything).Return(nil, nil, err) @@ -1396,11 +1393,10 @@ func TestChangeDeploymentType(t *testing.T) { Return(&admin.Group{Id: pointer.MakePtr("abc123")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ClustersApi: clusterAPI, ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{}, }, nil }, }, diff --git a/internal/controller/atlasdeployment/search_nodes.go b/internal/controller/atlasdeployment/search_nodes.go index 3d70e96f13..8b485bff78 100644 --- a/internal/controller/atlasdeployment/search_nodes.go +++ b/internal/controller/atlasdeployment/search_nodes.go @@ -20,7 +20,7 @@ import ( "net/http" "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -186,7 +186,7 @@ func (s *searchNodeController) handleDeleting() workflow.Result { // - terminated: when an error occurred. func (s *searchNodeController) create() workflow.Result { s.ctx.Log.Debugf("creating search nodes %v", s.deployment.Spec.DeploymentSpec.SearchNodes) - resp, _, err := s.ctx.SdkClientSet.SdkClient20231115008.AtlasSearchApi.CreateAtlasSearchDeployment(s.ctx.Context, s.projectID, s.deployment.GetDeploymentName(), &admin.ApiSearchDeploymentRequest{ + resp, _, err := s.ctx.SdkClientSet.SdkClient20250312002.AtlasSearchApi.CreateAtlasSearchDeployment(s.ctx.Context, s.projectID, s.deployment.GetDeploymentName(), &admin.ApiSearchDeploymentRequest{ Specs: s.deployment.Spec.DeploymentSpec.SearchNodesToAtlas(), }).Execute() if err != nil { @@ -209,7 +209,7 @@ func (s *searchNodeController) update(atlasNodes *admin.ApiSearchDeploymentRespo currentAkoNodesAsAtlas := s.deployment.Spec.DeploymentSpec.SearchNodesToAtlas() // We can deepequal without normalization here because there is only ever 1 spec in the array if !reflect.DeepEqual(currentAkoNodesAsAtlas, atlasNodes.GetSpecs()) { - updateResponse, _, err := s.ctx.SdkClientSet.SdkClient20231115008.AtlasSearchApi.UpdateAtlasSearchDeployment( + updateResponse, _, err := s.ctx.SdkClientSet.SdkClient20250312002.AtlasSearchApi.UpdateAtlasSearchDeployment( s.ctx.Context, s.projectID, s.deployment.GetDeploymentName(), &admin.ApiSearchDeploymentRequest{ Specs: s.deployment.Spec.DeploymentSpec.SearchNodesToAtlas(), }).Execute() @@ -244,7 +244,7 @@ func (s *searchNodeController) update(atlasNodes *admin.ApiSearchDeploymentRespo // - terminated: when an error occurred. func (s *searchNodeController) delete() workflow.Result { s.ctx.Log.Debug("deleting search nodes") - _, err := s.ctx.SdkClientSet.SdkClient20231115008.AtlasSearchApi.DeleteAtlasSearchDeployment(s.ctx.Context, s.projectID, s.deployment.GetDeploymentName()).Execute() + _, err := s.ctx.SdkClientSet.SdkClient20250312002.AtlasSearchApi.DeleteAtlasSearchDeployment(s.ctx.Context, s.projectID, s.deployment.GetDeploymentName()).Execute() if err != nil { return s.terminate(workflow.ErrorSearchNodesNotDeletedInAtlas, err) } @@ -289,7 +289,7 @@ func (s *searchNodeController) idle() workflow.Result { } func (s *searchNodeController) getAtlasSearchDeployment() (*admin.ApiSearchDeploymentResponse, bool, error) { - atlasNodes, _, err := s.ctx.SdkClientSet.SdkClient20231115008.AtlasSearchApi.GetAtlasSearchDeployment(s.ctx.Context, s.projectID, s.deployment.GetDeploymentName()).Execute() + atlasNodes, _, err := s.ctx.SdkClientSet.SdkClient20250312002.AtlasSearchApi.GetAtlasSearchDeployment(s.ctx.Context, s.projectID, s.deployment.GetDeploymentName()).Execute() if err != nil { apiError, ok := admin.AsError(err) // TODO: Currently 400, should be be 404: CLOUDP-239015 diff --git a/internal/controller/atlasdeployment/search_nodes_test.go b/internal/controller/atlasdeployment/search_nodes_test.go index db5b640d46..67e9260a31 100644 --- a/internal/controller/atlasdeployment/search_nodes_test.go +++ b/internal/controller/atlasdeployment/search_nodes_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" @@ -52,7 +52,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -108,7 +108,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -146,7 +146,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -193,7 +193,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -244,7 +244,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -286,7 +286,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -331,7 +331,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -376,7 +376,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -410,7 +410,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -448,7 +448,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -487,7 +487,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -526,7 +526,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -561,7 +561,7 @@ func TestHandleSearchNodes(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AtlasSearchApi: searchAPI, }, }, @@ -579,7 +579,7 @@ func TestHandleSearchNodes(t *testing.T) { func makeMockError() *admin.GenericOpenAPIError { mockError := &admin.GenericOpenAPIError{} - model := *admin.NewApiError() + model := *admin.NewApiErrorWithDefaults() model.SetError(http.StatusBadRequest) mockError.SetModel(model) return mockError diff --git a/internal/controller/atlasdeployment/searchindex_test.go b/internal/controller/atlasdeployment/searchindex_test.go index 23232c8f1f..1269ced88e 100644 --- a/internal/controller/atlasdeployment/searchindex_test.go +++ b/internal/controller/atlasdeployment/searchindex_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20241113001/admin" - "go.mongodb.org/atlas-sdk/v20241113001/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -433,7 +433,7 @@ func Test_searchIndexReconcileRequest(t *testing.T) { ctx: &workflow.Context{ Log: zap.S(), OrgID: "testOrgID", - SdkClientSet: &atlas.ClientSet{SdkClient20241113001: &admin.APIClient{}}, + SdkClientSet: &atlas.ClientSet{SdkClient20250312002: &admin.APIClient{}}, Context: context.Background(), }, deployment: nil, @@ -450,7 +450,7 @@ func Test_searchIndexReconcileRequest(t *testing.T) { ctx: &workflow.Context{ Log: zap.S(), OrgID: "testOrgID", - SdkClientSet: &atlas.ClientSet{SdkClient20241113001: &admin.APIClient{}}, + SdkClientSet: &atlas.ClientSet{SdkClient20250312002: &admin.APIClient{}}, Context: context.Background(), }, deployment: nil, diff --git a/internal/controller/atlasdeployment/serverless_deployment_test.go b/internal/controller/atlasdeployment/serverless_deployment_test.go index d39a59bdc9..3214e26932 100644 --- a/internal/controller/atlasdeployment/serverless_deployment_test.go +++ b/internal/controller/atlasdeployment/serverless_deployment_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -638,7 +638,7 @@ func TestHandleServerlessInstance(t *testing.T) { }, sdkMock: func() *admin.APIClient { mockError := &admin.GenericOpenAPIError{} - model := *admin.NewApiError() + model := *admin.NewApiErrorWithDefaults() model.SetErrorCode("NOT_SERVERLESS_TENANT_CLUSTER") mockError.SetModel(model) @@ -915,7 +915,7 @@ func TestHandleServerlessInstance(t *testing.T) { Context: ctx, Log: logger.Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: tt.sdkMock(), + SdkClient20250312002: tt.sdkMock(), }, } diff --git a/internal/controller/atlasdeployment/serverless_private_endpoint.go b/internal/controller/atlasdeployment/serverless_private_endpoint.go index e74e773b63..0534ffb98c 100644 --- a/internal/controller/atlasdeployment/serverless_private_endpoint.go +++ b/internal/controller/atlasdeployment/serverless_private_endpoint.go @@ -18,7 +18,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -159,7 +159,7 @@ func isGCPWithoutPrivateEndpoints(deployment *akov2.ServerlessSpec) bool { func listServerlessPrivateEndpoints(service *workflow.Context, projectID, deploymentName string) ([]admin.ServerlessTenantEndpoint, error) { // this endpoint does not offer paginated responses - privateEndpoints, _, err := service.SdkClientSet.SdkClient20231115008.ServerlessPrivateEndpointsApi. + privateEndpoints, _, err := service.SdkClientSet.SdkClient20250312002.ServerlessPrivateEndpointsApi. ListServerlessPrivateEndpoints(service.Context, projectID, deploymentName). Execute() @@ -171,7 +171,7 @@ func createServerLessPrivateEndpoint(service *workflow.Context, projectID, deplo Comment: &privateEndpoint.Name, } - atlasPrivateEndpoint, _, err := service.SdkClientSet.SdkClient20231115008.ServerlessPrivateEndpointsApi. + atlasPrivateEndpoint, _, err := service.SdkClientSet.SdkClient20250312002.ServerlessPrivateEndpointsApi. CreateServerlessPrivateEndpoint(service.Context, projectID, deploymentName, &request). Execute() @@ -190,7 +190,7 @@ func updateServerLessPrivateEndpoint(service *workflow.Context, projectID, deplo request.PrivateEndpointIpAddress = &privateEndpoint.PrivateEndpointIPAddress } - atlasPrivateEndpoint, _, err := service.SdkClientSet.SdkClient20231115008.ServerlessPrivateEndpointsApi. + atlasPrivateEndpoint, _, err := service.SdkClientSet.SdkClient20250312002.ServerlessPrivateEndpointsApi. UpdateServerlessPrivateEndpoint(service.Context, projectID, deploymentName, endpointID, &request). Execute() @@ -198,7 +198,7 @@ func updateServerLessPrivateEndpoint(service *workflow.Context, projectID, deplo } func deleteServerLessPrivateEndpoint(service *workflow.Context, projectID, deploymentName, endpointID string) error { - _, _, err := service.SdkClientSet.SdkClient20231115008.ServerlessPrivateEndpointsApi. + _, _, err := service.SdkClientSet.SdkClient20250312002.ServerlessPrivateEndpointsApi. DeleteServerlessPrivateEndpoint(service.Context, projectID, deploymentName, endpointID). Execute() diff --git a/internal/controller/atlasdeployment/serverless_private_endpoint_test.go b/internal/controller/atlasdeployment/serverless_private_endpoint_test.go index 4daf3b1eb1..9ac16494da 100644 --- a/internal/controller/atlasdeployment/serverless_private_endpoint_test.go +++ b/internal/controller/atlasdeployment/serverless_private_endpoint_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -121,7 +121,7 @@ func TestEnsureServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -157,7 +157,7 @@ func TestEnsureServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -209,7 +209,7 @@ func TestEnsureServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -276,7 +276,7 @@ func TestEnsureServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -370,7 +370,6 @@ func TestSyncServerlessPrivateEndpoints(t *testing.T) { Return(admin.DeleteServerlessPrivateEndpointApiRequest{ApiService: speAPI}) speAPI.EXPECT().DeleteServerlessPrivateEndpointExecute(mock.AnythingOfType("admin.DeleteServerlessPrivateEndpointApiRequest")). Return( - map[string]interface{}{}, &http.Response{}, nil, ) @@ -378,7 +377,7 @@ func TestSyncServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -419,7 +418,7 @@ func TestSyncServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -472,7 +471,7 @@ func TestSyncServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, @@ -511,7 +510,6 @@ func TestSyncServerlessPrivateEndpoints(t *testing.T) { Return(admin.DeleteServerlessPrivateEndpointApiRequest{ApiService: speAPI}) speAPI.EXPECT().DeleteServerlessPrivateEndpointExecute(mock.AnythingOfType("admin.DeleteServerlessPrivateEndpointApiRequest")). Return( - nil, &http.Response{}, errors.New("failed to delete serverless private endpoint"), ) @@ -519,7 +517,7 @@ func TestSyncServerlessPrivateEndpoints(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ServerlessPrivateEndpointsApi: speAPI, }, }, diff --git a/internal/controller/atlasfederatedauth/atlasfederated_auth.go b/internal/controller/atlasfederatedauth/atlasfederated_auth.go index bd5aacd1da..05d0596f0f 100644 --- a/internal/controller/atlasfederatedauth/atlasfederated_auth.go +++ b/internal/controller/atlasfederatedauth/atlasfederated_auth.go @@ -21,8 +21,7 @@ import ( "net/http" "github.com/google/go-cmp/cmp" - adminv20231115008 "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/workflow" @@ -36,27 +35,27 @@ func (r *AtlasFederatedAuthReconciler) ensureFederatedAuth(service *workflow.Con } // Get current IDP for the ORG - atlasFedSettings, _, err := service.SdkClientSet.SdkClient20241113001.FederatedAuthenticationApi. + atlasFedSettings, _, err := service.SdkClientSet.SdkClient20250312002.FederatedAuthenticationApi. GetFederationSettings(service.Context, service.OrgID). Execute() if err != nil { return workflow.Terminate(workflow.FederatedAuthNotAvailable, err) } - identityProvider, err := GetIdentityProviderForFederatedSettings(service.Context, service.SdkClientSet.SdkClient20241113001, atlasFedSettings) + identityProvider, err := GetIdentityProviderForFederatedSettings(service.Context, service.SdkClientSet.SdkClient20250312002, atlasFedSettings) if err != nil { return workflow.Terminate(workflow.FederatedAuthNotAvailable, err) } // Get current Org config - orgConfig, _, err := service.SdkClientSet.SdkClient20241113001.FederatedAuthenticationApi. + orgConfig, _, err := service.SdkClientSet.SdkClient20250312002.FederatedAuthenticationApi. GetConnectedOrgConfig(service.Context, atlasFedSettings.GetId(), service.OrgID). Execute() if err != nil { return workflow.Terminate(workflow.FederatedAuthOrgNotConnected, err) } - projectList, err := prepareProjectList(service.Context, service.SdkClientSet.SdkClient20231115008) + projectList, err := prepareProjectList(service.Context, service.SdkClientSet.SdkClient20250312002) if err != nil { return workflow.Terminate(workflow.Internal, fmt.Errorf("cannot list projects for org ID %s: %w", service.OrgID, err)) } @@ -66,7 +65,7 @@ func (r *AtlasFederatedAuthReconciler) ensureFederatedAuth(service *workflow.Con return workflow.Terminate(workflow.Internal, fmt.Errorf("cannot convert Federated Auth spec to Atlas: %w", err)) } - if result := r.ensureIDPSettings(service.Context, atlasFedSettings.GetId(), identityProvider, fedauth, service.SdkClientSet.SdkClient20241113001); !result.IsOk() { + if result := r.ensureIDPSettings(service.Context, atlasFedSettings.GetId(), identityProvider, fedauth, service.SdkClientSet.SdkClient20250312002); !result.IsOk() { return result } @@ -74,7 +73,7 @@ func (r *AtlasFederatedAuthReconciler) ensureFederatedAuth(service *workflow.Con return workflow.OK() } - updatedSettings, _, err := service.SdkClientSet.SdkClient20241113001.FederatedAuthenticationApi. + updatedSettings, _, err := service.SdkClientSet.SdkClient20250312002.FederatedAuthenticationApi. UpdateConnectedOrgConfig(service.Context, atlasFedSettings.GetId(), service.OrgID, operatorConf). Execute() if err != nil { @@ -94,12 +93,12 @@ func (r *AtlasFederatedAuthReconciler) ensureFederatedAuth(service *workflow.Con return workflow.OK() } -func prepareProjectList(ctx context.Context, client *adminv20231115008.APIClient) (map[string]string, error) { +func prepareProjectList(ctx context.Context, client *admin.APIClient) (map[string]string, error) { if client == nil { return nil, errors.New("client is not created") } - projects, err := paging.ListAll(ctx, func(ctx context.Context, pageNum int) (paging.Response[adminv20231115008.Group], *http.Response, error) { + projects, err := paging.ListAll(ctx, func(ctx context.Context, pageNum int) (paging.Response[admin.Group], *http.Response, error) { return client.ProjectsApi.ListProjects(ctx).PageNum(pageNum).Execute() }) if err != nil { diff --git a/internal/controller/atlasfederatedauth/atlasfederated_auth_controller_test.go b/internal/controller/atlasfederatedauth/atlasfederated_auth_controller_test.go index 2d2a37f6b1..3e18bed5a6 100644 --- a/internal/controller/atlasfederatedauth/atlasfederated_auth_controller_test.go +++ b/internal/controller/atlasfederatedauth/atlasfederated_auth_controller_test.go @@ -22,10 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" - mockadminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" @@ -107,12 +105,12 @@ func TestReconcile(t *testing.T) { Build() logger := zaptest.NewLogger(t).Sugar() - fedAuthAPI := mockadminv20241113001.NewFederatedAuthenticationApi(t) + fedAuthAPI := mockadmin.NewFederatedAuthenticationApi(t) fedAuthAPI.EXPECT().GetFederationSettings(mock.Anything, orgID). - Return(adminv20241113001.GetFederationSettingsApiRequest{ApiService: fedAuthAPI}) + Return(admin.GetFederationSettingsApiRequest{ApiService: fedAuthAPI}) fedAuthAPI.EXPECT().GetFederationSettingsExecute(mock.Anything). Return( - &adminv20241113001.OrgFederationSettings{ + &admin.OrgFederationSettings{ Id: pointer.MakePtr(fedSettingsID), IdentityProviderId: pointer.MakePtr("0oawce8e76SR9K7Tq357"), FederatedDomains: &[]string{"qa-27092023.com", "cloud-qa.mongodb.com"}, @@ -123,11 +121,11 @@ func TestReconcile(t *testing.T) { nil, ) fedAuthAPI.EXPECT().ListIdentityProviders(mock.Anything, fedSettingsID). - Return(adminv20241113001.ListIdentityProvidersApiRequest{ApiService: fedAuthAPI}) + Return(admin.ListIdentityProvidersApiRequest{ApiService: fedAuthAPI}) fedAuthAPI.EXPECT().ListIdentityProvidersExecute(mock.Anything). Return( - &adminv20241113001.PaginatedFederationIdentityProvider{ - Results: &[]adminv20241113001.FederationIdentityProvider{ + &admin.PaginatedFederationIdentityProvider{ + Results: &[]admin.FederationIdentityProvider{ { Id: "65143bd1612f01218e885cf2", OktaIdpId: "0oawce8e76SR9K7Tq357", @@ -139,10 +137,10 @@ func TestReconcile(t *testing.T) { nil, ) fedAuthAPI.EXPECT().GetConnectedOrgConfig(mock.Anything, fedSettingsID, orgID). - Return(adminv20241113001.GetConnectedOrgConfigApiRequest{ApiService: fedAuthAPI}) + Return(admin.GetConnectedOrgConfigApiRequest{ApiService: fedAuthAPI}) fedAuthAPI.EXPECT().GetConnectedOrgConfigExecute(mock.Anything). Return( - &adminv20241113001.ConnectedOrgConfig{ + &admin.ConnectedOrgConfig{ OrgId: "616ec36209c07e743422b7cc", DomainAllowList: &[]string{"qa-27092023.com", "cloud-qa.mongodb.com"}, DomainRestrictionEnabled: true, @@ -172,10 +170,8 @@ func TestReconcile(t *testing.T) { atlasProvider := atlasmock.TestProvider{ SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ - ProjectsApi: groupAPI, - }, - SdkClient20241113001: &adminv20241113001.APIClient{ + SdkClient20250312002: &admin.APIClient{ + ProjectsApi: groupAPI, FederatedAuthenticationApi: fedAuthAPI, }, }, nil diff --git a/internal/controller/atlasipaccesslist/atlasipaccesslist_controller_test.go b/internal/controller/atlasipaccesslist/atlasipaccesslist_controller_test.go index d83e0d5910..140906e724 100644 --- a/internal/controller/atlasipaccesslist/atlasipaccesslist_controller_test.go +++ b/internal/controller/atlasipaccesslist/atlasipaccesslist_controller_test.go @@ -21,9 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" @@ -93,11 +92,10 @@ func TestReconcile(t *testing.T) { Return(&admin.Group{Id: pointer.MakePtr("123")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectIPAccessListApi: ialAPI, ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{}, }, nil }, }, diff --git a/internal/controller/atlasipaccesslist/state.go b/internal/controller/atlasipaccesslist/state.go index 9df741e3b3..086db7cde6 100644 --- a/internal/controller/atlasipaccesslist/state.go +++ b/internal/controller/atlasipaccesslist/state.go @@ -55,11 +55,11 @@ func (r *AtlasIPAccessListReconciler) handleCustomResource(ctx context.Context, if err != nil { return r.terminate(workflowCtx, ipAccessList, api.ReadyType, workflow.AtlasAPIAccessNotConfigured, err) } - atlasProject, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20231115008, ipAccessList) + atlasProject, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20250312002, ipAccessList) if err != nil { return r.terminate(workflowCtx, ipAccessList, api.ReadyType, workflow.AtlasAPIAccessNotConfigured, err) } - ipAccessListService := ipaccesslist.NewIPAccessList(sdkClientSet.SdkClient20231115008.ProjectIPAccessListApi) + ipAccessListService := ipaccesslist.NewIPAccessList(sdkClientSet.SdkClient20250312002.ProjectIPAccessListApi) return r.handleIPAccessList(workflowCtx, ipAccessListService, atlasProject.ID, ipAccessList) } diff --git a/internal/controller/atlasipaccesslist/state_test.go b/internal/controller/atlasipaccesslist/state_test.go index 4be0feeecc..5b0e6575cf 100644 --- a/internal/controller/atlasipaccesslist/state_test.go +++ b/internal/controller/atlasipaccesslist/state_test.go @@ -25,9 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" @@ -227,7 +226,7 @@ func TestHandleCustomResource(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{}, + SdkClient20250312002: &admin.APIClient{}, }, nil }, }, @@ -298,11 +297,10 @@ func TestHandleCustomResource(t *testing.T) { Return(&admin.Group{Id: pointer.MakePtr("123")}, nil, nil) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectIPAccessListApi: ialAPI, ProjectsApi: projectAPI, }, - SdkClient20241113001: &adminv20241113001.APIClient{}, }, nil }, }, diff --git a/internal/controller/atlasnetworkcontainer/state.go b/internal/controller/atlasnetworkcontainer/state.go index 73d530cf1d..f69cde5b05 100644 --- a/internal/controller/atlasnetworkcontainer/state.go +++ b/internal/controller/atlasnetworkcontainer/state.go @@ -65,7 +65,7 @@ func (r *AtlasNetworkContainerReconciler) handleCustomResource(ctx context.Conte if err != nil { return r.terminate(workflowCtx, networkContainer, workflow.NetworkContainerNotConfigured, err), nil } - project, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20231115008, networkContainer) + project, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20250312002, networkContainer) if err != nil { return r.release(workflowCtx, networkContainer, err), nil } diff --git a/internal/controller/atlasnetworkcontainer/state_test.go b/internal/controller/atlasnetworkcontainer/state_test.go index 6451eac783..cfda9b72da 100644 --- a/internal/controller/atlasnetworkcontainer/state_test.go +++ b/internal/controller/atlasnetworkcontainer/state_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" @@ -246,7 +246,7 @@ func TestHandleCustomResource(t *testing.T) { SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { pAPI := mockadmin.NewProjectsApi(t) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ProjectsApi: pAPI}, + SdkClient20250312002: &admin.APIClient{ProjectsApi: pAPI}, }, nil }, }, @@ -308,7 +308,7 @@ func TestHandleCustomResource(t *testing.T) { }, nil, nil, ) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ NetworkPeeringApi: ncAPI, ProjectsApi: pAPI, }, diff --git a/internal/controller/atlasnetworkpeering/state.go b/internal/controller/atlasnetworkpeering/state.go index 6bc4d0edf4..71a47bf05c 100644 --- a/internal/controller/atlasnetworkpeering/state.go +++ b/internal/controller/atlasnetworkpeering/state.go @@ -68,7 +68,7 @@ func (r *AtlasNetworkPeeringReconciler) handleCustomResource(ctx context.Context if err != nil { return r.terminate(workflowCtx, networkPeering, workflow.NetworkPeeringNotConfigured, err) } - project, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20231115008, networkPeering) + project, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20250312002, networkPeering) if err != nil { return r.release(workflowCtx, networkPeering, err) } diff --git a/internal/controller/atlasnetworkpeering/state_test.go b/internal/controller/atlasnetworkpeering/state_test.go index 21c6c66362..143124b0d7 100644 --- a/internal/controller/atlasnetworkpeering/state_test.go +++ b/internal/controller/atlasnetworkpeering/state_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" @@ -219,7 +219,7 @@ func TestHandleCustomResource(t *testing.T) { SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { pAPI := mockadmin.NewProjectsApi(t) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectsApi: pAPI, }, }, nil @@ -270,7 +270,7 @@ func TestHandleCustomResource(t *testing.T) { ) npAPI := mockadmin.NewNetworkPeeringApi(t) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectsApi: pAPI, NetworkPeeringApi: npAPI, }, diff --git a/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller.go b/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller.go index 2558a0f04e..194f098376 100644 --- a/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller.go +++ b/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller.go @@ -104,11 +104,11 @@ func (r *AtlasPrivateEndpointReconciler) ensureCustomResource(ctx context.Contex if err != nil { return r.terminate(workflowCtx, akoPrivateEndpoint, nil, api.ReadyType, workflow.AtlasAPIAccessNotConfigured, err) } - atlasProject, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20231115008, akoPrivateEndpoint) + atlasProject, err := r.ResolveProject(ctx, sdkClientSet.SdkClient20250312002, akoPrivateEndpoint) if err != nil { return r.terminate(workflowCtx, akoPrivateEndpoint, nil, api.ReadyType, workflow.AtlasAPIAccessNotConfigured, err) } - privateEndpointService := privateendpoint.NewPrivateEndpointAPI(sdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi) + privateEndpointService := privateendpoint.NewPrivateEndpointAPI(sdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi) return r.handlePrivateEndpointService(workflowCtx, privateEndpointService, atlasProject.ID, akoPrivateEndpoint) } diff --git a/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller_test.go b/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller_test.go index cb464ad6f9..6f578891f0 100644 --- a/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller_test.go +++ b/internal/controller/atlasprivateendpoint/atlasprivateendpoint_controller_test.go @@ -22,9 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest/observer" @@ -366,8 +365,7 @@ func TestEnsureCustomResource(t *testing.T) { ) return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ProjectsApi: projectAPI, PrivateEndpointServicesApi: peAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{ProjectsApi: projectAPI, PrivateEndpointServicesApi: peAPI}, }, nil }, }, diff --git a/internal/controller/atlasproject/alert_configurations.go b/internal/controller/atlasproject/alert_configurations.go index 5e5e196e23..3ff969d335 100644 --- a/internal/controller/atlasproject/alert_configurations.go +++ b/internal/controller/atlasproject/alert_configurations.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -147,7 +147,7 @@ func readNotificationSecret(ctx context.Context, kubeClient client.Client, res c func syncAlertConfigurations(service *workflow.Context, groupID string, alertSpec []akov2.AlertConfiguration) workflow.Result { logger := service.Log existedAlertConfigs, err := paging.ListAll(service.Context, func(ctx context.Context, pageNum int) (paging.Response[admin.GroupAlertsConfig], *http.Response, error) { - return service.SdkClientSet.SdkClient20231115008.AlertConfigurationsApi. + return service.SdkClientSet.SdkClient20250312002.AlertConfigurationsApi. ListAlertConfigurations(ctx, groupID). PageNum(pageNum). Execute() @@ -189,7 +189,7 @@ func checkAlertConfigurationStatuses(statuses []status.AlertConfiguration) workf func deleteAlertConfigs(workflowCtx *workflow.Context, groupID string, alertConfigIDs []string) error { logger := workflowCtx.Log for _, alertConfigID := range alertConfigIDs { - _, err := workflowCtx.SdkClientSet.SdkClient20231115008.AlertConfigurationsApi. + _, err := workflowCtx.SdkClientSet.SdkClient20250312002.AlertConfigurationsApi. DeleteAlertConfiguration(workflowCtx.Context, groupID, alertConfigID). Execute() if err != nil { @@ -218,7 +218,7 @@ func createAlertConfigs(workflowCtx *workflow.Context, groupID string, alertSpec continue } - alertConfiguration, _, err := workflowCtx.SdkClientSet.SdkClient20231115008.AlertConfigurationsApi. + alertConfiguration, _, err := workflowCtx.SdkClientSet.SdkClient20250312002.AlertConfigurationsApi. CreateAlertConfiguration(workflowCtx.Context, groupID, atlasAlert). Execute() if err != nil { diff --git a/internal/controller/atlasproject/atlasproject_controller.go b/internal/controller/atlasproject/atlasproject_controller.go index 1afd97e563..f10012bd27 100644 --- a/internal/controller/atlasproject/atlasproject_controller.go +++ b/internal/controller/atlasproject/atlasproject_controller.go @@ -162,10 +162,10 @@ func (r *AtlasProjectReconciler) Reconcile(ctx context.Context, req ctrl.Request workflowCtx.SdkClientSet = atlasSdkClient services := AtlasProjectServices{} - services.projectService = project.NewProjectAPIService(atlasSdkClient.SdkClient20231115008.ProjectsApi) - services.teamsService = teams.NewTeamsAPIService(atlasSdkClient.SdkClient20231115008.TeamsApi, atlasSdkClient.SdkClient20231115008.MongoDBCloudUsersApi) - services.maintenanceService = maintenancewindow.NewMaintenanceWindowAPIService(atlasSdkClient.SdkClient20231115008.MaintenanceWindowsApi) - services.encryptionAtRestService = encryptionatrest.NewEncryptionAtRestAPI(atlasSdkClient.SdkClient20231115008.EncryptionAtRestUsingCustomerKeyManagementApi) + services.projectService = project.NewProjectAPIService(atlasSdkClient.SdkClient20250312002.ProjectsApi) + services.teamsService = teams.NewTeamsAPIService(atlasSdkClient.SdkClient20250312002.TeamsApi, atlasSdkClient.SdkClient20250312002.MongoDBCloudUsersApi) + services.maintenanceService = maintenancewindow.NewMaintenanceWindowAPIService(atlasSdkClient.SdkClient20250312002.MaintenanceWindowsApi) + services.encryptionAtRestService = encryptionatrest.NewEncryptionAtRestAPI(atlasSdkClient.SdkClient20250312002.EncryptionAtRestUsingCustomerKeyManagementApi) atlasClient, err := r.AtlasProvider.Client(workflowCtx.Context, connectionConfig.Credentials, log) if err != nil { diff --git a/internal/controller/atlasproject/atlasproject_controller_test.go b/internal/controller/atlasproject/atlasproject_controller_test.go index 29db32d838..cc170737cf 100644 --- a/internal/controller/atlasproject/atlasproject_controller_test.go +++ b/internal/controller/atlasproject/atlasproject_controller_test.go @@ -26,9 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -71,7 +70,7 @@ func TestRenconcile(t *testing.T) { }, atlasSDKMocker: func() *admin.APIClient { notFoundErr := &admin.GenericOpenAPIError{} - notFoundErr.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("NOT_IN_GROUP")}) + notFoundErr.SetModel(admin.ApiError{ErrorCode: "NOT_IN_GROUP"}) projectsAPI := mockadmin.NewProjectsApi(t) projectsAPI.EXPECT().GetProjectByName(mock.Anything, "my-project"). Return(admin.GetProjectByNameApiRequest{ApiService: projectsAPI}) @@ -173,8 +172,7 @@ func TestRenconcile(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas_controllers.Credentials, log *zap.SugaredLogger) (*atlas_controllers.ClientSet, error) { return &atlas_controllers.ClientSet{ - SdkClient20231115008: tt.atlasSDKMocker(), - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: tt.atlasSDKMocker(), }, nil }, }, diff --git a/internal/controller/atlasproject/auditing.go b/internal/controller/atlasproject/auditing.go index 13caf6065b..8ea915b1bc 100644 --- a/internal/controller/atlasproject/auditing.go +++ b/internal/controller/atlasproject/auditing.go @@ -96,7 +96,7 @@ func handleAudit(ctx *workflow.Context, project *akov2.AtlasProject) workflow.Re a := auditController{ ctx: ctx, project: project, - service: audit.NewAuditLog(ctx.SdkClientSet.SdkClient20231115008.AuditingApi), + service: audit.NewAuditLog(ctx.SdkClientSet.SdkClient20250312002.AuditingApi), } return a.reconcile() diff --git a/internal/controller/atlasproject/auditing_test.go b/internal/controller/atlasproject/auditing_test.go index a8d9c1184c..7cff428c6b 100644 --- a/internal/controller/atlasproject/auditing_test.go +++ b/internal/controller/atlasproject/auditing_test.go @@ -24,8 +24,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" @@ -274,7 +274,7 @@ func TestHandleAudit(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ AuditingApi: tt.expectedCalls(mockadmin.NewAuditingApi(t)), }, }, diff --git a/internal/controller/atlasproject/backupcompliancepolicy.go b/internal/controller/atlasproject/backupcompliancepolicy.go index f0906df779..6831a5ce9e 100644 --- a/internal/controller/atlasproject/backupcompliancepolicy.go +++ b/internal/controller/atlasproject/backupcompliancepolicy.go @@ -20,7 +20,7 @@ import ( "fmt" "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" @@ -149,7 +149,7 @@ func (b *backupComplianceController) upsert(atlasBCP *admin.DataProtectionSettin } if !equal { - atlasBCP, _, err = b.ctx.SdkClientSet.SdkClient20231115008.CloudBackupsApi.UpdateDataProtectionSettings(b.ctx.Context, b.project.ID(), akoBCP.ToAtlas(b.project.ID())).OverwriteBackupPolicies(akoBCP.Spec.OverwriteBackupPolicies).Execute() + atlasBCP, _, err = b.ctx.SdkClientSet.SdkClient20250312002.CloudBackupsApi.UpdateDataProtectionSettings(b.ctx.Context, b.project.ID(), akoBCP.ToAtlas(b.project.ID())).OverwriteBackupPolicies(akoBCP.Spec.OverwriteBackupPolicies).Execute() if err != nil { if admin.IsErrorCode(err, atlas.BackupComplianceNotMet) { return b.terminate(workflow.ProjectBackupCompliancePolicyNotMet, err) @@ -210,7 +210,7 @@ func (b *backupComplianceController) idle() workflow.Result { } func (b *backupComplianceController) getAtlasBackupCompliancePolicy() (*admin.DataProtectionSettings20231001, bool, error) { - bcp, _, err := b.ctx.SdkClientSet.SdkClient20231115008.CloudBackupsApi.GetDataProtectionSettings(b.ctx.Context, b.project.ID()).Execute() + bcp, _, err := b.ctx.SdkClientSet.SdkClient20250312002.CloudBackupsApi.GetDataProtectionSettings(b.ctx.Context, b.project.ID()).Execute() if err != nil { // NOTE: getting backup compliance policies never yields a 404 return nil, false, fmt.Errorf("error finding backup compliance policy: %w", err) diff --git a/internal/controller/atlasproject/backupcompliancepolicy_test.go b/internal/controller/atlasproject/backupcompliancepolicy_test.go index 41d05f6be5..475051e7b1 100644 --- a/internal/controller/atlasproject/backupcompliancepolicy_test.go +++ b/internal/controller/atlasproject/backupcompliancepolicy_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -309,7 +309,7 @@ func TestEnsureBackupCompliance(t *testing.T) { Return(&admin.DataProtectionSettings20231001{}, &http.Response{}, nil) mockError := &admin.GenericOpenAPIError{} - model := *admin.NewApiError() + model := *admin.NewApiErrorWithDefaults() model.SetErrorCode(atlas.BackupComplianceNotMet) mockError.SetModel(model) @@ -392,7 +392,7 @@ func TestEnsureBackupCompliance(t *testing.T) { t.Run(tc.name, func(t *testing.T) { workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudBackupsApi: tc.backupAPI, }, }, diff --git a/internal/controller/atlasproject/cloud_provider_integration.go b/internal/controller/atlasproject/cloud_provider_integration.go index 94b62c0886..9018d6da3a 100644 --- a/internal/controller/atlasproject/cloud_provider_integration.go +++ b/internal/controller/atlasproject/cloud_provider_integration.go @@ -19,7 +19,7 @@ import ( "fmt" "sort" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -63,7 +63,7 @@ func ensureCloudProviderIntegration(workflowCtx *workflow.Context, project *akov func syncCloudProviderIntegration(workflowCtx *workflow.Context, projectID string, cpaSpecs []akov2.CloudProviderIntegration) (bool, error) { // this endpoint does not offer paginated responses - atlasCPAs, _, err := workflowCtx.SdkClientSet.SdkClient20231115008.CloudProviderAccessApi. + atlasCPAs, _, err := workflowCtx.SdkClientSet.SdkClient20250312002.CloudProviderAccessApi. ListCloudProviderAccessRoles(workflowCtx.Context, projectID). Execute() if err != nil { @@ -259,10 +259,10 @@ func copyCloudProviderAccessData(cpiStatus *status.CloudProviderIntegration, atl } func createCloudProviderAccess(workflowCtx *workflow.Context, projectID string, cpiStatus *status.CloudProviderIntegration) *status.CloudProviderIntegration { - cpa, _, err := workflowCtx.SdkClientSet.SdkClient20231115008.CloudProviderAccessApi.CreateCloudProviderAccessRole( + cpa, _, err := workflowCtx.SdkClientSet.SdkClient20250312002.CloudProviderAccessApi.CreateCloudProviderAccessRole( workflowCtx.Context, projectID, - &admin.CloudProviderAccessRole{ + &admin.CloudProviderAccessRoleRequest{ ProviderName: cpiStatus.ProviderName, }, ).Execute() @@ -280,11 +280,11 @@ func createCloudProviderAccess(workflowCtx *workflow.Context, projectID string, } func authorizeCloudProviderAccess(workflowCtx *workflow.Context, projectID string, cpiStatus *status.CloudProviderIntegration) *status.CloudProviderIntegration { - cpa, _, err := workflowCtx.SdkClientSet.SdkClient20231115008.CloudProviderAccessApi.AuthorizeCloudProviderAccessRole( + cpa, _, err := workflowCtx.SdkClientSet.SdkClient20250312002.CloudProviderAccessApi.AuthorizeCloudProviderAccessRole( workflowCtx.Context, projectID, cpiStatus.RoleID, - &admin.CloudProviderAccessRole{ + &admin.CloudProviderAccessRoleRequestUpdate{ ProviderName: cpiStatus.ProviderName, IamAssumedRoleArn: &cpiStatus.IamAssumedRoleArn, }, @@ -303,7 +303,7 @@ func authorizeCloudProviderAccess(workflowCtx *workflow.Context, projectID strin } func deleteCloudProviderAccess(workflowCtx *workflow.Context, projectID string, cpiStatus *status.CloudProviderIntegration) { - _, err := workflowCtx.SdkClientSet.SdkClient20231115008.CloudProviderAccessApi.DeauthorizeCloudProviderAccessRole( + _, err := workflowCtx.SdkClientSet.SdkClient20250312002.CloudProviderAccessApi.DeauthorizeCloudProviderAccessRole( workflowCtx.Context, projectID, cpiStatus.ProviderName, diff --git a/internal/controller/atlasproject/cloud_provider_integration_test.go b/internal/controller/atlasproject/cloud_provider_integration_test.go index 8838fb4200..8c4e7c277f 100644 --- a/internal/controller/atlasproject/cloud_provider_integration_test.go +++ b/internal/controller/atlasproject/cloud_provider_integration_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -49,7 +49,7 @@ func TestSyncCloudProviderIntegration(t *testing.T) { } workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &atlasClient, + SdkClient20250312002: &atlasClient, }, Context: context.Background(), } @@ -150,7 +150,7 @@ func TestSyncCloudProviderIntegration(t *testing.T) { Return(&http.Response{}, nil) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -221,7 +221,7 @@ func TestSyncCloudProviderIntegration(t *testing.T) { ) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -278,7 +278,7 @@ func TestSyncCloudProviderIntegration(t *testing.T) { Return(nil, &http.Response{}, errors.New("service unavailable")) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -864,7 +864,7 @@ func TestCreateCloudProviderIntegration(t *testing.T) { ) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -895,7 +895,7 @@ func TestCreateCloudProviderIntegration(t *testing.T) { Return(nil, &http.Response{}, errors.New("service unavailable")) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -951,7 +951,7 @@ func TestAuthorizeCloudProviderIntegration(t *testing.T) { ) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -990,7 +990,7 @@ func TestAuthorizeCloudProviderIntegration(t *testing.T) { Return(nil, &http.Response{}, errors.New("service unavailable")) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -1024,7 +1024,7 @@ func TestDeleteCloudProviderIntegration(t *testing.T) { Return(&http.Response{}, nil) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, @@ -1054,7 +1054,7 @@ func TestDeleteCloudProviderIntegration(t *testing.T) { Return(&http.Response{}, errors.New("service unavailable")) workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CloudProviderAccessApi: cpa, }, }, diff --git a/internal/controller/atlasproject/custom_roles.go b/internal/controller/atlasproject/custom_roles.go index 0399d38018..3e3d5e752a 100644 --- a/internal/controller/atlasproject/custom_roles.go +++ b/internal/controller/atlasproject/custom_roles.go @@ -84,7 +84,7 @@ func ensureCustomRoles(workflowCtx *workflow.Context, project *akov2.AtlasProjec r := roleController{ ctx: workflowCtx, project: project, - service: customroles.NewCustomRoles(workflowCtx.SdkClientSet.SdkClient20231115008.CustomDatabaseRolesApi), + service: customroles.NewCustomRoles(workflowCtx.SdkClientSet.SdkClient20250312002.CustomDatabaseRolesApi), } currentAtlasCustomRoles, err := r.service.List(r.ctx.Context, r.project.ID()) diff --git a/internal/controller/atlasproject/custom_roles_test.go b/internal/controller/atlasproject/custom_roles_test.go index bdb4ad053d..f861cbefd4 100644 --- a/internal/controller/atlasproject/custom_roles_test.go +++ b/internal/controller/atlasproject/custom_roles_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -397,7 +397,7 @@ func TestEnsureCustomRoles(t *testing.T) { t.Run(tc.name, func(t *testing.T) { workflowCtx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: tc.roleAPI, }, }, @@ -481,7 +481,7 @@ func TestCustomRolesNonGreedyBehaviour(t *testing.T) { Log: zaptest.NewLogger(t).Sugar(), Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ CustomDatabaseRolesApi: roleAPI, }, }, diff --git a/internal/controller/atlasproject/encryption_at_rest.go b/internal/controller/atlasproject/encryption_at_rest.go index cf48e549ad..6592d66ff2 100644 --- a/internal/controller/atlasproject/encryption_at_rest.go +++ b/internal/controller/atlasproject/encryption_at_rest.go @@ -194,7 +194,7 @@ func normalizeAwsKms(ctx *workflow.Context, projectID string, awsKms *encryption // This endpoint does not offer paginated responses. // Assume that role ID is set as AWS ARN. - resp, _, err := ctx.SdkClientSet.SdkClient20231115008.CloudProviderAccessApi.ListCloudProviderAccessRoles(ctx.Context, projectID).Execute() + resp, _, err := ctx.SdkClientSet.SdkClient20250312002.CloudProviderAccessApi.ListCloudProviderAccessRoles(ctx.Context, projectID).Execute() if err != nil { return err } diff --git a/internal/controller/atlasproject/ipaccess_list.go b/internal/controller/atlasproject/ipaccess_list.go index a83a9955da..7537652900 100644 --- a/internal/controller/atlasproject/ipaccess_list.go +++ b/internal/controller/atlasproject/ipaccess_list.go @@ -150,7 +150,7 @@ func handleIPAccessList(ctx *workflow.Context, project *akov2.AtlasProject) work c := ipAccessListController{ ctx: ctx, project: project, - service: ipaccesslist.NewIPAccessList(ctx.SdkClientSet.SdkClient20231115008.ProjectIPAccessListApi), + service: ipaccesslist.NewIPAccessList(ctx.SdkClientSet.SdkClient20250312002.ProjectIPAccessListApi), lastApplied: lastApplied, } diff --git a/internal/controller/atlasproject/ipaccess_list_test.go b/internal/controller/atlasproject/ipaccess_list_test.go index e84856957d..7878692e93 100644 --- a/internal/controller/atlasproject/ipaccess_list_test.go +++ b/internal/controller/atlasproject/ipaccess_list_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -480,7 +480,7 @@ func TestHandleIPAccessList(t *testing.T) { Context: context.Background(), Log: zaptest.NewLogger(t).Sugar(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectIPAccessListApi: tt.expectedCalls(mockadmin.NewProjectIPAccessListApi(t)), }, }, @@ -605,7 +605,7 @@ func TestIPAccessListNonGreedyBehaviour(t *testing.T) { ).Return(admin.DeleteProjectIpAccessListApiRequest{ApiService: ipAccessAPI}).Times(removals) ipAccessAPI.EXPECT().DeleteProjectIpAccessListExecute( mock.AnythingOfType("admin.DeleteProjectIpAccessListApiRequest")).Return( - nil, nil, nil, + nil, nil, ).Times(removals) } @@ -624,7 +624,7 @@ func TestIPAccessListNonGreedyBehaviour(t *testing.T) { Log: zaptest.NewLogger(t).Sugar(), Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectIPAccessListApi: ipAccessAPI, }, }, diff --git a/internal/controller/atlasproject/network_peering.go b/internal/controller/atlasproject/network_peering.go index a0e647c551..4fd39eaf83 100644 --- a/internal/controller/atlasproject/network_peering.go +++ b/internal/controller/atlasproject/network_peering.go @@ -21,7 +21,7 @@ import ( "net/http" "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" @@ -103,7 +103,7 @@ func failedPeerStatus(errMessage string, peer akov2.NetworkPeer) status.AtlasNet func SyncNetworkPeer(workflowCtx *workflow.Context, groupID string, peerStatuses []status.AtlasNetworkPeer, peerSpecs []akov2.NetworkPeer, lastAppliedPeers []akov2.NetworkPeer) (workflow.Result, api.ConditionType) { defer workflowCtx.EnsureStatusOption(status.AtlasProjectSetNetworkPeerOption(&peerStatuses)) logger := workflowCtx.Log - mongoClient := workflowCtx.SdkClientSet.SdkClient20231115008 + mongoClient := workflowCtx.SdkClientSet.SdkClient20250312002 logger.Debugf("syncing network peers for project %v", groupID) list, err := GetAllExistedNetworkPeer(workflowCtx.Context, mongoClient.NetworkPeeringApi, groupID) if err != nil { @@ -184,7 +184,7 @@ func deleteUnusedContainers(context context.Context, containerService admin.Netw continue } if !compare.Contains(doNotDelete, container.GetId()) { - _, response, errDelete := containerService.DeletePeeringContainer(context, groupID, container.GetId()).Execute() + response, errDelete := containerService.DeletePeeringContainer(context, groupID, container.GetId()).Execute() if errDelete != nil && response.StatusCode != http.StatusConflict { // AWS peer does not contain container id return errDelete } diff --git a/internal/controller/atlasproject/network_peering_test.go b/internal/controller/atlasproject/network_peering_test.go index ef50e8f3c2..8079fc6fa6 100644 --- a/internal/controller/atlasproject/network_peering_test.go +++ b/internal/controller/atlasproject/network_peering_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -111,7 +111,7 @@ func TestNetworkPeeringsNonGreedyBehaviour(t *testing.T) { Log: zaptest.NewLogger(t).Sugar(), Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ NetworkPeeringApi: peeringAPI, }, }, diff --git a/internal/controller/atlasproject/private_endpoint.go b/internal/controller/atlasproject/private_endpoint.go index 6d8ee88794..78f0e3a3df 100644 --- a/internal/controller/atlasproject/private_endpoint.go +++ b/internal/controller/atlasproject/private_endpoint.go @@ -19,7 +19,7 @@ import ( "errors" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "golang.org/x/exp/slices" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" @@ -39,7 +39,7 @@ func ensurePrivateEndpoint(workflowCtx *workflow.Context, project *akov2.AtlasPr return workflow.Terminate(workflow.Internal, err) } - atlasPEs, err := getAllPrivateEndpoints(workflowCtx.Context, workflowCtx.SdkClientSet.SdkClient20231115008, project.ID()) + atlasPEs, err := getAllPrivateEndpoints(workflowCtx.Context, workflowCtx.SdkClientSet.SdkClient20250312002, project.ID()) if err != nil { return workflow.Terminate(workflow.Internal, err) } @@ -155,7 +155,7 @@ func getStatusForInterfaces(ctx *workflow.Context, projectID string, specPEs []a return notReadyInterfaceResult } - interfaceEndpoint, _, err := ctx.SdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi.GetPrivateEndpointWithParams(ctx.Context, &admin.GetPrivateEndpointApiParams{ + interfaceEndpoint, _, err := ctx.SdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi.GetPrivateEndpointWithParams(ctx.Context, &admin.GetPrivateEndpointApiParams{ GroupId: projectID, CloudProvider: atlasPeService.GetCloudProvider(), EndpointId: interfaceEndpointID, @@ -245,7 +245,7 @@ func getAllPrivateEndpoints(ctx context.Context, client *admin.APIClient, projec func createPeServiceInAtlas(ctx *workflow.Context, projectID string, endpointsToCreate []akov2.PrivateEndpoint, endpointCounts []int) (newConnections []atlasPE, err error) { newConnections = make([]atlasPE, 0) for idx, pe := range endpointsToCreate { - conn, _, err := ctx.SdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi.CreatePrivateEndpointService(ctx.Context, projectID, &admin.CloudProviderEndpointServiceRequest{ + conn, _, err := ctx.SdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi.CreatePrivateEndpointService(ctx.Context, projectID, &admin.CloudProviderEndpointServiceRequest{ ProviderName: string(pe.Provider), Region: pe.Region, }).Execute() @@ -281,7 +281,7 @@ func syncPeInterfaceInAtlas(ctx *workflow.Context, projectID string, endpointsTo } interfaceConn.Endpoints = specPeService.Endpoints.ConvertToAtlas() - privateEndpoint, response, err := ctx.SdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi.CreatePrivateEndpointWithParams(ctx.Context, &admin.CreatePrivateEndpointApiParams{ + privateEndpoint, response, err := ctx.SdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi.CreatePrivateEndpointWithParams(ctx.Context, &admin.CreatePrivateEndpointApiParams{ GroupId: projectID, CloudProvider: string(specPeService.Provider), EndpointServiceId: atlasPeService.GetId(), @@ -333,7 +333,7 @@ func endpointDefinedInSpec(specEndpoint akov2.PrivateEndpoint) bool { } func DeleteAllPrivateEndpoints(ctx *workflow.Context, atlasProject *akov2.AtlasProject) workflow.Result { - atlasPEs, err := getAllPrivateEndpoints(ctx.Context, ctx.SdkClientSet.SdkClient20231115008, atlasProject.ID()) + atlasPEs, err := getAllPrivateEndpoints(ctx.Context, ctx.SdkClientSet.SdkClient20250312002, atlasProject.ID()) if err != nil { return workflow.Terminate(workflow.Internal, err) } @@ -361,7 +361,7 @@ func deletePrivateEndpointsFromAtlas(ctx *workflow.Context, projectID string, li interfaceEndpointIDs := peService.InterfaceEndpointIDs() if len(interfaceEndpointIDs) != 0 { for _, interfaceEndpointID := range interfaceEndpointIDs { - _, _, err := ctx.SdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi.DeletePrivateEndpointWithParams(ctx.Context, &admin.DeletePrivateEndpointApiParams{ + _, err := ctx.SdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi.DeletePrivateEndpointWithParams(ctx.Context, &admin.DeletePrivateEndpointApiParams{ GroupId: projectID, CloudProvider: peService.GetCloudProvider(), EndpointId: interfaceEndpointID, @@ -375,7 +375,7 @@ func deletePrivateEndpointsFromAtlas(ctx *workflow.Context, projectID string, li continue } - _, _, err := ctx.SdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi.DeletePrivateEndpointServiceWithParams(ctx.Context, &admin.DeletePrivateEndpointServiceApiParams{ + _, err := ctx.SdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi.DeletePrivateEndpointServiceWithParams(ctx.Context, &admin.DeletePrivateEndpointServiceApiParams{ GroupId: projectID, CloudProvider: peService.GetCloudProvider(), EndpointServiceId: peService.GetId(), @@ -452,7 +452,7 @@ func getGCPInterfaceEndpoint(ctx *workflow.Context, projectID string, endpoint s if endpoint.InterfaceEndpointID == "" { return nil, errors.New("InterfaceEndpointID is empty") } - interfaceEndpointConn, _, err := ctx.SdkClientSet.SdkClient20231115008.PrivateEndpointServicesApi.GetPrivateEndpointWithParams(ctx.Context, &admin.GetPrivateEndpointApiParams{ + interfaceEndpointConn, _, err := ctx.SdkClientSet.SdkClient20250312002.PrivateEndpointServicesApi.GetPrivateEndpointWithParams(ctx.Context, &admin.GetPrivateEndpointApiParams{ GroupId: projectID, CloudProvider: string(provider.ProviderGCP), EndpointId: endpoint.InterfaceEndpointID, diff --git a/internal/controller/atlasproject/private_endpoint_test.go b/internal/controller/atlasproject/private_endpoint_test.go index 5103cc62fb..8b16a6e184 100644 --- a/internal/controller/atlasproject/private_endpoint_test.go +++ b/internal/controller/atlasproject/private_endpoint_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -340,7 +340,7 @@ func TestPrivateEndpointsNonGreedyBehaviour(t *testing.T) { Return(admin.DeletePrivateEndpointServiceApiRequest{ApiService: privateEndpointsAPI}).Times(removals) privateEndpointsAPI.EXPECT().DeletePrivateEndpointServiceExecute( mock.AnythingOfType("admin.DeletePrivateEndpointServiceApiRequest")).Return( - nil, nil, nil, + nil, nil, ).Times(removals) } privateEndpointsAPI.EXPECT().CreatePrivateEndpointService(mock.Anything, mock.Anything, mock.Anything). @@ -354,7 +354,7 @@ func TestPrivateEndpointsNonGreedyBehaviour(t *testing.T) { Log: zaptest.NewLogger(t).Sugar(), Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ PrivateEndpointServicesApi: privateEndpointsAPI, }, }, diff --git a/internal/controller/atlasproject/project.go b/internal/controller/atlasproject/project.go index 3890ab7dca..857c07259f 100644 --- a/internal/controller/atlasproject/project.go +++ b/internal/controller/atlasproject/project.go @@ -115,7 +115,7 @@ func (r *AtlasProjectReconciler) delete(ctx *workflow.Context, services *AtlasPr if result := DeleteAllPrivateEndpoints(ctx, atlasProject); !result.IsOk() { return r.terminate(ctx, workflow.ServerlessPrivateEndpointReady, errors.New(result.GetMessage())) } - if result := DeleteOwnedNetworkPeers(ctx.Context, atlasProject, ctx.SdkClientSet.SdkClient20231115008.NetworkPeeringApi, ctx.Log); !result.IsOk() { + if result := DeleteOwnedNetworkPeers(ctx.Context, atlasProject, ctx.SdkClientSet.SdkClient20250312002.NetworkPeeringApi, ctx.Log); !result.IsOk() { return r.terminate(ctx, workflow.ProjectNetworkPeerIsNotReadyInAtlas, errors.New(result.GetMessage())) } diff --git a/internal/controller/atlasproject/project_settings.go b/internal/controller/atlasproject/project_settings.go index 90a6bb78a4..73b6807a93 100644 --- a/internal/controller/atlasproject/project_settings.go +++ b/internal/controller/atlasproject/project_settings.go @@ -61,12 +61,12 @@ func areSettingsInSync(atlas, spec *akov2.ProjectSettings) bool { func patchSettings(ctx *workflow.Context, projectID string, spec *akov2.ProjectSettings) error { specAsAtlas := spec.ToAtlas() - _, _, err := ctx.SdkClientSet.SdkClient20231115008.ProjectsApi.UpdateProjectSettings(ctx.Context, projectID, specAsAtlas).Execute() + _, _, err := ctx.SdkClientSet.SdkClient20250312002.ProjectsApi.UpdateProjectSettings(ctx.Context, projectID, specAsAtlas).Execute() return err } func fetchSettings(ctx *workflow.Context, projectID string) (*akov2.ProjectSettings, error) { - data, _, err := ctx.SdkClientSet.SdkClient20231115008.ProjectsApi.GetProjectSettings(ctx.Context, projectID).Execute() + data, _, err := ctx.SdkClientSet.SdkClient20250312002.ProjectsApi.GetProjectSettings(ctx.Context, projectID).Execute() if err != nil { return nil, err } diff --git a/internal/controller/atlasproject/project_settings_test.go b/internal/controller/atlasproject/project_settings_test.go index eae0ce1e69..ba05bfd8ae 100644 --- a/internal/controller/atlasproject/project_settings_test.go +++ b/internal/controller/atlasproject/project_settings_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api" @@ -232,7 +232,7 @@ func TestEnsureProjectSettings(t *testing.T) { t.Run(tc.name, func(t *testing.T) { ctx := &workflow.Context{ SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ ProjectsApi: tc.projectAPI, }, }, diff --git a/internal/controller/atlasproject/project_test.go b/internal/controller/atlasproject/project_test.go index e5eea0789e..12ee731f0b 100644 --- a/internal/controller/atlasproject/project_test.go +++ b/internal/controller/atlasproject/project_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" "go.uber.org/zap/zaptest" @@ -751,7 +751,7 @@ func TestHandleProject(t *testing.T) { Log: logger, Client: tt.atlasClientMocker(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: tt.atlasSDKMocker(), + SdkClient20250312002: tt.atlasSDKMocker(), }, } instancesIndexer := indexer.NewAtlasStreamInstanceByProjectIndexer(zaptest.NewLogger(t)) @@ -1209,7 +1209,7 @@ func TestDelete(t *testing.T) { Context: context.Background(), Client: tt.atlasClientMocker(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: tt.atlasSDKMocker(), + SdkClient20250312002: tt.atlasSDKMocker(), }, Log: logger, } diff --git a/internal/controller/atlasproject/team_reconciler.go b/internal/controller/atlasproject/team_reconciler.go index 1f4a0bcfba..11d1cc50e7 100644 --- a/internal/controller/atlasproject/team_reconciler.go +++ b/internal/controller/atlasproject/team_reconciler.go @@ -112,7 +112,7 @@ func (r *AtlasProjectReconciler) teamReconcile(team *akov2.AtlasTeam, workflowCt return workflow.OK().ReconcileResult(), nil } else { log.Infow("-> Starting AtlasTeam deletion", "spec", team.Spec) - _, _, err := teamCtx.SdkClientSet.SdkClient20231115008.TeamsApi.DeleteTeam(teamCtx.Context, teamCtx.OrgID, team.Status.ID).Execute() + _, err := teamCtx.SdkClientSet.SdkClient20250312002.TeamsApi.DeleteTeam(teamCtx.Context, teamCtx.OrgID, team.Status.ID).Execute() var apiError *mongodbatlas.ErrorResponse if errors.As(err, &apiError) && apiError.ErrorCode == atlas.NotInGroup { log.Infow("team does not exist", "projectID", team.Status.ID) @@ -210,7 +210,7 @@ func (r *AtlasProjectReconciler) ensureTeamUsersAreInSync(workflowCtx *workflow. username := team.Spec.Usernames[i] if _, ok := atlasUsernamesMap[string(username)]; !ok { g.Go(func() error { - user, _, err := workflowCtx.SdkClientSet.SdkClient20231115008.MongoDBCloudUsersApi.GetUserByUsername(taskContext, string(username)).Execute() + user, _, err := workflowCtx.SdkClientSet.SdkClient20250312002.MongoDBCloudUsersApi.GetUserByUsername(taskContext, string(username)).Execute() if err != nil { return err diff --git a/internal/controller/atlasproject/team_reconciler_test.go b/internal/controller/atlasproject/team_reconciler_test.go index a3fcef59df..990edec60f 100644 --- a/internal/controller/atlasproject/team_reconciler_test.go +++ b/internal/controller/atlasproject/team_reconciler_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.mongodb.org/atlas/mongodbatlas" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -37,7 +37,7 @@ func TestTeamManagedByAtlas(t *testing.T) { workflowCtx := &workflow.Context{ OrgID: "orgID", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{}, + SdkClient20250312002: &admin.APIClient{}, }, Context: context.Background(), } @@ -51,7 +51,7 @@ func TestTeamManagedByAtlas(t *testing.T) { workflowCtx := &workflow.Context{ OrgID: "orgID", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{}, + SdkClient20250312002: &admin.APIClient{}, }, Context: context.Background(), } @@ -71,7 +71,7 @@ func TestTeamManagedByAtlas(t *testing.T) { workflowCtx := &workflow.Context{ OrgID: "orgID", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &atlasClient, + SdkClient20250312002: &atlasClient, }, Context: context.Background(), } @@ -98,7 +98,7 @@ func TestTeamManagedByAtlas(t *testing.T) { workflowCtx := &workflow.Context{ OrgID: "orgID", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &atlasClient, + SdkClient20250312002: &atlasClient, }, Context: context.Background(), } @@ -129,7 +129,7 @@ func TestTeamManagedByAtlas(t *testing.T) { workflowCtx := &workflow.Context{ OrgID: "orgID-1", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &atlasClient, + SdkClient20250312002: &atlasClient, }, Context: context.Background(), } @@ -173,7 +173,7 @@ func TestTeamManagedByAtlas(t *testing.T) { workflowCtx := &workflow.Context{ OrgID: "orgID-1", SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &atlasClient, + SdkClient20250312002: &atlasClient, }, Context: context.Background(), } diff --git a/internal/controller/atlasproject/teams_test.go b/internal/controller/atlasproject/teams_test.go index 7b86a2a249..1363e7178a 100644 --- a/internal/controller/atlasproject/teams_test.go +++ b/internal/controller/atlasproject/teams_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -311,7 +311,7 @@ func TestSyncAssignedTeams(t *testing.T) { ctx := &workflow.Context{ Log: logger, SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: atlasClient, + SdkClient20250312002: atlasClient, }, Context: context.Background(), } diff --git a/internal/controller/atlasproject/x509_auth.go b/internal/controller/atlasproject/x509_auth.go index 36c1e21b14..88970ddebf 100644 --- a/internal/controller/atlasproject/x509_auth.go +++ b/internal/controller/atlasproject/x509_auth.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -70,7 +70,7 @@ func (r *AtlasProjectReconciler) enableX509Authentication(ctx *workflow.Context, return terminateX509(ctx, err) } - ldapConfig, _, err := ctx.SdkClientSet.SdkClient20231115008.LDAPConfigurationApi.GetLDAPConfiguration(ctx.Context, atlasProject.ID()).Execute() + ldapConfig, _, err := ctx.SdkClientSet.SdkClient20250312002.LDAPConfigurationApi.GetLdapConfiguration(ctx.Context, atlasProject.ID()).Execute() if err != nil { return terminateX509(ctx, err) } @@ -84,7 +84,7 @@ func (r *AtlasProjectReconciler) enableX509Authentication(ctx *workflow.Context, } r.Log.Infow("Saving new x509 cert", "projectID", atlasProject.ID()) - _, _, err = ctx.SdkClientSet.SdkClient20231115008.LDAPConfigurationApi.SaveLDAPConfiguration(ctx.Context, atlasProject.ID(), &conf).Execute() + _, _, err = ctx.SdkClientSet.SdkClient20250312002.LDAPConfigurationApi.SaveLdapConfiguration(ctx.Context, atlasProject.ID(), &conf).Execute() if err != nil { return terminateX509(ctx, err) } @@ -98,7 +98,7 @@ func (r *AtlasProjectReconciler) enableX509Authentication(ctx *workflow.Context, func (r *AtlasProjectReconciler) disableX509Authentication(ctx *workflow.Context, atlasProject *akov2.AtlasProject) workflow.Result { r.Log.Infow("Disable x509 auth", "projectID", atlasProject.ID()) - _, _, err := ctx.SdkClientSet.SdkClient20231115008.X509AuthenticationApi.DisableCustomerManagedX509(ctx.Context, atlasProject.ID()).Execute() + _, _, err := ctx.SdkClientSet.SdkClient20250312002.X509AuthenticationApi.DisableCustomerManagedX509(ctx.Context, atlasProject.ID()).Execute() if err != nil { return terminateX509(ctx, err) } diff --git a/internal/controller/atlasstream/atlasstream_connection.go b/internal/controller/atlasstream/atlasstream_connection.go index f05bbbba0e..d2ee034444 100644 --- a/internal/controller/atlasstream/atlasstream_connection.go +++ b/internal/controller/atlasstream/atlasstream_connection.go @@ -20,7 +20,7 @@ import ( "net/http" "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -69,7 +69,7 @@ func (r *AtlasStreamsInstanceReconciler) handleConnectionRegistry( atlasStreamInstance *admin.StreamsTenant, ) (ctrl.Result, error) { streamConnections, err := paging.ListAll(ctx.Context, func(c context.Context, pageNum int) (paging.Response[admin.StreamsConnection], *http.Response, error) { - return ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + return ctx.SdkClientSet.SdkClient20250312002.StreamsApi. ListStreamConnections(c, project.ID(), akoStreamInstance.Spec.Name). PageNum(pageNum). Execute() diff --git a/internal/controller/atlasstream/atlasstream_connection_test.go b/internal/controller/atlasstream/atlasstream_connection_test.go index 1e1fe39b21..3b2ff30bca 100644 --- a/internal/controller/atlasstream/atlasstream_connection_test.go +++ b/internal/controller/atlasstream/atlasstream_connection_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -150,7 +150,6 @@ func TestHandleConnectionRegistry(t *testing.T) { streamsAPI.EXPECT(). DeleteStreamConnectionExecute(mock.AnythingOfType("admin.DeleteStreamConnectionApiRequest")). Return( - nil, &http.Response{}, nil, ) @@ -186,7 +185,7 @@ func TestHandleConnectionRegistry(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -271,7 +270,7 @@ func TestHandleConnectionRegistry(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -358,7 +357,7 @@ func TestHandleConnectionRegistry(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -456,7 +455,7 @@ func TestHandleConnectionRegistry(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -533,11 +532,11 @@ func TestHandleConnectionRegistry(t *testing.T) { Return(admin.DeleteStreamConnectionApiRequest{ApiService: streamsAPI}) streamsAPI.EXPECT(). DeleteStreamConnectionExecute(mock.AnythingOfType("admin.DeleteStreamConnectionApiRequest")). - Return(nil, &http.Response{}, errors.New("failed to delete connection")) + Return(&http.Response{}, errors.New("failed to delete connection")) ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, diff --git a/internal/controller/atlasstream/atlasstream_instance_controller.go b/internal/controller/atlasstream/atlasstream_instance_controller.go index 38ef9d84fa..849cda3434 100644 --- a/internal/controller/atlasstream/atlasstream_instance_controller.go +++ b/internal/controller/atlasstream/atlasstream_instance_controller.go @@ -17,7 +17,7 @@ package atlasstream import ( "context" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" @@ -121,7 +121,7 @@ func (r *AtlasStreamsInstanceReconciler) ensureAtlasStreamsInstance(ctx context. workflowCtx.SdkClientSet = atlasClientSet workflowCtx.OrgID = connectionConfig.OrgID - atlasStreamInstance, _, err := workflowCtx.SdkClientSet.SdkClient20231115008.StreamsApi. + atlasStreamInstance, _, err := workflowCtx.SdkClientSet.SdkClient20250312002.StreamsApi. GetStreamInstance(workflowCtx.Context, project.ID(), akoStreamInstance.Spec.Name). Execute() diff --git a/internal/controller/atlasstream/atlasstream_instance_controller_test.go b/internal/controller/atlasstream/atlasstream_instance_controller_test.go index 8328035d70..b0ec463347 100644 --- a/internal/controller/atlasstream/atlasstream_instance_controller_test.go +++ b/internal/controller/atlasstream/atlasstream_instance_controller_test.go @@ -22,9 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap" "go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest/observer" @@ -516,8 +515,7 @@ func TestEnsureAtlasStreamsInstance(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{StreamsApi: streamsAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{StreamsApi: streamsAPI}, }, nil }, }, @@ -657,8 +655,7 @@ func TestEnsureAtlasStreamsInstance(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{StreamsApi: streamsAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{StreamsApi: streamsAPI}, }, nil }, }, @@ -788,8 +785,7 @@ func TestEnsureAtlasStreamsInstance(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{StreamsApi: streamsAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{StreamsApi: streamsAPI}, }, nil }, }, @@ -907,7 +903,6 @@ func TestEnsureAtlasStreamsInstance(t *testing.T) { Return(admin.DeleteStreamInstanceApiRequest{ApiService: streamsAPI}) streamsAPI.EXPECT().DeleteStreamInstanceExecute(mock.AnythingOfType("admin.DeleteStreamInstanceApiRequest")). Return( - nil, &http.Response{}, nil, ) @@ -922,8 +917,7 @@ func TestEnsureAtlasStreamsInstance(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{StreamsApi: streamsAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{StreamsApi: streamsAPI}, }, nil }, }, @@ -1054,8 +1048,7 @@ func TestEnsureAtlasStreamsInstance(t *testing.T) { }, SdkClientSetFunc: func(ctx context.Context, creds *atlas.Credentials, log *zap.SugaredLogger) (*atlas.ClientSet, error) { return &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{StreamsApi: streamsAPI}, - SdkClient20241113001: &adminv20241113001.APIClient{}, + SdkClient20250312002: &admin.APIClient{StreamsApi: streamsAPI}, }, nil }, }, diff --git a/internal/controller/atlasstream/transitions.go b/internal/controller/atlasstream/transitions.go index f67749e6a6..352e4bf644 100644 --- a/internal/controller/atlasstream/transitions.go +++ b/internal/controller/atlasstream/transitions.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" ctrl "sigs.k8s.io/controller-runtime" @@ -46,7 +46,7 @@ func (r *AtlasStreamsInstanceReconciler) create( GroupId: pointer.MakePtr(project.ID()), } - atlasStreamInstance, _, err := ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + atlasStreamInstance, _, err := ctx.SdkClientSet.SdkClient20250312002.StreamsApi. CreateStreamInstance(ctx.Context, project.ID(), &streamTenant). Execute() @@ -63,7 +63,7 @@ func (r *AtlasStreamsInstanceReconciler) update(ctx *workflow.Context, project * Region: streamInstance.Spec.Config.Region, } - atlasStreamInstance, _, err := ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + atlasStreamInstance, _, err := ctx.SdkClientSet.SdkClient20250312002.StreamsApi. UpdateStreamInstance(ctx.Context, project.ID(), streamInstance.Spec.Name, &dataProcessRegion). Execute() @@ -90,7 +90,7 @@ func (r *AtlasStreamsInstanceReconciler) delete(ctx *workflow.Context, project * } func deleteStreamInstance(ctx *workflow.Context, project *akov2.AtlasProject, streamInstance *akov2.AtlasStreamInstance) error { - _, _, err := ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + _, err := ctx.SdkClientSet.SdkClient20250312002.StreamsApi. DeleteStreamInstance(ctx.Context, project.ID(), streamInstance.Spec.Name). Execute() @@ -114,7 +114,7 @@ func createConnections( return err } - _, _, err = ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + _, _, err = ctx.SdkClientSet.SdkClient20250312002.StreamsApi. CreateStreamConnection(ctx.Context, project.ID(), akoStreamInstance.Spec.Name, connection). Execute() @@ -149,7 +149,7 @@ func updateConnections( return err } - _, _, err = ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + _, _, err = ctx.SdkClientSet.SdkClient20250312002.StreamsApi. UpdateStreamConnection(ctx.Context, project.ID(), akoStreamInstance.Spec.Name, akoStreamConnection.Spec.Name, connection). Execute() @@ -178,7 +178,7 @@ func deleteConnections( atlasStreamConnections []*admin.StreamsConnection, ) error { for _, atlasStreamConnection := range atlasStreamConnections { - _, _, err := ctx.SdkClientSet.SdkClient20231115008.StreamsApi. + _, err := ctx.SdkClientSet.SdkClient20250312002.StreamsApi. DeleteStreamConnection(ctx.Context, project.ID(), streamInstance.Spec.Name, atlasStreamConnection.GetName()). Execute() diff --git a/internal/controller/atlasstream/transitions_test.go b/internal/controller/atlasstream/transitions_test.go index 6d06d3212b..63a60a145d 100644 --- a/internal/controller/atlasstream/transitions_test.go +++ b/internal/controller/atlasstream/transitions_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "go.uber.org/zap/zaptest" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -132,7 +132,7 @@ func TestCreate(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -220,7 +220,7 @@ func TestCreate(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -309,14 +309,13 @@ func TestDelete(t *testing.T) { streamsAPI.EXPECT(). DeleteStreamInstanceExecute(mock.AnythingOfType("admin.DeleteStreamInstanceApiRequest")). Return( - nil, &http.Response{}, nil, ) ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -474,14 +473,13 @@ func TestDelete(t *testing.T) { streamsAPI.EXPECT(). DeleteStreamInstanceExecute(mock.AnythingOfType("admin.DeleteStreamInstanceApiRequest")). Return( - nil, &http.Response{}, errors.New("failed to delete instance"), ) ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -576,14 +574,13 @@ func TestDelete(t *testing.T) { streamsAPI.EXPECT(). DeleteStreamInstanceExecute(mock.AnythingOfType("admin.DeleteStreamInstanceApiRequest")). Return( - nil, &http.Response{}, nil, ) ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -851,7 +848,7 @@ func TestUpdate(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -942,7 +939,7 @@ func TestUpdate(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -978,7 +975,7 @@ func TestCreateConnections(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -1056,7 +1053,7 @@ func TestCreateConnections(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -1204,7 +1201,7 @@ func TestUpdateConnections(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -1282,7 +1279,7 @@ func TestUpdateConnections(t *testing.T) { ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -1420,14 +1417,13 @@ func TestDeleteConnections(t *testing.T) { streamsAPI.EXPECT(). DeleteStreamConnectionExecute(mock.AnythingOfType("admin.DeleteStreamConnectionApiRequest")). Return( - nil, &http.Response{}, nil, ) ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, @@ -1490,11 +1486,11 @@ func TestDeleteConnections(t *testing.T) { Return(admin.DeleteStreamConnectionApiRequest{ApiService: streamsAPI}) streamsAPI.EXPECT(). DeleteStreamConnectionExecute(mock.AnythingOfType("admin.DeleteStreamConnectionApiRequest")). - Return(nil, &http.Response{}, errors.New("failed to delete connection")) + Return(&http.Response{}, errors.New("failed to delete connection")) ctx := &workflow.Context{ Context: context.Background(), SdkClientSet: &atlas.ClientSet{ - SdkClient20231115008: &admin.APIClient{ + SdkClient20250312002: &admin.APIClient{ StreamsApi: streamsAPI, }, }, diff --git a/internal/controller/reconciler/project.go b/internal/controller/reconciler/project.go index da2bda0187..6501d717a4 100644 --- a/internal/controller/reconciler/project.go +++ b/internal/controller/reconciler/project.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" k8serrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/translation/audit/audit.go b/internal/translation/audit/audit.go index ddacc5031f..e1eeb306e2 100644 --- a/internal/translation/audit/audit.go +++ b/internal/translation/audit/audit.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) // AuditLogService is the interface exposed by this translation layer over diff --git a/internal/translation/audit/conversion.go b/internal/translation/audit/conversion.go index 3b0b1b2a37..974e18673c 100644 --- a/internal/translation/audit/conversion.go +++ b/internal/translation/audit/conversion.go @@ -15,7 +15,7 @@ package audit import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" ) diff --git a/internal/translation/customroles/conversion.go b/internal/translation/customroles/conversion.go index 1a50db5075..9089ea6de5 100644 --- a/internal/translation/customroles/conversion.go +++ b/internal/translation/customroles/conversion.go @@ -15,7 +15,7 @@ package customroles import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" diff --git a/internal/translation/customroles/custom_roles.go b/internal/translation/customroles/custom_roles.go index 26a30bbfd7..32b3377b33 100644 --- a/internal/translation/customroles/custom_roles.go +++ b/internal/translation/customroles/custom_roles.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) type CustomRoleService interface { diff --git a/internal/translation/datafederation/conversion.go b/internal/translation/datafederation/conversion.go index b4abbf94a2..c816e4a0ba 100644 --- a/internal/translation/datafederation/conversion.go +++ b/internal/translation/datafederation/conversion.go @@ -18,7 +18,7 @@ import ( "fmt" "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common" @@ -288,7 +288,7 @@ func cloudProviderConfigToAtlas(config *akov2.CloudProviderConfig) *admin.DataLa return nil } return &admin.DataLakeCloudProviderConfig{ - Aws: admin.DataLakeAWSCloudProviderConfig{ + Aws: &admin.DataLakeAWSCloudProviderConfig{ RoleId: config.AWS.RoleID, TestS3Bucket: config.AWS.TestS3Bucket, }, diff --git a/internal/translation/datafederation/conversion_endpoints.go b/internal/translation/datafederation/conversion_endpoints.go index 0b4faf1c5c..126d858ab9 100644 --- a/internal/translation/datafederation/conversion_endpoints.go +++ b/internal/translation/datafederation/conversion_endpoints.go @@ -19,7 +19,7 @@ import ( "fmt" "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/cmp" diff --git a/internal/translation/datafederation/datafederation.go b/internal/translation/datafederation/datafederation.go index fceb821898..0040c8fc3a 100644 --- a/internal/translation/datafederation/datafederation.go +++ b/internal/translation/datafederation/datafederation.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) var ( @@ -80,7 +80,7 @@ func (dfs *AtlasDataFederationService) Update(ctx context.Context, df *DataFeder } func (dfs *AtlasDataFederationService) Delete(ctx context.Context, projectID, name string) error { - _, resp, err := dfs.api.DeleteFederatedDatabase(ctx, projectID, name).Execute() + resp, err := dfs.api.DeleteFederatedDatabase(ctx, projectID, name).Execute() if resp != nil && resp.StatusCode == http.StatusNotFound { return errors.Join(ErrorNotFound, err) } diff --git a/internal/translation/datafederation/datafederationendpoints.go b/internal/translation/datafederation/datafederationendpoints.go index 4042008d52..03bffae82f 100644 --- a/internal/translation/datafederation/datafederationendpoints.go +++ b/internal/translation/datafederation/datafederationendpoints.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/paging" ) @@ -59,7 +59,7 @@ func (d *DatafederationPrivateEndpoints) Create(ctx context.Context, aep *Datafe } func (d *DatafederationPrivateEndpoints) Delete(ctx context.Context, aep *DatafederationPrivateEndpointEntry) error { - _, _, err := d.api.DeleteDataFederationPrivateEndpoint(ctx, aep.ProjectID, aep.EndpointID).Execute() + _, err := d.api.DeleteDataFederationPrivateEndpoint(ctx, aep.ProjectID, aep.EndpointID).Execute() if err != nil { return fmt.Errorf("failed to delete data federation private endpoint: %w", err) } diff --git a/internal/translation/dbuser/conversion.go b/internal/translation/dbuser/conversion.go index bb85319a5e..2d5290a30b 100644 --- a/internal/translation/dbuser/conversion.go +++ b/internal/translation/dbuser/conversion.go @@ -21,7 +21,7 @@ import ( "time" "github.com/nsf/jsondiff" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common" diff --git a/internal/translation/dbuser/dbuser.go b/internal/translation/dbuser/dbuser.go index c918865abb..d9854f48ed 100644 --- a/internal/translation/dbuser/dbuser.go +++ b/internal/translation/dbuser/dbuser.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas" ) @@ -56,7 +56,7 @@ func (dus *AtlasUsers) Get(ctx context.Context, db, projectID, username string) } func (dus *AtlasUsers) Delete(ctx context.Context, db, projectID, username string) error { - _, _, err := dus.usersAPI.DeleteDatabaseUser(ctx, projectID, db, username).Execute() + _, err := dus.usersAPI.DeleteDatabaseUser(ctx, projectID, db, username).Execute() if err != nil { if admin.IsErrorCode(err, atlas.UserNotfound) { return errors.Join(ErrorNotFound, err) diff --git a/internal/translation/dbuser/dbuser_test.go b/internal/translation/dbuser/dbuser_test.go index e8501fbf9d..1d80257330 100644 --- a/internal/translation/dbuser/dbuser_test.go +++ b/internal/translation/dbuser/dbuser_test.go @@ -23,11 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" ) func TestAtlasUsersGet(t *testing.T) { @@ -37,7 +36,7 @@ func TestAtlasUsersGet(t *testing.T) { username := "test-user" notFoundErr := &admin.GenericOpenAPIError{} - notFoundErr.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("USERNAME_NOT_FOUND")}) + notFoundErr.SetModel(admin.ApiError{ErrorCode: "USERNAME_NOT_FOUND"}) tests := []struct { name string @@ -83,7 +82,7 @@ func TestAtlasUsersGet(t *testing.T) { admin.GetDatabaseUserApiRequest{ApiService: mockUsersAPI}) internalServerError := &admin.GenericOpenAPIError{} - internalServerError.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("500")}) + internalServerError.SetModel(admin.ApiError{ErrorCode: "500"}) mockUsersAPI.EXPECT().GetDatabaseUserExecute(admin.GetDatabaseUserApiRequest{ApiService: mockUsersAPI}).Return( nil, &http.Response{StatusCode: http.StatusInternalServerError}, errors.New("some error")) }, @@ -112,7 +111,7 @@ func TestAtlasUsersDelete(t *testing.T) { db := "database" username := "test-user" notFoundErr := &admin.GenericOpenAPIError{} - notFoundErr.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("USER_NOT_FOUND")}) + notFoundErr.SetModel(admin.ApiError{ErrorCode: "USER_NOT_FOUND"}) tests := []struct { name string setupMock func(mockUsersAPI *mockadmin.DatabaseUsersApi) @@ -124,7 +123,7 @@ func TestAtlasUsersDelete(t *testing.T) { mockUsersAPI.EXPECT().DeleteDatabaseUser(ctx, projectID, db, username).Return( admin.DeleteDatabaseUserApiRequest{ApiService: mockUsersAPI}) mockUsersAPI.EXPECT().DeleteDatabaseUserExecute(admin.DeleteDatabaseUserApiRequest{ApiService: mockUsersAPI}). - Return(nil, &http.Response{StatusCode: http.StatusOK}, nil) + Return(&http.Response{StatusCode: http.StatusOK}, nil) }, expectedErr: nil, }, @@ -135,7 +134,7 @@ func TestAtlasUsersDelete(t *testing.T) { admin.DeleteDatabaseUserApiRequest{ApiService: mockUsersAPI}) mockUsersAPI.EXPECT().DeleteDatabaseUserExecute(admin.DeleteDatabaseUserApiRequest{ApiService: mockUsersAPI}). - Return(nil, &http.Response{StatusCode: http.StatusNotFound}, notFoundErr) + Return(&http.Response{StatusCode: http.StatusNotFound}, notFoundErr) }, expectedErr: errors.Join(ErrorNotFound, notFoundErr), }, @@ -146,9 +145,9 @@ func TestAtlasUsersDelete(t *testing.T) { admin.DeleteDatabaseUserApiRequest{ApiService: mockUsersAPI}) internalServerError := &admin.GenericOpenAPIError{} - internalServerError.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("500")}) + internalServerError.SetModel(admin.ApiError{ErrorCode: "500"}) mockUsersAPI.EXPECT().DeleteDatabaseUserExecute(admin.DeleteDatabaseUserApiRequest{ApiService: mockUsersAPI}). - Return(nil, &http.Response{StatusCode: http.StatusInternalServerError}, fmt.Errorf("some error")) + Return(&http.Response{StatusCode: http.StatusInternalServerError}, fmt.Errorf("some error")) }, expectedErr: errors.New("some error"), }, diff --git a/internal/translation/dbuser/internal_test.go b/internal/translation/dbuser/internal_test.go index 111887a8c8..c19d2ad390 100644 --- a/internal/translation/dbuser/internal_test.go +++ b/internal/translation/dbuser/internal_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" diff --git a/internal/translation/deployment/compare_test.go b/internal/translation/deployment/compare_test.go index 232c1d352a..b56cd46f46 100644 --- a/internal/translation/deployment/compare_test.go +++ b/internal/translation/deployment/compare_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common" @@ -561,7 +561,7 @@ func TestComputeChanges(t *testing.T) { func TestSpecAreEqual(t *testing.T) { tests := map[string]struct { ako *akov2.AtlasDeployment - atlas *admin.AdvancedClusterDescription + atlas *admin.ClusterDescription20240805 expected bool }{ "should return false when cluster type are different": { @@ -572,7 +572,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ ClusterType: pointer.MakePtr("REPLICASET"), }, }, @@ -584,7 +584,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ BackupEnabled: pointer.MakePtr(false), }, }, @@ -599,7 +599,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ BiConnector: &admin.BiConnector{ Enabled: pointer.MakePtr(false), ReadPreference: pointer.MakePtr("secondary"), @@ -614,7 +614,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ DiskSizeGB: pointer.MakePtr(10.0), }, }, @@ -626,7 +626,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ EncryptionAtRestProvider: pointer.MakePtr("NONE"), }, }, @@ -638,7 +638,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ MongoDBMajorVersion: pointer.MakePtr("7.0"), }, }, @@ -650,7 +650,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ VersionReleaseSystem: pointer.MakePtr("LTS"), }, }, @@ -662,7 +662,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ RootCertType: pointer.MakePtr("NONE"), }, }, @@ -674,7 +674,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Paused: pointer.MakePtr(false), }, }, @@ -686,7 +686,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ PitEnabled: pointer.MakePtr(false), }, }, @@ -698,7 +698,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ TerminationProtectionEnabled: pointer.MakePtr(false), }, }, @@ -714,8 +714,8 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ - ReplicationSpecs: &[]admin.ReplicationSpec{ + atlas: &admin.ClusterDescription20240805{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), }, @@ -740,11 +740,11 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ - ReplicationSpecs: &[]admin.ReplicationSpec{ + atlas: &admin.ClusterDescription20240805{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), @@ -780,11 +780,11 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ - ReplicationSpecs: &[]admin.ReplicationSpec{ + atlas: &admin.ClusterDescription20240805{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), @@ -812,7 +812,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Labels: &[]admin.ComponentLabel{ { Key: pointer.MakePtr("label2"), @@ -834,7 +834,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Tags: &[]admin.ResourceTag{ { Key: "tag2", @@ -866,18 +866,18 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Name: pointer.MakePtr("cluster0"), ClusterType: pointer.MakePtr("REPLICASET"), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("TENANT"), BackingProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M0"), }, }, @@ -934,7 +934,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Name: pointer.MakePtr("cluster0"), ClusterType: pointer.MakePtr("REPLICASET"), BackupEnabled: pointer.MakePtr(true), @@ -959,19 +959,19 @@ func TestSpecAreEqual(t *testing.T) { }, VersionReleaseSystem: pointer.MakePtr("LTS"), TerminationProtectionEnabled: pointer.MakePtr(false), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(3), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(5), }, @@ -1037,7 +1037,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Name: pointer.MakePtr("cluster0"), ClusterType: pointer.MakePtr("REPLICASET"), BackupEnabled: pointer.MakePtr(true), @@ -1062,19 +1062,19 @@ func TestSpecAreEqual(t *testing.T) { }, VersionReleaseSystem: pointer.MakePtr("LTS"), TerminationProtectionEnabled: pointer.MakePtr(false), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(3), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(5), }, @@ -1169,7 +1169,7 @@ func TestSpecAreEqual(t *testing.T) { }, }, }, - atlas: &admin.AdvancedClusterDescription{ + atlas: &admin.ClusterDescription20240805{ Name: pointer.MakePtr("cluster0"), ClusterType: pointer.MakePtr("REPLICASET"), BackupEnabled: pointer.MakePtr(true), @@ -1194,19 +1194,19 @@ func TestSpecAreEqual(t *testing.T) { }, VersionReleaseSystem: pointer.MakePtr("LTS"), TerminationProtectionEnabled: pointer.MakePtr(false), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_WEST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(3), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(5), }, @@ -1223,11 +1223,11 @@ func TestSpecAreEqual(t *testing.T) { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(3), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M10"), NodeCount: pointer.MakePtr(5), }, diff --git a/internal/translation/deployment/conversion.go b/internal/translation/deployment/conversion.go index 2c4e1b57f2..bab112a89c 100644 --- a/internal/translation/deployment/conversion.go +++ b/internal/translation/deployment/conversion.go @@ -19,8 +19,7 @@ import ( "strconv" "strings" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common" @@ -487,7 +486,7 @@ func getAutoscalingOverride(replications []*akov2.AdvancedReplicationSpec) (bool return isTenant, false, "" } -func clusterFromAtlas(clusterDesc *admin.AdvancedClusterDescription) *Cluster { +func clusterFromAtlas(clusterDesc *admin.ClusterDescription20240805) *Cluster { connectionStrings := clusterDesc.GetConnectionStrings() pes := make([]status.PrivateEndpoint, 0, len(connectionStrings.GetPrivateEndpoint())) for _, pe := range connectionStrings.GetPrivateEndpoint() { @@ -552,8 +551,8 @@ func clusterFromAtlas(clusterDesc *admin.AdvancedClusterDescription) *Cluster { return cluster } -func clusterCreateToAtlas(cluster *Cluster) *admin.AdvancedClusterDescription { - return &admin.AdvancedClusterDescription{ +func clusterCreateToAtlas(cluster *Cluster) *admin.ClusterDescription20240805 { + return &admin.ClusterDescription20240805{ Name: pointer.MakePtrOrNil(cluster.Name), ClusterType: pointer.MakePtrOrNil(cluster.ClusterType), MongoDBMajorVersion: pointer.MakePtrOrNil(cluster.MongoDBMajorVersion), @@ -572,8 +571,8 @@ func clusterCreateToAtlas(cluster *Cluster) *admin.AdvancedClusterDescription { } } -func clusterUpdateToAtlas(cluster *Cluster) *admin.AdvancedClusterDescription { - return &admin.AdvancedClusterDescription{ +func clusterUpdateToAtlas(cluster *Cluster) *admin.ClusterDescription20240805 { + return &admin.ClusterDescription20240805{ ClusterType: pointer.MakePtrOrNil(cluster.ClusterType), MongoDBMajorVersion: pointer.MakePtrOrNil(cluster.MongoDBMajorVersion), VersionReleaseSystem: pointer.MakePtrOrNil(cluster.VersionReleaseSystem), @@ -591,7 +590,7 @@ func clusterUpdateToAtlas(cluster *Cluster) *admin.AdvancedClusterDescription { } } -func replicaSetFromAtlas(replicationSpecs []admin.ReplicationSpec) []status.ReplicaSet { +func replicaSetFromAtlas(replicationSpecs []admin.ReplicationSpec20240805) []status.ReplicaSet { replicaSet := make([]status.ReplicaSet, 0, len(replicationSpecs)) for _, replicationSpec := range replicationSpecs { replicaSet = append( @@ -643,8 +642,8 @@ func labelsFromAtlas(cLabels []admin.ComponentLabel) []common.LabelSpec { return labels } -func replicationSpecFromAtlas(replicationSpecs []admin.ReplicationSpec) []*akov2.AdvancedReplicationSpec { - hSpecOrDefault := func(spec admin.HardwareSpec, providerName string) *akov2.Specs { +func replicationSpecFromAtlas(replicationSpecs []admin.ReplicationSpec20240805) []*akov2.AdvancedReplicationSpec { + hSpecOrDefault := func(spec admin.HardwareSpec20240805, providerName string) *akov2.Specs { if spec.GetNodeCount() == 0 && providerName != string(provider.ProviderTenant) { return nil } @@ -656,7 +655,7 @@ func replicationSpecFromAtlas(replicationSpecs []admin.ReplicationSpec) []*akov2 DiskIOPS: pointer.MakePtrOrNil(int64(spec.GetDiskIOPS())), } } - dHSpecOrDefault := func(spec admin.DedicatedHardwareSpec) *akov2.Specs { + dHSpecOrDefault := func(spec admin.DedicatedHardwareSpec20240805) *akov2.Specs { if spec.GetNodeCount() == 0 { return nil } @@ -727,7 +726,7 @@ func replicationSpecFromAtlas(replicationSpecs []admin.ReplicationSpec) []*akov2 return specs } -func processArgsFromAtlas(config *admin.ClusterDescriptionProcessArgs) *akov2.ProcessArgs { +func processArgsFromAtlas(config *admin.ClusterDescriptionProcessArgs20240805) *akov2.ProcessArgs { oplogMinRetentionHours := "" if config.GetOplogMinRetentionHours() > 0 { oplogMinRetentionHours = strconv.FormatFloat(config.GetOplogMinRetentionHours(), 'f', -1, 64) @@ -790,12 +789,12 @@ func labelsToAtlas(labels []common.LabelSpec) *[]admin.ComponentLabel { return &cLabels } -func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) *[]admin.ReplicationSpec { +func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) *[]admin.ReplicationSpec20240805 { if len(replicationSpecs) == 0 { return nil } - hSpecOrDefault := func(spec *akov2.Specs) *admin.HardwareSpec { + hSpecOrDefault := func(spec *akov2.Specs) *admin.HardwareSpec20240805 { if spec == nil { return nil } @@ -805,14 +804,14 @@ func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) * diskIOPs = pointer.MakePtr(int(*spec.DiskIOPS)) } - return &admin.HardwareSpec{ + return &admin.HardwareSpec20240805{ InstanceSize: &spec.InstanceSize, NodeCount: spec.NodeCount, EbsVolumeType: pointer.NonZeroOrDefault(spec.EbsVolumeType, "STANDARD"), DiskIOPS: diskIOPs, } } - dHSpecOrDefault := func(spec *akov2.Specs) *admin.DedicatedHardwareSpec { + dHSpecOrDefault := func(spec *akov2.Specs) *admin.DedicatedHardwareSpec20240805 { if spec == nil || *spec.NodeCount == 0 { return nil } @@ -822,7 +821,7 @@ func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) * diskIOPs = pointer.MakePtr(int(*spec.DiskIOPS)) } - return &admin.DedicatedHardwareSpec{ + return &admin.DedicatedHardwareSpec20240805{ InstanceSize: &spec.InstanceSize, NodeCount: spec.NodeCount, EbsVolumeType: pointer.NonZeroOrDefault(spec.EbsVolumeType, "STANDARD"), @@ -870,13 +869,13 @@ func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) * return autoscaling } - specs := make([]admin.ReplicationSpec, 0, len(replicationSpecs)) + specs := make([]admin.ReplicationSpec20240805, 0, len(replicationSpecs)) for _, spec := range replicationSpecs { - regionConfigs := make([]admin.CloudRegionConfig, 0, len(spec.RegionConfigs)) + regionConfigs := make([]admin.CloudRegionConfig20240805, 0, len(spec.RegionConfigs)) for _, regionConfig := range spec.RegionConfigs { regionConfigs = append( regionConfigs, - admin.CloudRegionConfig{ + admin.CloudRegionConfig20240805{ ProviderName: pointer.MakePtrOrNil(regionConfig.ProviderName), BackingProviderName: pointer.MakePtrOrNil(regionConfig.BackingProviderName), RegionName: pointer.MakePtrOrNil(regionConfig.RegionName), @@ -891,7 +890,7 @@ func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) * specs = append( specs, - admin.ReplicationSpec{ + admin.ReplicationSpec20240805{ NumShards: pointer.NonZeroOrDefault(spec.NumShards, 1), ZoneName: pointer.MakePtrOrNil(spec.ZoneName), RegionConfigs: ®ionConfigs, @@ -902,7 +901,7 @@ func replicationSpecToAtlas(replicationSpecs []*akov2.AdvancedReplicationSpec) * return &specs } -func processArgsToAtlas(config *akov2.ProcessArgs) (*admin.ClusterDescriptionProcessArgs, error) { +func processArgsToAtlas(config *akov2.ProcessArgs) (*admin.ClusterDescriptionProcessArgs20240805, error) { var oplogMinRetentionHours *float64 if config.OplogMinRetentionHours != "" { parsed, err := strconv.ParseFloat(config.OplogMinRetentionHours, 64) @@ -913,7 +912,7 @@ func processArgsToAtlas(config *akov2.ProcessArgs) (*admin.ClusterDescriptionPro oplogMinRetentionHours = &parsed } - return &admin.ClusterDescriptionProcessArgs{ + return &admin.ClusterDescriptionProcessArgs20240805{ DefaultReadConcern: pointer.MakePtrOrNil(config.DefaultReadConcern), DefaultWriteConcern: pointer.MakePtrOrNil(config.DefaultWriteConcern), MinimumEnabledTlsProtocol: pointer.MakePtrOrNil(config.MinimumEnabledTLSProtocol), @@ -1006,7 +1005,7 @@ func serverlessUpdateToAtlas(serverless *Serverless) *admin.ServerlessInstanceDe } } -func clustersToConnections(clusters []admin.AdvancedClusterDescription) []Connection { +func clustersToConnections(clusters []admin.ClusterDescription20240805) []Connection { conns := []Connection{} for _, c := range clusters { conns = append(conns, Connection{ @@ -1058,7 +1057,7 @@ func fillServerlessPrivateEndpoints(cpeList []admin.ServerlessConnectionStringsP return pes } -func flexToConnections(flex []adminv20241113001.FlexClusterDescription20241113) []Connection { +func flexToConnections(flex []admin.FlexClusterDescription20241113) []Connection { conns := []Connection{} for _, f := range flex { conns = append(conns, Connection{ @@ -1090,7 +1089,7 @@ func set[T any](nameFn func(T) string, lists ...[]T) []T { return result } -func customZonesFromAtlas(gs *admin.GeoSharding) *[]akov2.CustomZoneMapping { +func customZonesFromAtlas(gs *admin.GeoSharding20240805) *[]akov2.CustomZoneMapping { if gs == nil { return nil } @@ -1101,7 +1100,7 @@ func customZonesFromAtlas(gs *admin.GeoSharding) *[]akov2.CustomZoneMapping { return &out } -func managedNamespacesFromAtlas(gs *admin.GeoSharding) []akov2.ManagedNamespace { +func managedNamespacesFromAtlas(gs *admin.GeoSharding20240805) []akov2.ManagedNamespace { if gs == nil { return nil } @@ -1135,14 +1134,14 @@ func customZonesToAtlas(in *[]akov2.CustomZoneMapping) *admin.CustomZoneMappings } } -func managedNamespaceToAtlas(in *akov2.ManagedNamespace) *admin.ManagedNamespace { +func managedNamespaceToAtlas(in *akov2.ManagedNamespace) *admin.ManagedNamespaces { if in == nil { return nil } - return &admin.ManagedNamespace{ - Db: pointer.MakePtr(in.Db), - Collection: pointer.MakePtr(in.Collection), - CustomShardKey: pointer.MakePtr(in.CustomShardKey), + return &admin.ManagedNamespaces{ + Db: in.Db, + Collection: in.Collection, + CustomShardKey: in.CustomShardKey, IsCustomShardKeyHashed: in.IsCustomShardKeyHashed, IsShardKeyUnique: in.IsShardKeyUnique, NumInitialChunks: pointer.MakePtr(int64(in.NumInitialChunks)), @@ -1150,7 +1149,7 @@ func managedNamespaceToAtlas(in *akov2.ManagedNamespace) *admin.ManagedNamespace } } -func flexFromAtlas(instance *adminv20241113001.FlexClusterDescription20241113) *Flex { +func flexFromAtlas(instance *admin.FlexClusterDescription20241113) *Flex { connectionStrings := instance.GetConnectionStrings() providerSettings := instance.GetProviderSettings() @@ -1190,20 +1189,20 @@ func flexFromAtlas(instance *adminv20241113001.FlexClusterDescription20241113) * return f } -func flexCreateToAtlas(flex *Flex) *adminv20241113001.FlexClusterDescriptionCreate20241113 { - return &adminv20241113001.FlexClusterDescriptionCreate20241113{ +func flexCreateToAtlas(flex *Flex) *admin.FlexClusterDescriptionCreate20241113 { + return &admin.FlexClusterDescriptionCreate20241113{ Name: flex.Name, Tags: tag.FlexToAtlas(flex.Tags), TerminationProtectionEnabled: &flex.TerminationProtectionEnabled, - ProviderSettings: adminv20241113001.FlexProviderSettingsCreate20241113{ + ProviderSettings: admin.FlexProviderSettingsCreate20241113{ BackingProviderName: flex.ProviderSettings.BackingProviderName, RegionName: flex.ProviderSettings.RegionName, }, } } -func flexUpdateToAtlas(flex *Flex) *adminv20241113001.FlexClusterDescriptionUpdate20241113 { - return &adminv20241113001.FlexClusterDescriptionUpdate20241113{ +func flexUpdateToAtlas(flex *Flex) *admin.FlexClusterDescriptionUpdate20241113 { + return &admin.FlexClusterDescriptionUpdate20241113{ Tags: tag.FlexToAtlas(flex.Tags), TerminationProtectionEnabled: &flex.TerminationProtectionEnabled, } diff --git a/internal/translation/deployment/conversion_test.go b/internal/translation/deployment/conversion_test.go index 7f2e273411..4e76cf13ee 100644 --- a/internal/translation/deployment/conversion_test.go +++ b/internal/translation/deployment/conversion_test.go @@ -21,7 +21,7 @@ import ( fuzz "github.com/google/gofuzz" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common" @@ -747,7 +747,7 @@ func TestRoundtrip_ManagedNamespace(t *testing.T) { f := fuzz.New() for range 100 { - fuzzed := &admin.GeoSharding{} + fuzzed := &admin.GeoSharding20240805{} f.Fuzz(fuzzed) fuzzed.CustomZoneMapping = nil t.Log(fuzzed.ManagedNamespaces) @@ -775,7 +775,7 @@ func TestRoundtrip_CustomZone(t *testing.T) { f := fuzz.New() for range 100 { - fuzzed := &admin.GeoSharding{} + fuzzed := &admin.GeoSharding20240805{} f.Fuzz(fuzzed) fuzzed.ManagedNamespaces = nil diff --git a/internal/translation/deployment/deployment.go b/internal/translation/deployment/deployment.go index 0c14f70f73..44858cab9f 100644 --- a/internal/translation/deployment/deployment.go +++ b/internal/translation/deployment/deployment.go @@ -19,8 +19,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.mongodb.org/atlas/mongodbatlas" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -60,12 +59,12 @@ type GlobalClusterService interface { type ProductionAtlasDeployments struct { clustersAPI admin.ClustersApi serverlessAPI admin.ServerlessInstancesApi - flexAPI adminv20241113001.FlexClustersApi + flexAPI admin.FlexClustersApi globalClusterAPI admin.GlobalClustersApi isGov bool } -func NewAtlasDeployments(clusterService admin.ClustersApi, serverlessAPI admin.ServerlessInstancesApi, globalClusterAPI admin.GlobalClustersApi, flexAPI adminv20241113001.FlexClustersApi, isGov bool) *ProductionAtlasDeployments { +func NewAtlasDeployments(clusterService admin.ClustersApi, serverlessAPI admin.ServerlessInstancesApi, globalClusterAPI admin.GlobalClustersApi, flexAPI admin.FlexClustersApi, isGov bool) *ProductionAtlasDeployments { return &ProductionAtlasDeployments{clustersAPI: clusterService, serverlessAPI: serverlessAPI, globalClusterAPI: globalClusterAPI, flexAPI: flexAPI, isGov: isGov} } @@ -138,7 +137,7 @@ func (ds *ProductionAtlasDeployments) ListDeploymentConnections(ctx context.Cont func (ds *ProductionAtlasDeployments) ClusterExists(ctx context.Context, projectID, name string) (bool, error) { flex, err := ds.GetFlexCluster(ctx, projectID, name) - if !adminv20241113001.IsErrorCode(err, atlas.NonFlexInFlexAPI) && err != nil { + if !admin.IsErrorCode(err, atlas.NonFlexInFlexAPI) && err != nil { return false, err } if flex != nil { @@ -183,7 +182,7 @@ func (ds *ProductionAtlasDeployments) GetFlexCluster(ctx context.Context, projec return flexFromAtlas(flex), nil } - if !adminv20241113001.IsErrorCode(err, atlas.ClusterNotFound) { + if !admin.IsErrorCode(err, atlas.ClusterNotFound) { return nil, err } @@ -322,7 +321,7 @@ func (ds *ProductionAtlasDeployments) DeleteDeployment(ctx context.Context, depl case *Serverless: _, _, err = ds.serverlessAPI.DeleteServerlessInstance(ctx, deployment.GetProjectID(), deployment.GetName()).Execute() case *Flex: - _, _, err = ds.flexAPI.DeleteFlexCluster(ctx, deployment.GetProjectID(), deployment.GetName()).Execute() + _, err = ds.flexAPI.DeleteFlexCluster(ctx, deployment.GetProjectID(), deployment.GetName()).Execute() } if err != nil { diff --git a/internal/translation/deployment/deployment_test.go b/internal/translation/deployment/deployment_test.go index 0440807f56..6fdf2ca260 100644 --- a/internal/translation/deployment/deployment_test.go +++ b/internal/translation/deployment/deployment_test.go @@ -25,10 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" - mockadminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -48,7 +46,7 @@ func TestProductionAtlasDeployments_ListDeploymentConnections(t *testing.T) { mockServerlessAPI := mockadmin.NewServerlessInstancesApi(t) mockServerlessAPI.EXPECT().ListServerlessInstancesExecute(mock.Anything).Unset() - mockFlexAPI := mockadminv20241113001.NewFlexClustersApi(t) + mockFlexAPI := mockadmin.NewFlexClustersApi(t) mockFlexAPI.EXPECT().ListFlexClustersExecute(mock.Anything).Unset() ds := &ProductionAtlasDeployments{ clustersAPI: mockClustersAPI, @@ -75,11 +73,11 @@ func TestProductionAtlasDeployments_ListDeploymentConnections(t *testing.T) { admin.ListServerlessInstancesApiRequest{ApiService: mockServerlessAPI}).Return( nil, &http.Response{StatusCode: http.StatusOK}, nil) - mockFlexAPI := mockadminv20241113001.NewFlexClustersApi(t) + mockFlexAPI := mockadmin.NewFlexClustersApi(t) mockFlexAPI.EXPECT().ListFlexClusters(context.Background(), mock.Anything).Return( - adminv20241113001.ListFlexClustersApiRequest{ApiService: mockFlexAPI}) + admin.ListFlexClustersApiRequest{ApiService: mockFlexAPI}) mockFlexAPI.EXPECT().ListFlexClustersExecute( - adminv20241113001.ListFlexClustersApiRequest{ApiService: mockFlexAPI}).Return( + admin.ListFlexClustersApiRequest{ApiService: mockFlexAPI}).Return( nil, &http.Response{StatusCode: http.StatusOK}, nil) ds := &ProductionAtlasDeployments{ @@ -99,7 +97,7 @@ func TestProductionAtlasDeployments_ListDeploymentConnections(t *testing.T) { admin.ListClustersApiRequest{ApiService: mockClustersAPI}) mockClustersAPI.EXPECT().ListClustersExecute(admin.ListClustersApiRequest{ApiService: mockClustersAPI}).Return( &admin.PaginatedAdvancedClusterDescription{ - Results: &[]admin.AdvancedClusterDescription{ + Results: &[]admin.ClusterDescription20240805{ { Name: pointer.MakePtr("testCluster"), ConnectionStrings: &admin.ClusterConnectionStrings{StandardSrv: pointer.MakePtr("clusterSRV")}, @@ -121,16 +119,16 @@ func TestProductionAtlasDeployments_ListDeploymentConnections(t *testing.T) { }, }, &http.Response{StatusCode: http.StatusOK}, nil) - mockFlexAPI := mockadminv20241113001.NewFlexClustersApi(t) + mockFlexAPI := mockadmin.NewFlexClustersApi(t) mockFlexAPI.EXPECT().ListFlexClusters(context.Background(), mock.Anything).Return( - adminv20241113001.ListFlexClustersApiRequest{ApiService: mockFlexAPI}) + admin.ListFlexClustersApiRequest{ApiService: mockFlexAPI}) mockFlexAPI.EXPECT().ListFlexClustersExecute( - adminv20241113001.ListFlexClustersApiRequest{ApiService: mockFlexAPI}).Return( - &adminv20241113001.PaginatedFlexClusters20241113{ - Results: &[]adminv20241113001.FlexClusterDescription20241113{ + admin.ListFlexClustersApiRequest{ApiService: mockFlexAPI}).Return( + &admin.PaginatedFlexClusters20241113{ + Results: &[]admin.FlexClusterDescription20241113{ { Name: pointer.MakePtr("testFlex"), - ConnectionStrings: &adminv20241113001.FlexConnectionStrings20241113{StandardSrv: pointer.MakePtr("flexSRV")}, + ConnectionStrings: &admin.FlexConnectionStrings20241113{StandardSrv: pointer.MakePtr("flexSRV")}, }, }, }, &http.Response{StatusCode: http.StatusOK}, nil) @@ -151,17 +149,17 @@ func TestProductionAtlasDeployments_ListDeploymentConnections(t *testing.T) { func TestClusterExists(t *testing.T) { tests := map[string]struct { deployment *akov2.AtlasDeployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) gov bool result bool err error }{ "should fail to assert a cluster exists in atlas": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(context.Background(), "project-id", "cluster0"). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return(nil, nil, errors.New("failed to get cluster from atlas")) @@ -173,7 +171,7 @@ func TestClusterExists(t *testing.T) { }, "should fail to assert a serverless instance exists in atlas": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "instance0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -186,12 +184,12 @@ func TestClusterExists(t *testing.T) { serverlessInstanceAPI.EXPECT().GetServerlessInstanceExecute(mock.AnythingOfType("admin.GetServerlessInstanceApiRequest")). Return(nil, nil, errors.New("failed to get serverless instance from atlas")) - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.ClusterNotFound}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.ClusterNotFound}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(context.Background(), "project-id", "instance0"). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return(nil, nil, err) @@ -201,7 +199,7 @@ func TestClusterExists(t *testing.T) { }, "should return false when cluster doesn't exist": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -214,12 +212,12 @@ func TestClusterExists(t *testing.T) { serverlessInstanceAPI.EXPECT().GetServerlessInstanceExecute(mock.AnythingOfType("admin.GetServerlessInstanceApiRequest")). Return(nil, nil, atlasAPIError(atlas.ProviderUnsupported)) - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(context.Background(), "project-id", "cluster0"). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return(nil, nil, err) @@ -228,7 +226,7 @@ func TestClusterExists(t *testing.T) { }, "should return false when serverless instance doesn't exist": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "instance0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -241,12 +239,12 @@ func TestClusterExists(t *testing.T) { serverlessInstanceAPI.EXPECT().GetServerlessInstanceExecute(mock.AnythingOfType("admin.GetServerlessInstanceApiRequest")). Return(nil, nil, atlasAPIError(atlas.ServerlessInstanceNotFound)) - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(context.Background(), "project-id", "instance0"). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return(nil, nil, err) @@ -255,7 +253,7 @@ func TestClusterExists(t *testing.T) { }, "should return a cluster exists": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -268,12 +266,12 @@ func TestClusterExists(t *testing.T) { serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(mock.Anything, "project-id", "cluster0"). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return(nil, &http.Response{}, err) @@ -283,7 +281,7 @@ func TestClusterExists(t *testing.T) { }, "should return a serverless instance exists": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "instance0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -300,12 +298,12 @@ func TestClusterExists(t *testing.T) { nil, ) - err := &adminv20241113001.GenericOpenAPIError{} - err.SetModel(adminv20241113001.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) + err := &admin.GenericOpenAPIError{} + err.SetModel(admin.ApiError{ErrorCode: atlas.NonFlexInFlexAPI}) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) flexAPI.EXPECT().GetFlexCluster(context.Background(), "project-id", "instance0"). - Return(adminv20241113001.GetFlexClusterApiRequest{ApiService: flexAPI}) + Return(admin.GetFlexClusterApiRequest{ApiService: flexAPI}) flexAPI.EXPECT().GetFlexClusterExecute(mock.AnythingOfType("admin.GetFlexClusterApiRequest")). Return(nil, nil, err) @@ -315,7 +313,7 @@ func TestClusterExists(t *testing.T) { }, "should return false when asserting serverless instance exists in gov": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "instance0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -323,7 +321,7 @@ func TestClusterExists(t *testing.T) { Return(nil, nil, atlasAPIError(atlas.ServerlessInstanceFromClusterAPI)) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -347,13 +345,13 @@ func TestClusterExists(t *testing.T) { func TestGetDeployment(t *testing.T) { tests := map[string]struct { deployment *akov2.AtlasDeployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) result Deployment err error }{ "should fail to retrieve cluster from atlas": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -361,14 +359,14 @@ func TestGetDeployment(t *testing.T) { Return(nil, nil, errors.New("failed to get cluster from atlas")) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, err: errors.New("failed to get cluster from atlas"), }, "should fail to retrieve serverless instance from atlas": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -377,14 +375,14 @@ func TestGetDeployment(t *testing.T) { serverlessInstanceAPI.EXPECT().GetServerlessInstanceExecute(mock.AnythingOfType("admin.GetServerlessInstanceApiRequest")). Return(nil, nil, errors.New("failed to get serverless instance from atlas")) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, err: errors.New("failed to get serverless instance from atlas"), }, "should return nil when cluster doesn't exist": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -392,13 +390,13 @@ func TestGetDeployment(t *testing.T) { Return(nil, nil, atlasAPIError(atlas.ClusterNotFound)) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, }, "should return nil when serverless instance doesn't exist": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -407,13 +405,13 @@ func TestGetDeployment(t *testing.T) { serverlessInstanceAPI.EXPECT().GetServerlessInstanceExecute(mock.AnythingOfType("admin.GetServerlessInstanceApiRequest")). Return(nil, nil, atlasAPIError(atlas.ServerlessInstanceNotFound)) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, }, "should return a cluster": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetCluster(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterApiRequest{ApiService: clusterAPI}) @@ -425,14 +423,14 @@ func TestGetDeployment(t *testing.T) { ) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, result: expectedGeoShardedCluster(), }, "should return a serverless instance": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -445,7 +443,7 @@ func TestGetDeployment(t *testing.T) { nil, ) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, result: expectedServerlessInstance(), @@ -467,28 +465,28 @@ func TestGetDeployment(t *testing.T) { func TestCreateDeployment(t *testing.T) { tests := map[string]struct { deployment *akov2.AtlasDeployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) result Deployment err error }{ "should fail to create cluster in atlas": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) - clusterAPI.EXPECT().CreateCluster(context.Background(), "project-id", mock.AnythingOfType("*admin.AdvancedClusterDescription")). + clusterAPI.EXPECT().CreateCluster(context.Background(), "project-id", mock.AnythingOfType("*admin.ClusterDescription20240805")). Return(admin.CreateClusterApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().CreateClusterExecute(mock.AnythingOfType("admin.CreateClusterApiRequest")). Return(nil, nil, errors.New("failed to create cluster in atlas")) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, err: errors.New("failed to create cluster in atlas"), }, "should fail to create serverless instance in atlas": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -497,16 +495,16 @@ func TestCreateDeployment(t *testing.T) { serverlessInstanceAPI.EXPECT().CreateServerlessInstanceExecute(mock.AnythingOfType("admin.CreateServerlessInstanceApiRequest")). Return(nil, nil, errors.New("failed to create serverless instance in atlas")) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, err: errors.New("failed to create serverless instance in atlas"), }, "should create a cluster": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) - clusterAPI.EXPECT().CreateCluster(context.Background(), "project-id", mock.AnythingOfType("*admin.AdvancedClusterDescription")). + clusterAPI.EXPECT().CreateCluster(context.Background(), "project-id", mock.AnythingOfType("*admin.ClusterDescription20240805")). Return(admin.CreateClusterApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().CreateClusterExecute(mock.AnythingOfType("admin.CreateClusterApiRequest")). Return( @@ -516,7 +514,7 @@ func TestCreateDeployment(t *testing.T) { ) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -524,7 +522,7 @@ func TestCreateDeployment(t *testing.T) { }, "should create a serverless instance": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -537,7 +535,7 @@ func TestCreateDeployment(t *testing.T) { nil, ) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, result: expectedServerlessInstance(), @@ -559,28 +557,28 @@ func TestCreateDeployment(t *testing.T) { func TestUpdateDeployment(t *testing.T) { tests := map[string]struct { deployment *akov2.AtlasDeployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) result Deployment err error }{ "should fail to update cluster in atlas": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) - clusterAPI.EXPECT().UpdateCluster(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.AdvancedClusterDescription")). + clusterAPI.EXPECT().UpdateCluster(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.ClusterDescription20240805")). Return(admin.UpdateClusterApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().UpdateClusterExecute(mock.AnythingOfType("admin.UpdateClusterApiRequest")). Return(nil, nil, errors.New("failed to update cluster in atlas")) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, err: errors.New("failed to update cluster in atlas"), }, "should fail to update serverless instance in atlas": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -589,16 +587,16 @@ func TestUpdateDeployment(t *testing.T) { serverlessInstanceAPI.EXPECT().UpdateServerlessInstanceExecute(mock.AnythingOfType("admin.UpdateServerlessInstanceApiRequest")). Return(nil, nil, errors.New("failed to update serverless instance in atlas")) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, err: errors.New("failed to update serverless instance in atlas"), }, "should update a cluster": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) - clusterAPI.EXPECT().UpdateCluster(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.AdvancedClusterDescription")). + clusterAPI.EXPECT().UpdateCluster(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.ClusterDescription20240805")). Return(admin.UpdateClusterApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().UpdateClusterExecute(mock.AnythingOfType("admin.UpdateClusterApiRequest")). Return( @@ -608,14 +606,14 @@ func TestUpdateDeployment(t *testing.T) { ) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, result: expectedGeoShardedCluster(), }, "should update a serverless instance": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -628,7 +626,7 @@ func TestUpdateDeployment(t *testing.T) { nil, ) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -651,13 +649,13 @@ func TestUpdateDeployment(t *testing.T) { func TestDeleteDeployment(t *testing.T) { tests := map[string]struct { deployment *akov2.AtlasDeployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) result Deployment err error }{ "should fail to delete cluster in atlas": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().DeleteCluster(context.Background(), "project-id", "cluster0"). Return(admin.DeleteClusterApiRequest{ApiService: clusterAPI}) @@ -665,7 +663,7 @@ func TestDeleteDeployment(t *testing.T) { Return(nil, errors.New("failed to delete cluster in atlas")) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -673,7 +671,7 @@ func TestDeleteDeployment(t *testing.T) { }, "should fail to delete serverless instance in atlas": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -682,7 +680,7 @@ func TestDeleteDeployment(t *testing.T) { serverlessInstanceAPI.EXPECT().DeleteServerlessInstanceExecute(mock.AnythingOfType("admin.DeleteServerlessInstanceApiRequest")). Return(nil, nil, errors.New("failed to delete serverless instance in atlas")) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -690,7 +688,7 @@ func TestDeleteDeployment(t *testing.T) { }, "should delete a cluster": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().DeleteCluster(context.Background(), "project-id", "cluster0"). Return(admin.DeleteClusterApiRequest{ApiService: clusterAPI}) @@ -698,7 +696,7 @@ func TestDeleteDeployment(t *testing.T) { Return(nil, nil) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -706,7 +704,7 @@ func TestDeleteDeployment(t *testing.T) { }, "should delete a serverless instance": { deployment: serverlessInstance(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) @@ -715,7 +713,7 @@ func TestDeleteDeployment(t *testing.T) { serverlessInstanceAPI.EXPECT().DeleteServerlessInstanceExecute(mock.AnythingOfType("admin.DeleteServerlessInstanceApiRequest")). Return(nil, nil, nil) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -737,13 +735,13 @@ func TestDeleteDeployment(t *testing.T) { func TestClusterWithProcessArgs(t *testing.T) { tests := map[string]struct { deployment *akov2.AtlasDeployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) result Deployment err error }{ "should fail to retrieve cluster process args from atlas": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterAdvancedConfigurationApiRequest{ApiService: clusterAPI}) @@ -751,7 +749,7 @@ func TestClusterWithProcessArgs(t *testing.T) { Return(nil, nil, errors.New("failed to get cluster process args from atlas")) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -759,13 +757,13 @@ func TestClusterWithProcessArgs(t *testing.T) { }, "should return process args with default settings": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterAdvancedConfigurationApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().GetClusterAdvancedConfigurationExecute(mock.AnythingOfType("admin.GetClusterAdvancedConfigurationApiRequest")). Return( - &admin.ClusterDescriptionProcessArgs{ + &admin.ClusterDescriptionProcessArgs20240805{ MinimumEnabledTlsProtocol: pointer.MakePtr("TLS1_2"), JavascriptEnabled: pointer.MakePtr(true), NoTableScan: pointer.MakePtr(false), @@ -775,7 +773,7 @@ func TestClusterWithProcessArgs(t *testing.T) { ) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -789,13 +787,13 @@ func TestClusterWithProcessArgs(t *testing.T) { }, "should return process args": { deployment: geoShardedCluster(), - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) clusterAPI.EXPECT().GetClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0"). Return(admin.GetClusterAdvancedConfigurationApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().GetClusterAdvancedConfigurationExecute(mock.AnythingOfType("admin.GetClusterAdvancedConfigurationApiRequest")). Return( - &admin.ClusterDescriptionProcessArgs{ + &admin.ClusterDescriptionProcessArgs20240805{ DefaultReadConcern: pointer.MakePtr("available"), DefaultWriteConcern: pointer.MakePtr("available"), FailIndexKeyTooLong: pointer.MakePtr(true), @@ -812,7 +810,7 @@ func TestClusterWithProcessArgs(t *testing.T) { ) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -852,7 +850,7 @@ func TestClusterWithProcessArgs(t *testing.T) { func TestUpdateProcessArgs(t *testing.T) { tests := map[string]struct { deployment Deployment - apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) + apiMocker func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) result Deployment err error }{ @@ -866,10 +864,10 @@ func TestUpdateProcessArgs(t *testing.T) { OplogMinRetentionHours: "wrong", }, }, - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -891,15 +889,15 @@ func TestUpdateProcessArgs(t *testing.T) { OplogMinRetentionHours: "12.0", }, }, - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) - clusterAPI.EXPECT().UpdateClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.ClusterDescriptionProcessArgs")). + clusterAPI.EXPECT().UpdateClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.ClusterDescriptionProcessArgs20240805")). Return(admin.UpdateClusterAdvancedConfigurationApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().UpdateClusterAdvancedConfigurationExecute(mock.AnythingOfType("admin.UpdateClusterAdvancedConfigurationApiRequest")). Return(nil, nil, errors.New("failed to update cluster process args in atlas")) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -921,13 +919,13 @@ func TestUpdateProcessArgs(t *testing.T) { OplogMinRetentionHours: "12.0", }, }, - apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, adminv20241113001.FlexClustersApi) { + apiMocker: func() (admin.ClustersApi, admin.ServerlessInstancesApi, admin.FlexClustersApi) { clusterAPI := mockadmin.NewClustersApi(t) - clusterAPI.EXPECT().UpdateClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.ClusterDescriptionProcessArgs")). + clusterAPI.EXPECT().UpdateClusterAdvancedConfiguration(context.Background(), "project-id", "cluster0", mock.AnythingOfType("*admin.ClusterDescriptionProcessArgs20240805")). Return(admin.UpdateClusterAdvancedConfigurationApiRequest{ApiService: clusterAPI}) clusterAPI.EXPECT().UpdateClusterAdvancedConfigurationExecute(mock.AnythingOfType("admin.UpdateClusterAdvancedConfigurationApiRequest")). Return( - &admin.ClusterDescriptionProcessArgs{ + &admin.ClusterDescriptionProcessArgs20240805{ DefaultReadConcern: pointer.MakePtr("available"), DefaultWriteConcern: pointer.MakePtr("available"), FailIndexKeyTooLong: pointer.MakePtr(true), @@ -944,7 +942,7 @@ func TestUpdateProcessArgs(t *testing.T) { ) serverlessInstanceAPI := mockadmin.NewServerlessInstancesApi(t) - flexAPI := mockadminv20241113001.NewFlexClustersApi(t) + flexAPI := mockadmin.NewFlexClustersApi(t) return clusterAPI, serverlessInstanceAPI, flexAPI }, @@ -1414,8 +1412,8 @@ func expectedGeoShardedCluster() *Cluster { } } -func atlasGeoShardedCluster() *admin.AdvancedClusterDescription { - return &admin.AdvancedClusterDescription{ +func atlasGeoShardedCluster() *admin.ClusterDescription20240805 { + return &admin.ClusterDescription20240805{ GroupId: pointer.MakePtr("project-id"), Name: pointer.MakePtr("cluster0"), ClusterType: pointer.MakePtr("GEOSHARDED"), @@ -1452,29 +1450,29 @@ func atlasGeoShardedCluster() *admin.AdvancedClusterDescription { Value: "A", }, }, - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { Id: pointer.MakePtr("replication-id-2"), ZoneName: pointer.MakePtr("Zone 2"), NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("EU_CENTRAL_1"), Priority: pointer.MakePtr(6), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(2), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - AnalyticsSpecs: &admin.DedicatedHardwareSpec{ + AnalyticsSpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(1), EbsVolumeType: pointer.MakePtr("STANDARD"), @@ -1496,19 +1494,19 @@ func atlasGeoShardedCluster() *admin.AdvancedClusterDescription { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("EU_WEST_1"), Priority: pointer.MakePtr(4), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - AnalyticsSpecs: &admin.DedicatedHardwareSpec{ + AnalyticsSpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(1), EbsVolumeType: pointer.MakePtr("STANDARD"), @@ -1532,24 +1530,24 @@ func atlasGeoShardedCluster() *admin.AdvancedClusterDescription { Id: pointer.MakePtr("replication-id-1"), ZoneName: pointer.MakePtr("Zone 1"), NumShards: pointer.MakePtr(1), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_EAST_1"), Priority: pointer.MakePtr(7), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - AnalyticsSpecs: &admin.DedicatedHardwareSpec{ + AnalyticsSpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(1), EbsVolumeType: pointer.MakePtr("STANDARD"), @@ -1571,19 +1569,19 @@ func atlasGeoShardedCluster() *admin.AdvancedClusterDescription { ProviderName: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("EU_WEST_1"), Priority: pointer.MakePtr(5), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - ReadOnlySpecs: &admin.DedicatedHardwareSpec{ + ReadOnlySpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(3), EbsVolumeType: pointer.MakePtr("STANDARD"), DiskIOPS: pointer.MakePtr(3000), }, - AnalyticsSpecs: &admin.DedicatedHardwareSpec{ + AnalyticsSpecs: &admin.DedicatedHardwareSpec20240805{ InstanceSize: pointer.MakePtr("M30"), NodeCount: pointer.MakePtr(1), EbsVolumeType: pointer.MakePtr("STANDARD"), diff --git a/internal/translation/encryptionatrest/conversion.go b/internal/translation/encryptionatrest/conversion.go index ab96af89c3..14c9f17fed 100644 --- a/internal/translation/encryptionatrest/conversion.go +++ b/internal/translation/encryptionatrest/conversion.go @@ -17,7 +17,7 @@ package encryptionatrest import ( "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common" diff --git a/internal/translation/encryptionatrest/encryptionatrest.go b/internal/translation/encryptionatrest/encryptionatrest.go index 7db532f845..349a8d2f2f 100644 --- a/internal/translation/encryptionatrest/encryptionatrest.go +++ b/internal/translation/encryptionatrest/encryptionatrest.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) type EncryptionAtRestService interface { diff --git a/internal/translation/ipaccesslist/conversion.go b/internal/translation/ipaccesslist/conversion.go index 65bd1ed8be..6267ad9ef2 100644 --- a/internal/translation/ipaccesslist/conversion.go +++ b/internal/translation/ipaccesslist/conversion.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/project" diff --git a/internal/translation/ipaccesslist/ipaccesslist.go b/internal/translation/ipaccesslist/ipaccesslist.go index 0c09ef43be..848d5270bc 100644 --- a/internal/translation/ipaccesslist/ipaccesslist.go +++ b/internal/translation/ipaccesslist/ipaccesslist.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/paging" ) @@ -56,7 +56,7 @@ func (i *IPAccessList) Add(ctx context.Context, projectID string, entries IPAcce } func (i *IPAccessList) Delete(ctx context.Context, projectID string, entry *IPAccessEntry) error { - _, _, err := i.ipAccessListAPI.DeleteProjectIpAccessList(ctx, projectID, entry.ID()).Execute() + _, err := i.ipAccessListAPI.DeleteProjectIpAccessList(ctx, projectID, entry.ID()).Execute() if err != nil { return fmt.Errorf("failed to delete ip access list from Atlas: %w", err) } diff --git a/internal/translation/ipaccesslist/ipaccesslist_test.go b/internal/translation/ipaccesslist/ipaccesslist_test.go index fdb4e063f0..f495174d5b 100644 --- a/internal/translation/ipaccesslist/ipaccesslist_test.go +++ b/internal/translation/ipaccesslist/ipaccesslist_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" ) @@ -225,7 +225,6 @@ func TestIPAccessList_Delete(t *testing.T) { Return(admin.DeleteProjectIpAccessListApiRequest{ApiService: apiMock}) apiMock.EXPECT().DeleteProjectIpAccessListExecute(mock.AnythingOfType("admin.DeleteProjectIpAccessListApiRequest")). Return( - nil, &http.Response{}, nil, ) @@ -241,7 +240,7 @@ func TestIPAccessList_Delete(t *testing.T) { apiMock.EXPECT().DeleteProjectIpAccessList(context.Background(), projectID, "192.168.100.150/32"). Return(admin.DeleteProjectIpAccessListApiRequest{ApiService: apiMock}) apiMock.EXPECT().DeleteProjectIpAccessListExecute(mock.AnythingOfType("admin.DeleteProjectIpAccessListApiRequest")). - Return(nil, &http.Response{}, apiErr) + Return(&http.Response{}, apiErr) return apiMock }, diff --git a/internal/translation/maintenancewindow/conversion.go b/internal/translation/maintenancewindow/conversion.go index 717e639ae2..5f96a46bdb 100644 --- a/internal/translation/maintenancewindow/conversion.go +++ b/internal/translation/maintenancewindow/conversion.go @@ -17,7 +17,7 @@ package maintenancewindow import ( "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/project" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" diff --git a/internal/translation/maintenancewindow/maintenancewindow.go b/internal/translation/maintenancewindow/maintenancewindow.go index 6886775df2..dbcee526db 100644 --- a/internal/translation/maintenancewindow/maintenancewindow.go +++ b/internal/translation/maintenancewindow/maintenancewindow.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) type MaintenanceWindowService interface { @@ -46,7 +46,7 @@ func (mw *MaintenanceWindowAPI) Get(ctx context.Context, projectID string) (*Mai } func (mw *MaintenanceWindowAPI) Update(ctx context.Context, projectID string, maintenanceWindow *MaintenanceWindow) error { - _, _, err := mw.maintenanceAPI.UpdateMaintenanceWindow(ctx, projectID, toAtlas(maintenanceWindow)).Execute() + _, err := mw.maintenanceAPI.UpdateMaintenanceWindow(ctx, projectID, toAtlas(maintenanceWindow)).Execute() if err != nil { return fmt.Errorf("failed to update maintenance window in Atlas: %w", err) } diff --git a/internal/translation/networkcontainer/conversion.go b/internal/translation/networkcontainer/conversion.go index 06bd755e88..7f14f2e344 100644 --- a/internal/translation/networkcontainer/conversion.go +++ b/internal/translation/networkcontainer/conversion.go @@ -15,7 +15,7 @@ package networkcontainer import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider" diff --git a/internal/translation/networkcontainer/networkcontainer.go b/internal/translation/networkcontainer/networkcontainer.go index cbe6365807..b21c86731c 100644 --- a/internal/translation/networkcontainer/networkcontainer.go +++ b/internal/translation/networkcontainer/networkcontainer.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "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/controller/atlas" @@ -52,7 +52,7 @@ type networkContainerService struct { } func NewNetworkContainerServiceFromClientSet(clientSet *atlas.ClientSet) NetworkContainerService { - return NewNetworkContainerService(clientSet.SdkClient20231115008.NetworkPeeringApi) + return NewNetworkContainerService(clientSet.SdkClient20250312002.NetworkPeeringApi) } func NewNetworkContainerService(peeringAPI admin.NetworkPeeringApi) NetworkContainerService { @@ -117,7 +117,7 @@ func (np *networkContainerService) Update(ctx context.Context, projectID, contai } func (np *networkContainerService) Delete(ctx context.Context, projectID, containerID string) error { - _, _, err := np.peeringAPI.DeletePeeringContainer(ctx, projectID, containerID).Execute() + _, err := np.peeringAPI.DeletePeeringContainer(ctx, projectID, containerID).Execute() if admin.IsErrorCode(err, "CLOUD_PROVIDER_CONTAINER_NOT_FOUND") { return errors.Join(err, ErrNotFound) } diff --git a/internal/translation/networkcontainer/networkcontainer_test.go b/internal/translation/networkcontainer/networkcontainer_test.go index f2c48daa89..433414f0b6 100644 --- a/internal/translation/networkcontainer/networkcontainer_test.go +++ b/internal/translation/networkcontainer/networkcontainer_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "github.com/stretchr/testify/assert" @@ -619,7 +619,7 @@ func testFindNetworkContainerAPI(apiContainers []admin.CloudProviderContainer, e func testAPIError(code string) error { err := &admin.GenericOpenAPIError{} err.SetModel(admin.ApiError{ - ErrorCode: pointer.MakePtr(code), + ErrorCode: code, }) return err } @@ -646,6 +646,6 @@ func testDeleteNetworkContainerAPI(err error) admin.NetworkPeeringApi { apiMock.EXPECT().DeletePeeringContainerExecute( mock.AnythingOfType("admin.DeletePeeringContainerApiRequest"), - ).Return(nil, nil, err) + ).Return(nil, err) return &apiMock } diff --git a/internal/translation/networkpeering/conversion.go b/internal/translation/networkpeering/conversion.go index c3e7e0f6cb..491b1a0574 100644 --- a/internal/translation/networkpeering/conversion.go +++ b/internal/translation/networkpeering/conversion.go @@ -19,7 +19,7 @@ import ( "fmt" "reflect" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider" diff --git a/internal/translation/networkpeering/conversion_test.go b/internal/translation/networkpeering/conversion_test.go index 4a26e1083d..26b509c507 100644 --- a/internal/translation/networkpeering/conversion_test.go +++ b/internal/translation/networkpeering/conversion_test.go @@ -21,7 +21,7 @@ import ( gofuzz "github.com/google/gofuzz" "github.com/stretchr/testify/assert" "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/api/v1/provider" ) diff --git a/internal/translation/networkpeering/networkpeering.go b/internal/translation/networkpeering/networkpeering.go index 64a52c612a..543fe42850 100644 --- a/internal/translation/networkpeering/networkpeering.go +++ b/internal/translation/networkpeering/networkpeering.go @@ -19,7 +19,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas" @@ -42,7 +42,7 @@ type networkPeeringService struct { } func NewNetworkPeeringServiceFromClientSet(clientSet *atlas.ClientSet) NetworkPeeringService { - return NewNetworkPeeringService(clientSet.SdkClient20231115008.NetworkPeeringApi) + return NewNetworkPeeringService(clientSet.SdkClient20250312002.NetworkPeeringApi) } func NewNetworkPeeringService(peeringAPI admin.NetworkPeeringApi) NetworkPeeringService { diff --git a/internal/translation/networkpeering/networkpeering_test.go b/internal/translation/networkpeering/networkpeering_test.go index 5b82f29a8e..ca83cd4a46 100644 --- a/internal/translation/networkpeering/networkpeering_test.go +++ b/internal/translation/networkpeering/networkpeering_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider" @@ -459,7 +459,7 @@ func testDeleteNetworkPeeringAPI(err error) admin.NetworkPeeringApi { func testAPIError(code string) error { err := &admin.GenericOpenAPIError{} err.SetModel(admin.ApiError{ - ErrorCode: pointer.MakePtr(code), + ErrorCode: code, }) return err } diff --git a/internal/translation/privateendpoint/conversion.go b/internal/translation/privateendpoint/conversion.go index d450daf3fe..8ce95a3830 100644 --- a/internal/translation/privateendpoint/conversion.go +++ b/internal/translation/privateendpoint/conversion.go @@ -17,7 +17,7 @@ package privateendpoint import ( "strings" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status" diff --git a/internal/translation/privateendpoint/privateendpoint.go b/internal/translation/privateendpoint/privateendpoint.go index 3737a4dc9c..c6dc4bb8c8 100644 --- a/internal/translation/privateendpoint/privateendpoint.go +++ b/internal/translation/privateendpoint/privateendpoint.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "golang.org/x/exp/slices" ) @@ -119,7 +119,7 @@ func (pe *PrivateEndpoint) CreatePrivateEndpointService(ctx context.Context, pro } func (pe *PrivateEndpoint) DeleteEndpointService(ctx context.Context, projectID, provider, ID string) error { - _, _, err := pe.api.DeletePrivateEndpointService(ctx, projectID, provider, ID).Execute() + _, err := pe.api.DeletePrivateEndpointService(ctx, projectID, provider, ID).Execute() if err != nil { return fmt.Errorf("failed to delete the private endpoint service: %w", err) } @@ -138,7 +138,7 @@ func (pe *PrivateEndpoint) CreatePrivateEndpointInterface(ctx context.Context, p } func (pe *PrivateEndpoint) DeleteEndpointInterface(ctx context.Context, projectID, provider, serviceID, ID string) error { - _, _, err := pe.api.DeletePrivateEndpoint(ctx, projectID, provider, ID, serviceID).Execute() + _, err := pe.api.DeletePrivateEndpoint(ctx, projectID, provider, ID, serviceID).Execute() if err != nil { return fmt.Errorf("failed to delete the private endpoint interface: %w", err) } diff --git a/internal/translation/privateendpoint/privateendpoint_test.go b/internal/translation/privateendpoint/privateendpoint_test.go index 17723a1405..2d06cc0609 100644 --- a/internal/translation/privateendpoint/privateendpoint_test.go +++ b/internal/translation/privateendpoint/privateendpoint_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" ) @@ -150,7 +150,7 @@ func TestListPrivateEndpoints(t *testing.T) { func TestGetPrivateEndpoint(t *testing.T) { notFoundErr := &admin.GenericOpenAPIError{} - notFoundErr.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("PRIVATE_ENDPOINT_SERVICE_NOT_FOUND")}) + notFoundErr.SetModel(admin.ApiError{ErrorCode: "PRIVATE_ENDPOINT_SERVICE_NOT_FOUND"}) tests := map[string]struct { provider string mockGetReturnFunc func() (*admin.EndpointService, *http.Response, error) @@ -395,18 +395,18 @@ func TestCreatePrivateEndpointService(t *testing.T) { func TestDeletePrivateEndpointService(t *testing.T) { tests := map[string]struct { - mockDeleteReturnFunc func() (map[string]interface{}, *http.Response, error) + mockDeleteReturnFunc func() (*http.Response, error) expectedErr error }{ "failed to delete the service": { - mockDeleteReturnFunc: func() (map[string]interface{}, *http.Response, error) { - return nil, &http.Response{}, errors.New("atlas failed to delete") + mockDeleteReturnFunc: func() (*http.Response, error) { + return &http.Response{}, errors.New("atlas failed to delete") }, expectedErr: fmt.Errorf("failed to delete the private endpoint service: %w", errors.New("atlas failed to delete")), }, "delete private endpoint service": { - mockDeleteReturnFunc: func() (map[string]interface{}, *http.Response, error) { - return nil, &http.Response{}, nil + mockDeleteReturnFunc: func() (*http.Response, error) { + return &http.Response{}, nil }, }, } @@ -594,18 +594,18 @@ func TestCreatePrivateEndpointInterface(t *testing.T) { func TestDeletePrivateEndpointInterface(t *testing.T) { tests := map[string]struct { - mockDeleteReturnFunc func() (map[string]interface{}, *http.Response, error) + mockDeleteReturnFunc func() (*http.Response, error) expectedErr error }{ "failed to delete the interface": { - mockDeleteReturnFunc: func() (map[string]interface{}, *http.Response, error) { - return nil, &http.Response{}, errors.New("atlas failed to delete") + mockDeleteReturnFunc: func() (*http.Response, error) { + return &http.Response{}, errors.New("atlas failed to delete") }, expectedErr: fmt.Errorf("failed to delete the private endpoint interface: %w", errors.New("atlas failed to delete")), }, "delete private endpoint service": { - mockDeleteReturnFunc: func() (map[string]interface{}, *http.Response, error) { - return nil, &http.Response{}, nil + mockDeleteReturnFunc: func() (*http.Response, error) { + return &http.Response{}, nil }, }, } diff --git a/internal/translation/project/conversion.go b/internal/translation/project/conversion.go index 870b09675a..a6a66d4486 100644 --- a/internal/translation/project/conversion.go +++ b/internal/translation/project/conversion.go @@ -15,7 +15,7 @@ package project import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/tag" diff --git a/internal/translation/project/project.go b/internal/translation/project/project.go index a51c976859..25c5bf95fb 100644 --- a/internal/translation/project/project.go +++ b/internal/translation/project/project.go @@ -18,7 +18,7 @@ import ( "context" "errors" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "sigs.k8s.io/controller-runtime/pkg/client" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -73,7 +73,7 @@ func (a *ProjectAPI) CreateProject(ctx context.Context, project *Project) error } func (a *ProjectAPI) DeleteProject(ctx context.Context, project *Project) error { - _, _, err := a.projectAPI.DeleteProject(ctx, project.ID).Execute() + _, err := a.projectAPI.DeleteProject(ctx, project.ID).Execute() err = translateError(err) if err != nil && !errors.Is(err, translation.ErrNotFound) { return err diff --git a/internal/translation/project/project_test.go b/internal/translation/project/project_test.go index 5c7b2a2243..e8b5ec1fd5 100644 --- a/internal/translation/project/project_test.go +++ b/internal/translation/project/project_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" @@ -32,7 +32,7 @@ import ( func TestGetProjectByName(t *testing.T) { notFoundErr := &admin.GenericOpenAPIError{} - notFoundErr.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("NOT_IN_GROUP")}) + notFoundErr.SetModel(admin.ApiError{ErrorCode: "NOT_IN_GROUP"}) tests := map[string]struct { api func() admin.ProjectsApi name string @@ -212,7 +212,7 @@ func TestCreateProject(t *testing.T) { func TestDeleteProject(t *testing.T) { notFoundErr := &admin.GenericOpenAPIError{} - notFoundErr.SetModel(admin.ApiError{ErrorCode: pointer.MakePtr("GROUP_NOT_FOUND")}) + notFoundErr.SetModel(admin.ApiError{ErrorCode: "GROUP_NOT_FOUND"}) tests := map[string]struct { api func() admin.ProjectsApi project *Project @@ -224,7 +224,7 @@ func TestDeleteProject(t *testing.T) { sdk.EXPECT().DeleteProject(context.Background(), "my-project-id"). Return(admin.DeleteProjectApiRequest{ApiService: sdk}) sdk.EXPECT().DeleteProjectExecute(mock.AnythingOfType("admin.DeleteProjectApiRequest")). - Return(nil, &http.Response{}, errors.New("fail to delete project")) + Return(&http.Response{}, errors.New("fail to delete project")) return sdk }, @@ -239,7 +239,7 @@ func TestDeleteProject(t *testing.T) { sdk.EXPECT().DeleteProject(context.Background(), "my-project-id"). Return(admin.DeleteProjectApiRequest{ApiService: sdk}) sdk.EXPECT().DeleteProjectExecute(mock.AnythingOfType("admin.DeleteProjectApiRequest")). - Return(nil, &http.Response{}, notFoundErr) + Return(&http.Response{}, notFoundErr) return sdk }, @@ -253,7 +253,7 @@ func TestDeleteProject(t *testing.T) { sdk.EXPECT().DeleteProject(context.Background(), "my-project-id"). Return(admin.DeleteProjectApiRequest{ApiService: sdk}) sdk.EXPECT().DeleteProjectExecute(mock.AnythingOfType("admin.DeleteProjectApiRequest")). - Return(nil, &http.Response{}, nil) + Return(&http.Response{}, nil) return sdk }, diff --git a/internal/translation/searchindex/searchIndexsvc.go b/internal/translation/searchindex/searchIndexsvc.go index 6e245c9a66..4bb84d7d10 100644 --- a/internal/translation/searchindex/searchIndexsvc.go +++ b/internal/translation/searchindex/searchIndexsvc.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) var ( @@ -83,7 +83,7 @@ func (si *SearchIndexes) CreateIndex(ctx context.Context, projectID, clusterName } func (si *SearchIndexes) DeleteIndex(ctx context.Context, projectID, clusterName, indexID string) error { - _, resp, err := si.searchAPI.DeleteAtlasSearchIndex(ctx, projectID, clusterName, indexID).Execute() + resp, err := si.searchAPI.DeleteAtlasSearchIndex(ctx, projectID, clusterName, indexID).Execute() if resp.StatusCode != http.StatusAccepted && resp.StatusCode != http.StatusNotFound || err != nil { return fmt.Errorf("error deleting index, status code %d: %w", resp.StatusCode, err) } diff --git a/internal/translation/searchindex/searchindex.go b/internal/translation/searchindex/searchindex.go index fbabbbf2e7..c15411a058 100644 --- a/internal/translation/searchindex/searchindex.go +++ b/internal/translation/searchindex/searchindex.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -398,11 +398,11 @@ func jsonToArrayOfAny(in *apiextensionsv1.JSON) (*[]any, error) { return &result, nil } -func jsonToMap(in *apiextensionsv1.JSON) (map[string]interface{}, error) { +func jsonToMap(in *apiextensionsv1.JSON) (map[string]any, error) { if in == nil { return nil, nil } - result := map[string]interface{}{} + result := map[string]any{} if err := json.Unmarshal(in.Raw, &result); err != nil { return result, err } @@ -502,7 +502,7 @@ func mappingsToAtlas(in *akov2.Mappings) (*admin.SearchMappings, error) { } return &admin.SearchMappings{ Dynamic: in.Dynamic, - Fields: fields, + Fields: &fields, }, nil } diff --git a/internal/translation/searchindex/searchindex_test.go b/internal/translation/searchindex/searchindex_test.go index e880e9c957..9dd949bfc0 100644 --- a/internal/translation/searchindex/searchindex_test.go +++ b/internal/translation/searchindex/searchindex_test.go @@ -21,7 +21,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" - "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" @@ -225,7 +225,7 @@ func Test_NewSearchIndexFromAtlas(t *testing.T) { }), Mappings: &admin.SearchMappings{ Dynamic: pointer.MakePtr(true), - Fields: map[string]interface{}{"field": "value"}, + Fields: &map[string]interface{}{"field": "value"}, }, SearchAnalyzer: pointer.MakePtr("search-analyzer"), Synonyms: &([]admin.SearchSynonymMappingDefinition{ @@ -488,7 +488,7 @@ func TestSearchIndex_ToAtlas(t *testing.T) { }), Mappings: &admin.SearchMappings{ Dynamic: pointer.MakePtr(true), - Fields: map[string]interface{}{"field": "value"}, + Fields: &map[string]interface{}{"field": "value"}, }, SearchAnalyzer: pointer.MakePtr("search-analyzer"), Synonyms: &([]admin.SearchSynonymMappingDefinition{ diff --git a/internal/translation/tag/tag.go b/internal/translation/tag/tag.go index c51c0c26f6..76e0550efc 100644 --- a/internal/translation/tag/tag.go +++ b/internal/translation/tag/tag.go @@ -15,8 +15,7 @@ package tag import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" ) @@ -56,16 +55,16 @@ func ToAtlas(tags []*akov2.TagSpec) *[]admin.ResourceTag { return &rTags } -func FlexToAtlas(tags []*akov2.TagSpec) *[]adminv20241113001.ResourceTag { +func FlexToAtlas(tags []*akov2.TagSpec) *[]admin.ResourceTag { if tags == nil { return nil } - rTags := make([]adminv20241113001.ResourceTag, 0, len(tags)) + rTags := make([]admin.ResourceTag, 0, len(tags)) for _, tag := range tags { rTags = append( rTags, - *adminv20241113001.NewResourceTag(tag.Key, tag.Value), + *admin.NewResourceTag(tag.Key, tag.Value), ) } diff --git a/internal/translation/teams/conversion.go b/internal/translation/teams/conversion.go index a92feae0d6..849f90a7c7 100644 --- a/internal/translation/teams/conversion.go +++ b/internal/translation/teams/conversion.go @@ -15,7 +15,7 @@ package teams import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" @@ -85,7 +85,7 @@ func TeamToAtlas(team *Team) *admin.Team { return &admin.Team{ Id: pointer.MakePtrOrNil(team.TeamID), Name: team.TeamName, - Usernames: &team.Usernames, + Usernames: team.Usernames, } } @@ -125,7 +125,7 @@ func TeamRolesToAtlas(atlasTeams []AssignedTeam) []admin.TeamRole { return teams } -func UsersFromAtlas(users *admin.PaginatedApiAppUser) []TeamUser { +func UsersFromAtlas(users *admin.PaginatedOrgUser) []TeamUser { teamUsers := make([]TeamUser, 0, len(users.GetResults())) for _, user := range users.GetResults() { teamUsers = append(teamUsers, TeamUser{ diff --git a/internal/translation/teams/teams.go b/internal/translation/teams/teams.go index a0ebe6fcc7..8aaf654cf2 100644 --- a/internal/translation/teams/teams.go +++ b/internal/translation/teams/teams.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/paging" @@ -139,7 +139,7 @@ func (tm *TeamsAPI) UpdateRoles(ctx context.Context, at *AssignedTeam, projectID } func (tm *TeamsAPI) GetTeamUsers(ctx context.Context, orgID, teamID string) ([]TeamUser, error) { - atlasUsers, _, err := tm.teamsAPI.ListTeamUsers(ctx, orgID, teamID).Execute() + atlasUsers, _, err := tm.teamUsersAPI.ListTeamUsers(ctx, orgID, teamID).Execute() if err != nil { return nil, fmt.Errorf("failed to get team users from Atlas: %w", err) } diff --git a/internal/translation/teams/teams_test.go b/internal/translation/teams/teams_test.go index 960a727fda..589b9679b2 100644 --- a/internal/translation/teams/teams_test.go +++ b/internal/translation/teams/teams_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - "go.mongodb.org/atlas-sdk/v20231115008/mockadmin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" + "go.mongodb.org/atlas-sdk/v20250312002/mockadmin" akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1" ) @@ -342,7 +342,7 @@ func TestTeamsAPI_Create(t *testing.T) { Return(&admin.Team{ Id: &testTeamID1, Name: testTeamName, - Usernames: &[]string{"user@name.com"}, + Usernames: []string{"user@name.com"}, }, &http.Response{}, nil) }, expectedErr: nil, @@ -383,21 +383,21 @@ func TestTeamsAPI_GetTeamUsers(t *testing.T) { tests := []struct { title string - mock func(mockTeamAPI *mockadmin.TeamsApi) + mock func(mockUsersAPI *mockadmin.MongoDBCloudUsersApi) expectedTeams []TeamUser expectedErr error }{ { title: "Should return team when team is present on Atlas", - mock: func(mockTeamAPI *mockadmin.TeamsApi) { - mockTeamAPI.EXPECT().ListTeamUsers(ctx, mock.Anything, mock.Anything). - Return(admin.ListTeamUsersApiRequest{ApiService: mockTeamAPI}) - mockTeamAPI.EXPECT().ListTeamUsersExecute(mock.Anything). - Return(&admin.PaginatedApiAppUser{ - Results: &[]admin.CloudAppUser{ + mock: func(mockUsersAPI *mockadmin.MongoDBCloudUsersApi) { + mockUsersAPI.EXPECT().ListTeamUsers(ctx, mock.Anything, mock.Anything). + Return(admin.ListTeamUsersApiRequest{ApiService: mockUsersAPI}) + mockUsersAPI.EXPECT().ListTeamUsersExecute(mock.Anything). + Return(&admin.PaginatedOrgUser{ + Results: &[]admin.OrgUserResponse{ { Username: "user1", - Id: &testUserID, + Id: testUserID, }, }, }, &http.Response{}, nil) @@ -412,11 +412,11 @@ func TestTeamsAPI_GetTeamUsers(t *testing.T) { }, { title: "Should return error when request fails", - mock: func(mockTeamAPI *mockadmin.TeamsApi) { - mockTeamAPI.EXPECT().ListTeamUsers(ctx, mock.Anything, mock.Anything). - Return(admin.ListTeamUsersApiRequest{ApiService: mockTeamAPI}) - mockTeamAPI.EXPECT().ListTeamUsersExecute(mock.Anything). - Return(&admin.PaginatedApiAppUser{}, &http.Response{}, admin.GenericOpenAPIError{}) + mock: func(mockUsersAPI *mockadmin.MongoDBCloudUsersApi) { + mockUsersAPI.EXPECT().ListTeamUsers(ctx, mock.Anything, mock.Anything). + Return(admin.ListTeamUsersApiRequest{ApiService: mockUsersAPI}) + mockUsersAPI.EXPECT().ListTeamUsersExecute(mock.Anything). + Return(&admin.PaginatedOrgUser{}, &http.Response{}, admin.GenericOpenAPIError{}) }, expectedErr: fmt.Errorf("failed to get team users from Atlas: %w", admin.GenericOpenAPIError{}), expectedTeams: nil, @@ -425,10 +425,10 @@ func TestTeamsAPI_GetTeamUsers(t *testing.T) { for _, tt := range tests { t.Run(tt.title, func(t *testing.T) { - mockTeamAPI := mockadmin.NewTeamsApi(t) - tt.mock(mockTeamAPI) + mockUsersAPI := mockadmin.NewMongoDBCloudUsersApi(t) + tt.mock(mockUsersAPI) ts := &TeamsAPI{ - teamsAPI: mockTeamAPI, + teamUsersAPI: mockUsersAPI, } teams, err := ts.GetTeamUsers(ctx, mock.Anything, mock.Anything) require.Equal(t, tt.expectedErr, err) diff --git a/test/e2e/alert_config_test.go b/test/e2e/alert_config_test.go index 4e60581868..26d5aa6b55 100644 --- a/test/e2e/alert_config_test.go +++ b/test/e2e/alert_config_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "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" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/atlas_gov_test.go b/test/e2e/atlas_gov_test.go index c21fde333e..e5a9770519 100644 --- a/test/e2e/atlas_gov_test.go +++ b/test/e2e/atlas_gov_test.go @@ -197,7 +197,7 @@ var _ = Describe("Atlas for Government", Label("atlas-gov"), func() { By("Configuring a Team", func() { Expect(testData.K8SClient.Get(ctx, client.ObjectKeyFromObject(testData.Project), testData.Project)).To(Succeed()) - users, _, err := atlasClient.Client.ProjectsApi. + users, _, err := atlasClient.Client.MongoDBCloudUsersApi. ListProjectUsers(ctx, testData.Project.ID()). Execute() Expect(err).ToNot(HaveOccurred()) diff --git a/test/e2e/datafederation_pe_test.go b/test/e2e/datafederation_pe_test.go index a5f4b33165..8f576f5fc5 100644 --- a/test/e2e/datafederation_pe_test.go +++ b/test/e2e/datafederation_pe_test.go @@ -221,7 +221,7 @@ var _ = Describe("DataFederation Private Endpoint", Label("datafederation"), fun // for some reason, requesting deletion successfully just once doesn't work // TODO: revisit and cleanup once CLOUDP-280905 is fixed Eventually(func(g Gomega) { - _, resp, err := atlasClient.Client.DataFederationApi. + resp, err := atlasClient.Client.DataFederationApi. DeleteDataFederationPrivateEndpoint(testData.Context, testData.Project.ID(), secondPE.ID). Execute() g.Expect(err).To(BeNil(), fmt.Sprintf("deletion of private endpoint failed with error %v", err)) diff --git a/test/e2e/dry_run_test.go b/test/e2e/dry_run_test.go index 1a2fbc1e3f..3124337611 100644 --- a/test/e2e/dry_run_test.go +++ b/test/e2e/dry_run_test.go @@ -23,7 +23,7 @@ import ( "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "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" "k8s.io/apimachinery/pkg/fields" @@ -66,7 +66,7 @@ var _ = When("running in dry run mode", Label("dry-run"), Ordered, func() { Expect(err).NotTo(HaveOccurred()) DeferCleanup(func(ctx context.Context) { - _, _, err := atlasClient.Client.ProjectsApi.DeleteProject(ctx, group.GetId()).Execute() + _, err := atlasClient.Client.ProjectsApi.DeleteProject(ctx, group.GetId()).Execute() Expect(err).NotTo(HaveOccurred()) }) diff --git a/test/e2e/encryption_at_rest_test.go b/test/e2e/encryption_at_rest_test.go index 81f9aa758b..df87fbe975 100644 --- a/test/e2e/encryption_at_rest_test.go +++ b/test/e2e/encryption_at_rest_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "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" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/flex_deployment_test.go b/test/e2e/flex_deployment_test.go index 7bbd727b7d..a373c9be18 100644 --- a/test/e2e/flex_deployment_test.go +++ b/test/e2e/flex_deployment_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/free_tier_test.go b/test/e2e/free_tier_test.go index 2e7f9a3230..2e08143f7c 100644 --- a/test/e2e/free_tier_test.go +++ b/test/e2e/free_tier_test.go @@ -17,7 +17,7 @@ package e2e_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e/actions" @@ -77,24 +77,23 @@ func freeTierDeploymentFlow(userData *model.TestDataProvider) { aClient := atlas.GetClientOrFail() Expect(userData.InitialDeployments).Should(HaveLen(1)) name := userData.InitialDeployments[0].GetDeploymentName() - admin.NewAdvancedClusterDescriptionWithDefaults() _, _, err := aClient.Client.ClustersApi. CreateCluster( userData.Context, userData.Project.ID(), - &admin.AdvancedClusterDescription{ + &admin.ClusterDescription20240805{ Name: &name, ClusterType: pointer.MakePtr("REPLICASET"), - ReplicationSpecs: &[]admin.ReplicationSpec{ + ReplicationSpecs: &[]admin.ReplicationSpec20240805{ { ZoneName: pointer.MakePtr("Zone 1"), - RegionConfigs: &[]admin.CloudRegionConfig{ + RegionConfigs: &[]admin.CloudRegionConfig20240805{ { ProviderName: pointer.MakePtr("TENANT"), BackingProviderName: pointer.MakePtr("AWS"), Priority: pointer.MakePtr(7), RegionName: pointer.MakePtr("US_EAST_1"), - ElectableSpecs: &admin.HardwareSpec{ + ElectableSpecs: &admin.HardwareSpec20240805{ InstanceSize: pointer.MakePtr(data.InstanceSizeM0), NodeCount: pointer.MakePtr(3), }, diff --git a/test/e2e/teams_test.go b/test/e2e/teams_test.go index 7cb45a8b2e..22fc967d53 100644 --- a/test/e2e/teams_test.go +++ b/test/e2e/teams_test.go @@ -147,7 +147,7 @@ func projectTeamsFlow(userData *model.TestDataProvider, teams []akov2.Team) { for _, AssociatedTeam := range teams { team := &akov2.AtlasTeam{} Expect(userData.K8SClient.Get(userData.Context, types.NamespacedName{Name: AssociatedTeam.TeamRef.Name, Namespace: userData.Resources.Namespace}, team)).Should(Succeed()) - _, _, err := aClient.Client.TeamsApi.DeleteTeam(userData.Context, aClient.OrgID, team.Status.ID).Execute() + _, err := aClient.Client.TeamsApi.DeleteTeam(userData.Context, aClient.OrgID, team.Status.ID).Execute() Expect(err).ToNot(HaveOccurred()) Expect(userData.K8SClient.Delete(userData.Context, team)).To(Succeed()) } diff --git a/test/helper/access/ipaccesslist_matcher.go b/test/helper/access/ipaccesslist_matcher.go index 139c2adc84..964fa7e626 100644 --- a/test/helper/access/ipaccesslist_matcher.go +++ b/test/helper/access/ipaccesslist_matcher.go @@ -17,7 +17,7 @@ package access import ( "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/project" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/timeutil" diff --git a/test/helper/atlas/waiters.go b/test/helper/atlas/waiters.go index 402bef3bed..61084e9131 100644 --- a/test/helper/atlas/waiters.go +++ b/test/helper/atlas/waiters.go @@ -18,12 +18,12 @@ import ( "context" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) // WaitForAtlasDeploymentStateToNotBeReached periodically checks the given atlas deployment for a given condition. The function // returns true after the given context timeout is exceeded. -func WaitForAtlasDeploymentStateToNotBeReached(ctx context.Context, atlasClient *admin.APIClient, projectName, deploymentName string, fns ...func(description *admin.AdvancedClusterDescription) bool) func() bool { +func WaitForAtlasDeploymentStateToNotBeReached(ctx context.Context, atlasClient *admin.APIClient, projectName, deploymentName string, fns ...func(description *admin.ClusterDescription20240805) bool) func() bool { return func() bool { select { case <-ctx.Done(): diff --git a/test/helper/e2e/actions/steps.go b/test/helper/e2e/actions/steps.go index d8c380fb32..46d92d0242 100644 --- a/test/helper/e2e/actions/steps.go +++ b/test/helper/e2e/actions/steps.go @@ -23,8 +23,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" @@ -187,7 +186,7 @@ func CheckUserExistInAtlas(data *model.TestDataProvider) func() bool { } } -func CompareAdvancedDeploymentsSpec(requested model.DeploymentSpec, created admin.AdvancedClusterDescription) { +func CompareAdvancedDeploymentsSpec(requested model.DeploymentSpec, created admin.ClusterDescription20240805) { advancedSpec := requested.DeploymentSpec Expect(created.GetMongoDBVersion()).ToNot(BeEmpty()) @@ -209,7 +208,7 @@ func CompareAdvancedDeploymentsSpec(requested model.DeploymentSpec, created admi } } -func CompareFlexSpec(requested model.DeploymentSpec, created adminv20241113001.FlexClusterDescription20241113) { +func CompareFlexSpec(requested model.DeploymentSpec, created admin.FlexClusterDescription20241113) { flexSpec := requested.FlexSpec Expect(created.GetMongoDBVersion()).ToNot(BeEmpty()) Expect(created.ConnectionStrings.GetStandardSrv()).ToNot(BeEmpty()) diff --git a/test/helper/e2e/api/atlas/atlas.go b/test/helper/e2e/api/atlas/atlas.go index 94bb561b5a..ae26b17ba5 100644 --- a/test/helper/e2e/api/atlas/atlas.go +++ b/test/helper/e2e/api/atlas/atlas.go @@ -17,15 +17,15 @@ package atlas import ( "context" "fmt" + "net/http" "os" "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/pointer" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/translation/paging" "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper/e2e/debug" ) @@ -36,7 +36,7 @@ type Atlas struct { Public string Private string Client *admin.APIClient - ClientV20241113001 *adminv20241113001.APIClient + ClientV20241113001 *admin.APIClient } func AClient() (Atlas, error) { @@ -52,9 +52,9 @@ func AClient() (Atlas, error) { } a.Client = c - clientV20241113001, err := adminv20241113001.NewClient( - adminv20241113001.UseBaseURL(os.Getenv("MCLI_OPS_MANAGER_URL")), - adminv20241113001.UseDigestAuth(a.Public, a.Private), + clientV20241113001, err := admin.NewClient( + admin.UseBaseURL(os.Getenv("MCLI_OPS_MANAGER_URL")), + admin.UseDigestAuth(a.Public, a.Private), ) if err != nil { return Atlas{}, err @@ -116,7 +116,7 @@ func (a *Atlas) GetDeploymentNames(projectID string) []string { return names } -func (a *Atlas) GetDeployment(projectId, deploymentName string) (*admin.AdvancedClusterDescription, error) { +func (a *Atlas) GetDeployment(projectId, deploymentName string) (*admin.ClusterDescription20240805, error) { advancedDeployment, _, err := a.Client.ClustersApi. GetCluster(context.Background(), projectId, deploymentName). Execute() @@ -126,7 +126,7 @@ func (a *Atlas) GetDeployment(projectId, deploymentName string) (*admin.Advanced return advancedDeployment, err } -func (a *Atlas) GetFlexInstance(projectId, deploymentName string) (*adminv20241113001.FlexClusterDescription20241113, error) { +func (a *Atlas) GetFlexInstance(projectId, deploymentName string) (*admin.FlexClusterDescription20241113, error) { flexInstance, _, err := a.ClientV20241113001.FlexClustersApi. GetFlexCluster(context.Background(), projectId, deploymentName). Execute() @@ -173,7 +173,7 @@ func (a *Atlas) GetUserByName(database, projectID, username string) (*admin.Clou } func (a *Atlas) DeleteGlobalKey(key admin.ApiKeyUserDetails) error { - _, _, err := a.Client.ProgrammaticAPIKeysApi.DeleteApiKey(context.Background(), a.OrgID, key.GetId()).Execute() + _, err := a.Client.ProgrammaticAPIKeysApi.DeleteApiKey(context.Background(), a.OrgID, key.GetId()).Execute() return err } @@ -186,20 +186,21 @@ func (a *Atlas) GetEncryptionAtRest(projectID string) (*admin.EncryptionAtRest, return encryptionAtRest, err } -func (a *Atlas) GetOrgUsers() ([]admin.CloudAppUser, error) { - users, _, err := a.Client.OrganizationsApi.ListOrganizationUsers(context.Background(), a.OrgID).Execute() - - return *users.Results, err +func (a *Atlas) GetOrgUsers() ([]admin.OrgUserResponse, error) { + users, err := paging.ListAll(context.Background(), func(ctx context.Context, pageNum int) (paging.Response[admin.OrgUserResponse], *http.Response, error) { + return a.Client.MongoDBCloudUsersApi.ListOrganizationUsers(ctx, a.OrgID).PageNum(pageNum).Execute() + }) + return users, err } -func (a *Atlas) CreateExportBucket(projectID, bucketName, roleID string) (*admin.DiskBackupSnapshotAWSExportBucket, error) { +func (a *Atlas) CreateExportBucket(projectID, bucketName, roleID string) (*admin.DiskBackupSnapshotExportBucketResponse, error) { r, _, err := a.Client.CloudBackupsApi. CreateExportBucket( context.Background(), projectID, - &admin.DiskBackupSnapshotAWSExportBucket{ + &admin.DiskBackupSnapshotExportBucketRequest{ BucketName: &bucketName, - CloudProvider: pointer.MakePtr("AWS"), + CloudProvider: "AWS", IamRoleId: &roleID, }, ).Execute() diff --git a/test/helper/e2e/fixtest/remove_duplicates.go b/test/helper/e2e/fixtest/remove_duplicates.go index a6055ffb30..3915d6d33c 100644 --- a/test/helper/e2e/fixtest/remove_duplicates.go +++ b/test/helper/e2e/fixtest/remove_duplicates.go @@ -19,7 +19,7 @@ import ( "io" "sort" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -78,7 +78,7 @@ func selectProject(projects []admin.Group) (admin.Group, []admin.Group) { func removeProjects(client *admin.APIClient, projects []admin.Group) error { for _, project := range projects { - _, _, err := client.ProjectsApi.DeleteProject(context.Background(), project.GetId()).Execute() + _, err := client.ProjectsApi.DeleteProject(context.Background(), project.GetId()).Execute() if err != nil { return err } diff --git a/test/helper/e2e/model/atlas_key_type.go b/test/helper/e2e/model/atlas_key_type.go index 1550531493..c61e32beb0 100644 --- a/test/helper/e2e/model/atlas_key_type.go +++ b/test/helper/e2e/model/atlas_key_type.go @@ -15,7 +15,7 @@ package model import ( - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) type AtlasRoles = string diff --git a/test/helper/maintenance/maintenancewindow_matcher.go b/test/helper/maintenance/maintenancewindow_matcher.go index 2c416a25b8..2aeaf73e3f 100644 --- a/test/helper/maintenance/maintenancewindow_matcher.go +++ b/test/helper/maintenance/maintenancewindow_matcher.go @@ -20,7 +20,7 @@ import ( "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/project" ) diff --git a/test/int/clusterwide/integration_suite_test.go b/test/int/clusterwide/integration_suite_test.go index d871e4be57..d607e3359f 100644 --- a/test/int/clusterwide/integration_suite_test.go +++ b/test/int/clusterwide/integration_suite_test.go @@ -25,7 +25,7 @@ import ( "github.com/go-logr/zapr" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" diff --git a/test/int/databaseuser_protected_test.go b/test/int/databaseuser_protected_test.go index eb0b1e7a77..29846ddc2b 100644 --- a/test/int/databaseuser_protected_test.go +++ b/test/int/databaseuser_protected_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -319,7 +319,7 @@ var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "prote Expect(k8sClient.Delete(context.Background(), testDeployment)).To(Succeed()) Eventually(func() bool { - _, r, err := atlasClientv20241113001.FlexClustersApi. + _, r, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), testProject.ID(), deploymentName). Execute() if err != nil { @@ -336,7 +336,7 @@ var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "prote projectID := testProject.ID() Expect(k8sClient.Delete(context.Background(), testProject)).To(Succeed()) - _, _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), projectID).Execute() + _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), projectID).Execute() Expect(err).To(BeNil()) Eventually(func() bool { diff --git a/test/int/databaseuser_unprotected_test.go b/test/int/databaseuser_unprotected_test.go index cf2959cc5d..552156037f 100644 --- a/test/int/databaseuser_unprotected_test.go +++ b/test/int/databaseuser_unprotected_test.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -205,7 +205,7 @@ var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "prote Eventually(checkAtlasDatabaseUserRemoved(testProject.ID(), *testDBUser2)). WithTimeout(databaseUserTimeout).WithPolling(PollingInterval).Should(BeFalse()) - _, _, err := atlasClient.DatabaseUsersApi. + _, err := atlasClient.DatabaseUsersApi. DeleteDatabaseUser(context.Background(), testProject.ID(), "admin", dbUserName2). Execute() Expect(err).To(BeNil()) @@ -357,7 +357,7 @@ var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "prote Expect(k8sClient.Delete(context.Background(), secondDeployment)).To(Succeed()) Eventually(func() bool { - _, r, err := atlasClientv20241113001.FlexClustersApi. + _, r, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), testProject.ID(), deploymentName). Execute() if err != nil { @@ -588,7 +588,7 @@ var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "prote Expect(k8sClient.Delete(context.Background(), secondTestDeployment)).To(Succeed()) Eventually(func() bool { - _, r, err := atlasClientv20241113001.FlexClustersApi. + _, r, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), testProject.ID(), deploymentName). Execute() if err != nil { @@ -721,7 +721,7 @@ var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "prote Expect(k8sClient.Delete(context.Background(), testDeployment)).To(Succeed()) Eventually(func() bool { - _, r, err := atlasClientv20241113001.FlexClustersApi. + _, r, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), testProject.ID(), deploymentName). Execute() if err != nil { @@ -782,7 +782,7 @@ func validateSecret(k8sClient client.Client, project akov2.AtlasProject, deploym password, err := user.ReadPassword(context.Background(), k8sClient) Expect(err).NotTo(HaveOccurred()) - c, _, err := atlasClientv20241113001.FlexClustersApi. + c, _, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), project.ID(), deployment.GetDeploymentName()). Execute() Expect(err).NotTo(HaveOccurred()) @@ -834,7 +834,7 @@ func buildConnectionURL(connURL, userName, password string) string { func mongoClient(projectID string, deployment akov2.AtlasDeployment, user akov2.AtlasDatabaseUser) (*mongo.Client, error) { ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - c, _, err := atlasClientv20241113001.FlexClustersApi. + c, _, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), projectID, deployment.GetDeploymentName()). Execute() Expect(err).NotTo(HaveOccurred()) diff --git a/test/int/datafederation_protect_test.go b/test/int/datafederation_protect_test.go index 2a655edacc..458930b1ae 100644 --- a/test/int/datafederation_protect_test.go +++ b/test/int/datafederation_protect_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -85,7 +85,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasDataFederation", "protection if !manualDeletion { By("Removing Atlas DataFederation "+testDataFederationName, func() { - _, _, err := atlasClient.DataFederationApi. + _, err := atlasClient.DataFederationApi. DeleteFederatedDatabase(context.Background(), testProject.ID(), testDataFederation.Spec.Name). Execute() Expect(err).To(BeNil()) @@ -93,7 +93,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasDataFederation", "protection } By("Removing Atlas Project "+testProject.Status.ID, func() { - _, _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), testProject.ID()).Execute() + _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), testProject.ID()).Execute() Expect(err).To(BeNil()) }) diff --git a/test/int/datafederation_test.go b/test/int/datafederation_test.go index 203ebcc0ba..9e54dae3ed 100644 --- a/test/int/datafederation_test.go +++ b/test/int/datafederation_test.go @@ -183,7 +183,7 @@ var _ = Describe("AtlasDataFederation", Label("AtlasDataFederation"), func() { }) func deleteAtlasDataFederation(projectID, dataFederationName string) error { - _, _, err := atlasClient.DataFederationApi. + _, err := atlasClient.DataFederationApi. DeleteFederatedDatabase(context.Background(), projectID, dataFederationName). Execute() diff --git a/test/int/deployment_test.go b/test/int/deployment_test.go index fc7aa83cb5..277d98f5d5 100644 --- a/test/int/deployment_test.go +++ b/test/int/deployment_test.go @@ -26,7 +26,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -79,7 +79,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- BeforeEach(func() { prepareControllers(false) - deploymentService = deployment.NewAtlasDeployments(atlasClient.ClustersApi, atlasClient.ServerlessInstancesApi, atlasClient.GlobalClustersApi, atlasClientv20241113001.FlexClustersApi, false) + deploymentService = deployment.NewAtlasDeployments(atlasClient.ClustersApi, atlasClient.ServerlessInstancesApi, atlasClient.GlobalClustersApi, atlasClient.FlexClustersApi, false) createdDeployment = &akov2.AtlasDeployment{} manualDeletion = false @@ -139,7 +139,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- }) } - checkAtlasState := func(additionalChecks ...func(c *admin.AdvancedClusterDescription)) { + checkAtlasState := func(additionalChecks ...func(c *admin.ClusterDescription20240805)) { By("Verifying Deployment state in Atlas", func() { atlasDeploymentAsAtlas, _, err := atlasClient.ClustersApi. GetCluster(context.Background(), createdProject.Status.ID, createdDeployment.GetDeploymentName()). @@ -318,7 +318,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- WithInstanceSize("M30") // Atlas will add some defaults in case the Atlas Operator doesn't set them - replicationSpecsCheck := func(deployment *admin.AdvancedClusterDescription) { + replicationSpecsCheck := func(deployment *admin.ClusterDescription20240805) { Expect(deployment.GetReplicationSpecs()).To(HaveLen(1)) Expect(deployment.GetReplicationSpecs()[0].GetId()).NotTo(BeEmpty()) Expect(deployment.GetReplicationSpecs()[0].GetZoneName()).To(Equal("Zone 1")) @@ -331,7 +331,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- doDeploymentStatusChecks() - singleNumShard := func(deployment *admin.AdvancedClusterDescription) { + singleNumShard := func(deployment *admin.ClusterDescription20240805) { Expect(deployment.GetReplicationSpecs()[0].GetNumShards()).To(Equal(1)) } checkAtlasState(replicationSpecsCheck, singleNumShard) @@ -343,7 +343,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- }) doDeploymentStatusChecks() - singleNumShard := func(deployment *admin.AdvancedClusterDescription) { + singleNumShard := func(deployment *admin.ClusterDescription20240805) { Expect(deployment.GetReplicationSpecs()[0].GetNumShards()).To(Equal(1)) } // ReplicationSpecs has the same defaults but the number of shards has changed @@ -357,7 +357,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- }) doDeploymentStatusChecks() - twoNumShard := func(deployment *admin.AdvancedClusterDescription) { + twoNumShard := func(deployment *admin.ClusterDescription20240805) { Expect(deployment.GetReplicationSpecs()[0].GetNumShards()).To(Equal(numShards)) } // ReplicationSpecs has the same defaults but the number of shards has changed @@ -526,7 +526,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- createdDeployment.Spec.DeploymentSpec.DiskSizeGB = pointer.MakePtr(10) - replicationSpecsCheckFunc := func(c *admin.AdvancedClusterDescription) { + replicationSpecsCheckFunc := func(c *admin.ClusterDescription20240805) { mergedDeployment, _, err := mergedAdvancedDeployment(*c, *createdDeployment.Spec.DeploymentSpec) Expect(err).ToNot(HaveOccurred()) @@ -539,7 +539,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- Expect(c.GetReplicationSpecs()[0].GetNumShards()).To(Equal(expectedReplicationSpecs[0].NumShards)) Expect(c.GetReplicationSpecs()[0].GetZoneName()).To(Equal(expectedReplicationSpecs[0].ZoneName)) - less := func(a, b *admin.CloudRegionConfig) bool { return a.GetRegionName() < b.GetRegionName() } + less := func(a, b *admin.CloudRegionConfig20240805) bool { return a.GetRegionName() < b.GetRegionName() } Expect(cmp.Diff(c.GetReplicationSpecs()[0].RegionConfigs, expectedReplicationSpecs[0].RegionConfigs, cmpopts.SortSlices(less))) } @@ -634,7 +634,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- }).WithTimeout(30 * time.Minute).WithPolling(interval).Should(BeTrue()) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { deployment, err := createdDeployment.Spec.Deployment() Expect(err).NotTo(HaveOccurred()) @@ -691,7 +691,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- }) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { // Expect(*c.DiskSizeGB).To(BeEquivalentTo(prevDiskSize)) // todo: find out if this should still work for advanced clusters // check whether https://github.com/mongodb/go-client-mongodb-atlas/issues/140 is fixed @@ -725,7 +725,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- deployment.Spec.DeploymentSpec.Tags = []*akov2.TagSpec{{Key: "test-1", Value: "value-1"}, {Key: "test-2", Value: "value-2"}} }) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { for i, tag := range createdDeployment.Spec.DeploymentSpec.Tags { Expect(c.GetTags()[i].GetKey() == tag.Key).To(BeTrue()) Expect(c.GetTags()[i].GetValue() == tag.Value).To(BeTrue()) @@ -753,7 +753,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- deployment.Spec.DeploymentSpec.BackupEnabled = pointer.MakePtr(true) }) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { Expect(c.BackupEnabled).To(Equal(createdDeployment.Spec.DeploymentSpec.BackupEnabled)) }) }) @@ -763,7 +763,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- deployment.Spec.DeploymentSpec.DiskSizeGB = pointer.MakePtr(15) }) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { Expect(*c.DiskSizeGB).To(BeEquivalentTo(*createdDeployment.Spec.DeploymentSpec.DiskSizeGB)) // check whether https://github.com/mongodb/go-client-mongodb-atlas/issues/140 is fixed @@ -776,7 +776,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- deployment.Spec.DeploymentSpec.Paused = pointer.MakePtr(true) }) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { Expect(c.Paused).To(Equal(createdDeployment.Spec.DeploymentSpec.Paused)) }) }) @@ -806,14 +806,14 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- deployment.Spec.DeploymentSpec.Paused = pointer.MakePtr(false) }) doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { Expect(c.Paused).To(Equal(createdDeployment.Spec.DeploymentSpec.Paused)) }) }) By("Checking that modifications were applied after unpausing", func() { doDeploymentStatusChecks() - checkAtlasState(func(c *admin.AdvancedClusterDescription) { + checkAtlasState(func(c *admin.ClusterDescription20240805) { Expect(c.BackupEnabled).To(Equal(createdDeployment.Spec.DeploymentSpec.BackupEnabled)) }) }) @@ -985,7 +985,7 @@ var _ = Describe("AtlasDeployment", Label("int", "AtlasDeployment", "deployment- }) Expect(err).To(BeNil()) - containsLabel := func(ac *admin.AdvancedClusterDescription) bool { + containsLabel := func(ac *admin.ClusterDescription20240805) bool { for _, label := range ac.GetLabels() { if label.GetKey() == "some-key" && label.GetValue() == "some-value" { return true @@ -1452,7 +1452,7 @@ var _ = Describe("AtlasDeployment", Ordered, Label("int", "AtlasDeployment", "de g, createdProject.ID(), createdDeployment.GetDeploymentName(), - []admin.DiskBackupCopySetting{ + []admin.DiskBackupCopySetting20240805{ { CloudProvider: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_WEST_1"), @@ -1492,7 +1492,7 @@ var _ = Describe("AtlasDeployment", Ordered, Label("int", "AtlasDeployment", "de g, createdProject.ID(), secondDeployment.GetDeploymentName(), - []admin.DiskBackupCopySetting{ + []admin.DiskBackupCopySetting20240805{ { CloudProvider: pointer.MakePtr("AWS"), RegionName: pointer.MakePtr("US_WEST_1"), @@ -1554,7 +1554,7 @@ func validateDeploymentUpdatingFunc(g Gomega) func(a api.AtlasCustomResource) { } } -func validateDeploymentWithSnapshotDistribution(g Gomega, projectID, deploymentName string, copySettings []admin.DiskBackupCopySetting) { +func validateDeploymentWithSnapshotDistribution(g Gomega, projectID, deploymentName string, copySettings []admin.DiskBackupCopySetting20240805) { atlasCluster, _, err := atlasClient.ClustersApi.GetCluster(context.Background(), projectID, deploymentName).Execute() g.Expect(err).Should(BeNil()) g.Expect(atlasCluster.GetStateName()).Should(Equal("IDLE")) @@ -1590,7 +1590,7 @@ func checkAtlasDeploymentRemoved(projectID string, deploymentName string) func() func checkAtlasFlexInstanceRemoved(projectID string, deploymentName string) func() bool { return func() bool { - _, r, err := atlasClientv20241113001.FlexClustersApi. + _, r, err := atlasClient.FlexClustersApi. GetFlexCluster(context.Background(), projectID, deploymentName). Execute() if err != nil { @@ -1609,7 +1609,7 @@ func deleteAtlasDeployment(projectID string, deploymentName string) error { } func deleteFlexInstance(projectID string, deploymentName string) error { - _, _, err := atlasClientv20241113001.FlexClustersApi. + _, err := atlasClient.FlexClustersApi. DeleteFlexCluster(context.Background(), projectID, deploymentName). Execute() return err @@ -1689,7 +1689,7 @@ func deleteProjectFromKubernetes(project *akov2.AtlasProject) { // mergedAdvancedDeployment is clone of atlasdeployment.MergedAdvancedDeployment func mergedAdvancedDeployment( - atlasDeploymentAsAtlas admin.AdvancedClusterDescription, + atlasDeploymentAsAtlas admin.ClusterDescription20240805, specDeployment akov2.AdvancedDeploymentSpec, ) (mergedDeployment akov2.AdvancedDeploymentSpec, atlasDeployment akov2.AdvancedDeploymentSpec, err error) { if atlasDeploymentAsAtlas.ReplicationSpecs != nil { diff --git a/test/int/federated_auth_test.go b/test/int/federated_auth_test.go index e0f31cd0fc..2b589c2f63 100644 --- a/test/int/federated_auth_test.go +++ b/test/int/federated_auth_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "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" diff --git a/test/int/integration_suite_test.go b/test/int/integration_suite_test.go index 90e4b93f45..793275d4d0 100644 --- a/test/int/integration_suite_test.go +++ b/test/int/integration_suite_test.go @@ -27,8 +27,7 @@ import ( "github.com/go-logr/zapr" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" - adminv20241113001 "go.mongodb.org/atlas-sdk/v20241113001/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -61,9 +60,8 @@ var ( testEnv *envtest.Environment // These variables are initialized once per each node - k8sClient client.Client - atlasClient *admin.APIClient - atlasClientv20241113001 *adminv20241113001.APIClient + k8sClient client.Client + atlasClient *admin.APIClient // These variables are per each test and are changed by each BeforeRun namespace corev1.Namespace @@ -145,9 +143,9 @@ var _ = SynchronizedBeforeSuite(func() []byte { atlasClient, err = atlas.NewClient(atlasDomain, publicKey, privateKey) Expect(err).ToNot(HaveOccurred()) - atlasClientv20241113001, err = adminv20241113001.NewClient( - adminv20241113001.UseBaseURL(atlasDomain), - adminv20241113001.UseDigestAuth(publicKey, privateKey), + atlasClient, err = admin.NewClient( + admin.UseBaseURL(atlasDomain), + admin.UseDigestAuth(publicKey, privateKey), ) Expect(err).ToNot(HaveOccurred()) diff --git a/test/int/project_protect_test.go b/test/int/project_protect_test.go index 72d2a01f6e..90c425ec5f 100644 --- a/test/int/project_protect_test.go +++ b/test/int/project_protect_test.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -79,7 +79,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasProject", "protection-enable g.Expect(atlasProject).ToNot(BeNil()) }).WithTimeout(5 * time.Minute).WithPolling(PollingInterval).Should(Succeed()) - _, _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), projectID).Execute() + _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), projectID).Execute() Expect(err).To(BeNil()) }) }) @@ -121,7 +121,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasProject", "protection-enable g.Expect(atlasProject).ToNot(BeNil()) }).WithTimeout(5 * time.Minute).WithPolling(PollingInterval).Should(Succeed()) - _, _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), projectID).Execute() + _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), projectID).Execute() Expect(err).To(BeNil()) }) }) diff --git a/test/int/project_test.go b/test/int/project_test.go index 0688ff1676..a0c5616ab0 100644 --- a/test/int/project_test.go +++ b/test/int/project_test.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "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" @@ -272,7 +272,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasProject"), func() { Expect(checkAtlasProjectRemoved(createdProject.Status.ID)()).Should(BeFalse()) }) By("Manually deleting the project from Atlas", func() { - _, _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), createdProject.ID()).Execute() + _, err := atlasClient.ProjectsApi.DeleteProject(context.Background(), createdProject.ID()).Execute() Expect(err).ToNot(HaveOccurred()) createdProject = nil }) diff --git a/tools/clean/atlas/atlas.go b/tools/clean/atlas/atlas.go index 842573fd0c..ed0d25c604 100644 --- a/tools/clean/atlas/atlas.go +++ b/tools/clean/atlas/atlas.go @@ -24,7 +24,7 @@ import ( "tools/clean/provider" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) const ( @@ -52,7 +52,7 @@ type ProjectDependencies struct { AWSPrivateEndpoints []admin.EndpointService GCPPrivateEndpoints []admin.EndpointService AzurePrivateEndpoints []admin.EndpointService - Clusters []admin.AdvancedClusterDescription + Clusters []admin.ClusterDescription20240805 ServerlessClusters []admin.ServerlessInstanceDescription FederatedDatabases []admin.DataLakeTenant FederatedDBPrivateEndpoints []admin.PrivateNetworkEndpointIdEntry diff --git a/tools/clean/atlas/clusters.go b/tools/clean/atlas/clusters.go index 5d837fcc75..7a39d4a54c 100644 --- a/tools/clean/atlas/clusters.go +++ b/tools/clean/atlas/clusters.go @@ -19,10 +19,10 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) -func (c *Cleaner) listClusters(ctx context.Context, projectID string) []admin.AdvancedClusterDescription { +func (c *Cleaner) listClusters(ctx context.Context, projectID string) []admin.ClusterDescription20240805 { clusters, _, err := c.client.ClustersApi. ListClusters(ctx, projectID). Execute() @@ -35,7 +35,7 @@ func (c *Cleaner) listClusters(ctx context.Context, projectID string) []admin.Ad return *clusters.Results } -func (c *Cleaner) deleteClusters(ctx context.Context, projectID string, clusters []admin.AdvancedClusterDescription) { +func (c *Cleaner) deleteClusters(ctx context.Context, projectID string, clusters []admin.ClusterDescription20240805) { for _, cluster := range clusters { if cluster.GetStateName() == "DELETING" { fmt.Println(text.FgHiBlue.Sprintf("\t\t\tCluster %s is being deleted...", cluster.GetName())) diff --git a/tools/clean/atlas/data_federation.go b/tools/clean/atlas/data_federation.go index 337921eb98..3de657c1c5 100644 --- a/tools/clean/atlas/data_federation.go +++ b/tools/clean/atlas/data_federation.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) listFederatedDatabases(ctx context.Context, projectID string) []admin.DataLakeTenant { diff --git a/tools/clean/atlas/data_federation_private_endpoints.go b/tools/clean/atlas/data_federation_private_endpoints.go index 688a55d46b..f33d4ee1f6 100644 --- a/tools/clean/atlas/data_federation_private_endpoints.go +++ b/tools/clean/atlas/data_federation_private_endpoints.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) listFederatedDBPrivateEndpoints(ctx context.Context, projectID string) []admin.PrivateNetworkEndpointIdEntry { diff --git a/tools/clean/atlas/encryption_at_rest.go b/tools/clean/atlas/encryption_at_rest.go index 29c78774eb..a7613a7c9f 100644 --- a/tools/clean/atlas/encryption_at_rest.go +++ b/tools/clean/atlas/encryption_at_rest.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) getEncryptionAtRest(ctx context.Context, projectID string) *admin.EncryptionAtRest { diff --git a/tools/clean/atlas/network_peering.go b/tools/clean/atlas/network_peering.go index d2a585a3b9..0a663e1e5f 100644 --- a/tools/clean/atlas/network_peering.go +++ b/tools/clean/atlas/network_peering.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) listNetworkPeering(ctx context.Context, projectID string, providers []string) []admin.BaseNetworkPeeringConnectionSettings { diff --git a/tools/clean/atlas/private_endpoints.go b/tools/clean/atlas/private_endpoints.go index 47ff2f85eb..b7a67fcede 100644 --- a/tools/clean/atlas/private_endpoints.go +++ b/tools/clean/atlas/private_endpoints.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) listPrivateEndpoints(ctx context.Context, projectID, cloudProvider string) []admin.EndpointService { diff --git a/tools/clean/atlas/projects.go b/tools/clean/atlas/projects.go index d26e5d1527..98ad8218b2 100644 --- a/tools/clean/atlas/projects.go +++ b/tools/clean/atlas/projects.go @@ -20,7 +20,7 @@ import ( "sync" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) listProjectsByOrg(ctx context.Context, orgID string) []admin.Group { @@ -43,7 +43,7 @@ func (c *Cleaner) listProjectsByOrg(ctx context.Context, orgID string) []admin.G } func (c *Cleaner) deleteProject(ctx context.Context, p *admin.Group) { - _, _, err := c.client.ProjectsApi.DeleteProject(ctx, p.GetId()).Execute() + _, err := c.client.ProjectsApi.DeleteProject(ctx, p.GetId()).Execute() if err != nil { fmt.Println(text.FgRed.Sprintf("\tFailed to request deletion of project %s(%s): %s", p.GetName(), p.GetId(), err)) diff --git a/tools/clean/atlas/teams.go b/tools/clean/atlas/teams.go index fb40b07b23..85d09f7fc7 100644 --- a/tools/clean/atlas/teams.go +++ b/tools/clean/atlas/teams.go @@ -19,7 +19,7 @@ import ( "fmt" "github.com/jedib0t/go-pretty/v6/text" - "go.mongodb.org/atlas-sdk/v20231115008/admin" + "go.mongodb.org/atlas-sdk/v20250312002/admin" ) func (c *Cleaner) listTeamsByOrg(ctx context.Context, orgID string) []admin.TeamResponse {