CLOUDP-195522: Correctly fix custom role translation for Atlas API (#1101)

* Correctly fix custom role translation for Atlas API

* appropriately update test

* actually fix conversion

* nicer if format

* Refresh AtlasProject object before deletion in tests

Author: roothorp

pkg/api/v1/custom_roles.go

@@ -2,8 +2,6 @@ package v1
 
 import (
 	"go.mongodb.org/atlas/mongodbatlas"
-
-	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr"
 )
 
 type CustomRole struct {
@@ -47,8 +45,8 @@ func (in *CustomRole) ToAtlas() *mongodbatlas.CustomDBRole {
 		resources := make([]mongodbatlas.Resource, 0, len(action.Resources))
 
 		for _, resource := range action.Resources {
-			if resource.Cluster == nil {
-				resource.Cluster = toptr.MakePtr(false)
+			if resource.Cluster != nil && !*resource.Cluster {
+				resource.Cluster = nil
 			}
 			resources = append(resources, mongodbatlas.Resource{
 				Collection: resource.Collection,

pkg/api/v1/custom_roles_test.go

@@ -76,12 +76,12 @@ func TestAtlasCustomRoles_ToAtlas(t *testing.T) {
 						Action: "testName",
 						Resources: []mongodbatlas.Resource{
 							{
-								Cluster:    toptr.MakePtr(false),
+								Cluster:    nil,
 								DB:         toptr.MakePtr("testDB"),
 								Collection: toptr.MakePtr("testCollection"),
 							},
 							{
-								Cluster:    toptr.MakePtr(false),
+								Cluster:    nil,
 								DB:         toptr.MakePtr("testDB2"),
 								Collection: toptr.MakePtr("testCollection2"),
 							},
@@ -99,7 +99,7 @@ func TestAtlasCustomRoles_ToAtlas(t *testing.T) {
 						Action: "testName3",
 						Resources: []mongodbatlas.Resource{
 							{
-								Cluster:    toptr.MakePtr(false),
+								Cluster:    nil,
 								DB:         toptr.MakePtr(""),
 								Collection: toptr.MakePtr(""),
 							},

pkg/controller/atlasproject/custom_roles.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status"
-	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -74,8 +73,8 @@ func fetchCustomRoles(ctx *workflow.Context, projectID string) ([]v1.CustomRole,
 			resources := make([]v1.Resource, 0, len(atlasAction.Resources))
 
 			for _, atlasResource := range atlasAction.Resources {
-				if atlasResource.Cluster == nil {
-					atlasResource.Cluster = toptr.MakePtr(false)
+				if atlasResource.Cluster != nil && !*atlasResource.Cluster {
+					atlasResource.Cluster = nil
 				}
 				resources = append(resources, v1.Resource{
 					Cluster:    atlasResource.Cluster,

test/int/project_test.go

@@ -54,6 +54,7 @@ var _ = Describe("AtlasProject", Label("int", "AtlasProject"), func() {
 	AfterEach(func() {
 		if createdProject != nil && createdProject.Status.ID != "" {
 			By("Removing Atlas Project " + createdProject.Status.ID)
+			Expect(k8sClient.Get(context.Background(), kube.ObjectKeyFromObject(createdProject), createdProject)).To(Succeed())
 			Expect(k8sClient.Delete(context.Background(), createdProject)).To(Succeed())
 			Eventually(checkAtlasProjectRemoved(createdProject.Status.ID), 20, interval).Should(BeTrue())
 		}