Fix GCP SPE (#822)

Author: Sugar-pack

pkg/api/v1/provider/provider.go

@@ -3,8 +3,9 @@ package provider
 type ProviderName string
 
 const (
-	ProviderAWS    ProviderName = "AWS"
-	ProviderGCP    ProviderName = "GCP"
-	ProviderAzure  ProviderName = "AZURE"
-	ProviderTenant ProviderName = "TENANT"
+	ProviderAWS        ProviderName = "AWS"
+	ProviderGCP        ProviderName = "GCP"
+	ProviderAzure      ProviderName = "AZURE"
+	ProviderTenant     ProviderName = "TENANT"
+	ProviderServerless ProviderName = "SERVERLESS"
 )

pkg/controller/atlasdeployment/serverless_private_endpoint.go

@@ -32,44 +32,36 @@ func ensureServerlessPrivateEndpoints(service *workflow.Context, groupID string,
 	if deploymentSpec == nil {
 		return workflow.Terminate(workflow.ServerlessPrivateEndpointReady, "deployment spec is empty")
 	}
-	providerName, result := IsClusterSupportServerlessPE(deploymentSpec)
+	providerName := GetServerlessProvider(deploymentSpec)
+	if providerName == provider.ProviderGCP {
+		if len(deploymentSpec.PrivateEndpoints) == 0 {
+			service.UnsetCondition(status.ServerlessPrivateEndpointReadyType)
+			return workflow.OK()
+		} else {
+			return workflow.Terminate(workflow.ServerlessPrivateEndpointReady, "private endpoints are not supported for GCP")
+		}
+	}
+
+	result := syncServerlessPrivateEndpoints(context.Background(), service, groupID, deploymentName, providerName, deploymentSpec.PrivateEndpoints)
 	if !result.IsOk() {
+		service.SetConditionFromResult(status.ServerlessPrivateEndpointReadyType, result)
 		return result
 	}
 
 	if deploymentSpec.PrivateEndpoints == nil {
 		service.UnsetCondition(status.ServerlessPrivateEndpointReadyType)
-		service.EnsureStatusOption(status.AtlasDeploymentSPEOption(nil))
 		return workflow.OK()
 	}
 
-	result = syncServerlessPrivateEndpoints(context.Background(), service, groupID, deploymentName, providerName, deploymentSpec.PrivateEndpoints)
-	if !result.IsOk() {
-		service.SetConditionFromResult(status.ServerlessPrivateEndpointReadyType, result)
-		return result
-	}
 	service.SetConditionTrue(status.ServerlessPrivateEndpointReadyType)
 	return result
 }
 
-func IsClusterSupportServerlessPE(deploymentSpec *mdbv1.ServerlessSpec) (provider.ProviderName, workflow.Result) {
-	if deploymentSpec.ProviderSettings.BackingProviderName == string(provider.ProviderAWS) {
-		return provider.ProviderAWS, workflow.OK()
-	}
-
-	if deploymentSpec.ProviderSettings.BackingProviderName == string(provider.ProviderAzure) {
-		return provider.ProviderAzure, workflow.OK()
-	}
-
-	if deploymentSpec.ProviderSettings.ProviderName == provider.ProviderAWS {
-		return provider.ProviderAWS, workflow.OK()
-	}
-
-	if deploymentSpec.ProviderSettings.ProviderName == provider.ProviderAzure {
-		return provider.ProviderAzure, workflow.OK()
+func GetServerlessProvider(deploymentSpec *mdbv1.ServerlessSpec) provider.ProviderName {
+	if deploymentSpec.ProviderSettings.ProviderName != provider.ProviderServerless {
+		return deploymentSpec.ProviderSettings.ProviderName
 	}
-
-	return "", workflow.Terminate(workflow.Internal, "serverless private endpoints are only supported for AWS and Azure")
+	return provider.ProviderName(deploymentSpec.ProviderSettings.BackingProviderName)
 }
 
 func syncServerlessPrivateEndpoints(ctx context.Context, service *workflow.Context, groupID, deploymentName string, providerName provider.ProviderName, desiredPE []mdbv1.ServerlessPrivateEndpoint) workflow.Result {