CLOUDP-128679: Allow to sync back Private Endpoints (#603)

* Allow to sync back PEs
* Improve the tests for PEs a bit
* Regenerate zz_generated.deepcopy changes

Author: fabritsius

pkg/api/v1/privateendpoint.go

@@ -6,6 +6,7 @@ import (
 	"go.mongodb.org/atlas/mongodbatlas"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider"
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat"
 )
 
@@ -50,7 +51,7 @@ func (i PrivateEndpoint) ToAtlas() (*mongodbatlas.PrivateEndpoint, error) {
 
 // Identifier is required to satisfy "Identifiable" iterface
 func (i PrivateEndpoint) Identifier() interface{} {
-	return string(i.Provider) + i.Region
+	return string(i.Provider) + status.TransformRegionToID(i.Region)
 }
 
 func (endpoints GCPEndpoints) ConvertToAtlas() ([]*mongodbatlas.GCPEndpoint, error) {

pkg/api/v1/status/atlasproject.go

@@ -28,40 +28,9 @@ func AtlasProjectAddPrivateEnpointsOption(privateEndpoints []ProjectPrivateEndpo
 	}
 }
 
-func AtlasProjectUpdatePrivateEnpointsOption(privateEndpoints []ProjectPrivateEndpoint) AtlasProjectStatusOption {
+func AtlasProjectSetPrivateEnpointsOption(privateEndpoints []ProjectPrivateEndpoint) AtlasProjectStatusOption {
 	return func(s *AtlasProjectStatus) {
-		result := []ProjectPrivateEndpoint{}
-
-		for _, currentPE := range privateEndpoints {
-			var matchedPE *ProjectPrivateEndpoint
-			for peIdx, statusPE := range s.PrivateEndpoints {
-				if currentPE.ID == statusPE.ID {
-					if currentPE.ServiceName != "" {
-						s.PrivateEndpoints[peIdx].ServiceName = currentPE.ServiceName
-					}
-					if currentPE.ServiceResourceID != "" {
-						s.PrivateEndpoints[peIdx].ServiceResourceID = currentPE.ServiceResourceID
-					}
-					if currentPE.InterfaceEndpointID != "" {
-						s.PrivateEndpoints[peIdx].InterfaceEndpointID = currentPE.InterfaceEndpointID
-					}
-					if len(currentPE.ServiceAttachmentNames) != 0 {
-						s.PrivateEndpoints[peIdx].ServiceAttachmentNames = currentPE.ServiceAttachmentNames
-					}
-					if len(currentPE.Endpoints) != 0 {
-						s.PrivateEndpoints[peIdx].Endpoints = currentPE.Endpoints
-					}
-
-					matchedPE = &s.PrivateEndpoints[peIdx]
-				}
-			}
-
-			if matchedPE != nil {
-				result = append(result, *matchedPE)
-			}
-		}
-
-		s.PrivateEndpoints = result
+		s.PrivateEndpoints = privateEndpoints
 	}
 }
 

pkg/api/v1/status/privateendpoint.go

@@ -1,6 +1,12 @@
 package status
 
-import "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider"
+import (
+	"regexp"
+	"sort"
+	"strings"
+
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider"
+)
 
 type ProjectPrivateEndpoint struct {
 	// Unique identifier for AWS or AZURE Private Link Connection.
@@ -28,5 +34,26 @@ type GCPEndpoint struct {
 }
 
 func (pe ProjectPrivateEndpoint) Identifier() interface{} {
-	return string(pe.Provider) + pe.Region
+	return string(pe.Provider) + TransformRegionToID(pe.Region)
+}
+
+// TransformRegionToID makes the same ID from region and regionName fields for PE Connections to match them
+// it leaves only characters which are letters or numbers starting from 2
+// it also makes a couple swaps and sorts the resulting string
+// this function is a temporary work around caused by the empty "region" field in Atlas reply
+func TransformRegionToID(region string) string {
+	reg := regexp.MustCompile("[^a-z2-9]+")
+	temp := strings.ToLower(region)
+
+	// this is GCP specific
+	temp = strings.ReplaceAll(temp, "northern", "north")
+	temp = strings.ReplaceAll(temp, "southern", "south")
+	temp = strings.ReplaceAll(temp, "western", "west")
+	temp = strings.ReplaceAll(temp, "eastern", "east")
+
+	temp = reg.ReplaceAllString(temp, "")
+
+	tempSlice := strings.Split(temp, "")
+	sort.Strings(tempSlice)
+	return strings.Join(tempSlice, "")
 }

pkg/api/v1/zz_generated.deepcopy.go

@@ -156,7 +156,7 @@ func (r *AtlasProjectReconciler) Reconcile(context context.Context, req ctrl.Req
 			if customresource.ResourceShouldBeLeftInAtlas(project) {
 				log.Infof("Not removing the Atlas Project from Atlas as the '%s' annotation is set", customresource.ResourcePolicyAnnotation)
 			} else {
-				if result = DeleteAllPrivateEndpoints(ctx, atlasClient, projectID, project.Status.PrivateEndpoints, log); !result.IsOk() {
+				if result = DeleteAllPrivateEndpoints(ctx, projectID); !result.IsOk() {
 					setCondition(ctx, status.PrivateEndpointReadyType, result)
 					return result.ReconcileResult(), nil
 				}