CLOUDP-147254: Use only Advanced Cluster API (#825)

Author: fabritsius

go.mod

@@ -95,7 +95,7 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
 	golang.org/x/net v0.2.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect

go.sum

@@ -401,8 +401,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

pkg/api/v1/atlasdeployment_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 	"regexp"
@@ -181,6 +182,21 @@ func (s *AdvancedDeploymentSpec) ToAtlas() (*mongodbatlas.AdvancedCluster, error
 	return result, err
 }
 
+func LessAD(a, b interface{}) bool {
+	switch a.(type) {
+	case *AdvancedReplicationSpec:
+		return a.(*AdvancedReplicationSpec).ZoneName < b.(*AdvancedReplicationSpec).ZoneName
+	case *AdvancedRegionConfig:
+		return a.(*AdvancedRegionConfig).RegionName < b.(*AdvancedRegionConfig).RegionName
+	case ManagedNamespace:
+		return a.(ManagedNamespace).Collection < b.(ManagedNamespace).Collection
+	case CustomZoneMapping:
+		return a.(CustomZoneMapping).Zone < b.(CustomZoneMapping).Zone
+	default:
+		return false
+	}
+}
+
 // ServerlessSpec defines the desired state of Atlas Serverless Instance
 type ServerlessSpec struct {
 	// Name of the serverless deployment as it appears in Atlas.
@@ -489,8 +505,8 @@ type RegionsConfig struct {
 // Check compatibility with library type.
 var _ = RegionsConfig(mongodbatlas.RegionsConfig{})
 
-// Deployment converts the Spec to native Atlas client format.
-func (spec *AtlasDeploymentSpec) Deployment() (*mongodbatlas.Cluster, error) {
+// LegacyDeployment converts the Spec to native Atlas client format.
+func (spec *AtlasDeploymentSpec) LegacyDeployment() (*mongodbatlas.Cluster, error) {
 	result := &mongodbatlas.Cluster{}
 	err := compat.JSONCopy(result, *spec.DeploymentSpec)
 
@@ -505,6 +521,16 @@ func (spec *AtlasDeploymentSpec) Deployment() (*mongodbatlas.Cluster, error) {
 	return result, err
 }
 
+// Deployment converts the Spec to native Atlas client format.
+func (spec *AtlasDeploymentSpec) Deployment() (*mongodbatlas.AdvancedCluster, error) {
+	result := &mongodbatlas.AdvancedCluster{}
+	if spec.AdvancedDeploymentSpec == nil {
+		return result, errors.New("AdvancedDeploymentSpec is empty")
+	}
+	err := compat.JSONCopy(result, *spec.AdvancedDeploymentSpec)
+	return result, err
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
@@ -519,20 +545,29 @@ type AtlasDeployment struct {
 }
 
 func (c *AtlasDeployment) GetDeploymentName() string {
-	if c.IsAdvancedDeployment() {
-		return c.Spec.AdvancedDeploymentSpec.Name
+	if c.IsLegacyDeployment() {
+		return c.Spec.DeploymentSpec.Name
 	}
 	if c.IsServerless() {
 		return c.Spec.ServerlessSpec.Name
 	}
-	return c.Spec.DeploymentSpec.Name
+	if c.IsAdvancedDeployment() {
+		return c.Spec.AdvancedDeploymentSpec.Name
+	}
+
+	return ""
 }
 
 // IsServerless returns true if the AtlasDeployment is configured to be a serverless instance
 func (c *AtlasDeployment) IsServerless() bool {
 	return c.Spec.ServerlessSpec != nil
 }
 
+// IsLegacyDeployment returns true if the AtlasDeployment is configured to be an legacy deployment.
+func (c *AtlasDeployment) IsLegacyDeployment() bool {
+	return c.Spec.DeploymentSpec != nil
+}
+
 // IsAdvancedDeployment returns true if the AtlasDeployment is configured to be an advanced deployment.
 func (c *AtlasDeployment) IsAdvancedDeployment() bool {
 	return c.Spec.AdvancedDeploymentSpec != nil
@@ -641,7 +676,7 @@ func newAwsAdvancedDeployment(namespace, name, nameInAtlas, instanceSize, provid
 }
 
 func (c *AtlasDeployment) WithName(name string) *AtlasDeployment {
-	c.Spec.DeploymentSpec.Name = name
+	c.Name = name
 	return c
 }
 

pkg/api/v1/atlasdeployment_types_test.go

@@ -78,7 +78,7 @@ func TestEnums(t *testing.T) {
 			ClusterType: TypeGeoSharded,
 		},
 	}
-	transformedCluster, err := operatorCluster.Deployment()
+	transformedCluster, err := operatorCluster.LegacyDeployment()
 	assert.NoError(t, err)
 	assert.Equal(t, atlasCluster, *transformedCluster)
 }

pkg/controller/atlasdatabaseuser/databaseuser.go

@@ -151,9 +151,8 @@ func performUpdateInAtlas(ctx *workflow.Context, k8sClient client.Client, projec
 func validateScopes(ctx *workflow.Context, projectID string, user mdbv1.AtlasDatabaseUser) error {
 	for _, s := range user.GetScopes(mdbv1.DeploymentScopeType) {
 		var apiError *mongodbatlas.ErrorResponse
-		_, _, regularErr := ctx.Client.Clusters.Get(context.Background(), projectID, s)
 		_, _, advancedErr := ctx.Client.AdvancedClusters.Get(context.Background(), projectID, s)
-		if errors.As(regularErr, &apiError) && apiError.ErrorCode == atlas.ClusterNotFound && errors.As(advancedErr, &apiError) && apiError.ErrorCode == atlas.ClusterNotFound {
+		if errors.As(advancedErr, &apiError) && apiError.ErrorCode == atlas.ClusterNotFound {
 			return fmt.Errorf(`"scopes" field references deployment named "%s" but such deployment doesn't exist in Atlas'`, s)
 		}
 	}