CLOUDP-242585: Fix getter to avoid pointer conversion (#1720)

josvazg · web-flow · commit 3d1080616bdc · 2024-07-30T17:08:06.000+02:00
diff --git a/pkg/api/v1/privateendpoint.go b/pkg/api/v1/privateendpoint.go
@@ -45,7 +45,7 @@ func (i PrivateEndpoint) Identifier() interface{} {
 	return string(i.Provider) + status.TransformRegionToID(i.Region)
 }
 
-func (endpoints GCPEndpoints) ConvertToAtlas() []admin.CreateGCPForwardingRuleRequest {
+func (endpoints GCPEndpoints) ConvertToAtlas() *[]admin.CreateGCPForwardingRuleRequest {
 	if len(endpoints) == 0 {
 		return nil
 	}
@@ -56,5 +56,5 @@ func (endpoints GCPEndpoints) ConvertToAtlas() []admin.CreateGCPForwardingRuleRe
 			IpAddress:    pointer.SetOrNil(e.IPAddress, ""),
 		})
 	}
-	return result
+	return &result
 }
diff --git a/pkg/controller/atlasproject/private_endpoint.go b/pkg/controller/atlasproject/private_endpoint.go
@@ -263,7 +263,7 @@ func syncPeInterfaceInAtlas(ctx *workflow.Context, projectID string, endpointsTo
 				EndpointGroupName:        pointer.SetOrNil(specPeService.EndpointGroupName, ""),
 				GcpProjectId:             pointer.SetOrNil(specPeService.GCPProjectID, ""),
 			}
-			interfaceConn.Endpoints = pointer.GetOrNilIfEmpty(specPeService.Endpoints.ConvertToAtlas())
+			interfaceConn.Endpoints = specPeService.Endpoints.ConvertToAtlas()
 
 			privateEndpoint, response, err := ctx.SdkClient.PrivateEndpointServicesApi.CreatePrivateEndpointWithParams(ctx.Context, &admin.CreatePrivateEndpointApiParams{
 				GroupId:               projectID,

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (i PrivateEndpoint) Identifier() interface{} {`
`45`	`45`	`return string(i.Provider) + status.TransformRegionToID(i.Region)`
`46`	`46`	`}`
`47`	`47`
`48`		`-func (endpoints GCPEndpoints) ConvertToAtlas() []admin.CreateGCPForwardingRuleRequest {`
	`48`	`+func (endpoints GCPEndpoints) ConvertToAtlas() *[]admin.CreateGCPForwardingRuleRequest {`
`49`	`49`	`if len(endpoints) == 0 {`
`50`	`50`	`return nil`
`51`	`51`	`}`
`@@ -56,5 +56,5 @@ func (endpoints GCPEndpoints) ConvertToAtlas() []admin.CreateGCPForwardingRuleRe`
`56`	`56`	`IpAddress: pointer.SetOrNil(e.IPAddress, ""),`
`57`	`57`	`})`
`58`	`58`	`}`
`59`		`- return result`
	`59`	`+ return &result`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ func syncPeInterfaceInAtlas(ctx *workflow.Context, projectID string, endpointsTo`
`263`	`263`	`EndpointGroupName: pointer.SetOrNil(specPeService.EndpointGroupName, ""),`
`264`	`264`	`GcpProjectId: pointer.SetOrNil(specPeService.GCPProjectID, ""),`
`265`	`265`	`}`
`266`		`- interfaceConn.Endpoints = pointer.GetOrNilIfEmpty(specPeService.Endpoints.ConvertToAtlas())`
	`266`	`+ interfaceConn.Endpoints = specPeService.Endpoints.ConvertToAtlas()`
`267`	`267`
`268`	`268`	`privateEndpoint, response, err := ctx.SdkClient.PrivateEndpointServicesApi.CreatePrivateEndpointWithParams(ctx.Context, &admin.CreatePrivateEndpointApiParams{`
`269`	`269`	`GroupId: projectID,`