chore: Fix private endpoints command (#3517)

Author: blva

internal/cli/privateendpoints/aws/interfaces/describe.go

@@ -48,7 +48,7 @@ var describeTemplate = `ID	STATUS	ERROR
 `
 
 func (opts *DescribeOpts) Run() error {
-	r, err := opts.store.InterfaceEndpoint(opts.ConfigProjectID(), provider, opts.privateEndpointServiceID, opts.privateEndpointID)
+	r, err := opts.store.InterfaceEndpoint(opts.ConfigProjectID(), provider, opts.privateEndpointID, opts.privateEndpointServiceID)
 
 	if err != nil {
 		return err

internal/cli/privateendpoints/aws/interfaces/describe_test.go

@@ -39,7 +39,7 @@ func TestDescribeOpts_Run(t *testing.T) {
 
 	mockStore.
 		EXPECT().
-		InterfaceEndpoint(opts.ProjectID, provider, opts.privateEndpointServiceID, opts.privateEndpointID).
+		InterfaceEndpoint(opts.ProjectID, provider, opts.privateEndpointID, opts.privateEndpointServiceID).
 		Return(expected, nil).
 		Times(1)
 

internal/cli/privateendpoints/azure/interfaces/describe.go

@@ -48,7 +48,7 @@ var describeTemplate = `ID	IP ADDRESS	STATUS	ERROR
 `
 
 func (opts *DescribeOpts) Run() error {
-	r, err := opts.store.InterfaceEndpoint(opts.ConfigProjectID(), provider, opts.privateEndpointServiceID, opts.privateEndpointID)
+	r, err := opts.store.InterfaceEndpoint(opts.ConfigProjectID(), provider, opts.privateEndpointID, opts.privateEndpointServiceID)
 
 	if err != nil {
 		return err

internal/cli/privateendpoints/azure/interfaces/describe_test.go

@@ -39,7 +39,7 @@ func TestDescribeOpts_Run(t *testing.T) {
 
 	mockStore.
 		EXPECT().
-		InterfaceEndpoint(opts.ProjectID, provider, opts.privateEndpointServiceID, opts.privateEndpointID).
+		InterfaceEndpoint(opts.ProjectID, provider, opts.privateEndpointID, opts.privateEndpointServiceID).
 		Return(expected, nil).
 		Times(1)
 

internal/cli/privateendpoints/gcp/interfaces/describe.go

@@ -48,7 +48,7 @@ var describeTemplate = `ENDPOINT	STATUS	DELETE REQUESTED
 `
 
 func (opts *DescribeOpts) Run() error {
-	r, err := opts.store.InterfaceEndpoint(opts.ConfigProjectID(), provider, opts.privateEndpointServiceID, opts.privateEndpointGroupID)
+	r, err := opts.store.InterfaceEndpoint(opts.ConfigProjectID(), provider, opts.privateEndpointGroupID, opts.privateEndpointServiceID)
 
 	if err != nil {
 		return err

internal/cli/privateendpoints/gcp/interfaces/describe_test.go

@@ -39,7 +39,7 @@ func TestDescribeOpts_Run(t *testing.T) {
 
 	mockStore.
 		EXPECT().
-		InterfaceEndpoint(opts.ProjectID, provider, opts.privateEndpointServiceID, opts.privateEndpointGroupID).
+		InterfaceEndpoint(opts.ProjectID, provider, opts.privateEndpointGroupID, opts.privateEndpointServiceID).
 		Return(expected, nil).
 		Times(1)
 

internal/kubernetes/operator/project/privateendpoints.go

@@ -136,7 +136,7 @@ func buildAWSInterfaces(
 	configs := make([]akov2.AWSPrivateEndpointConfiguration, 0, len(interfaceIDs))
 
 	for _, interfaceID := range interfaceIDs {
-		pe, err := provider.InterfaceEndpoint(projectID, "AWS", serviceID, interfaceID)
+		pe, err := provider.InterfaceEndpoint(projectID, "AWS", interfaceID, serviceID)
 		if err != nil {
 			return nil, err
 		}
@@ -160,7 +160,7 @@ func buildAzureInterfaces(
 	configs := make([]akov2.AzurePrivateEndpointConfiguration, 0, len(interfaceIDs))
 
 	for _, interfaceID := range interfaceIDs {
-		pe, err := provider.InterfaceEndpoint(projectID, "AZURE", serviceID, interfaceID)
+		pe, err := provider.InterfaceEndpoint(projectID, "AZURE", interfaceID, serviceID)
 		if err != nil {
 			return nil, err
 		}
@@ -190,7 +190,7 @@ func buildGCPInterfaces(
 	configs := make([]akov2.GCPPrivateEndpointConfiguration, 0, len(interfaceIDs))
 
 	for _, interfaceID := range interfaceIDs {
-		pe, err := provider.InterfaceEndpoint(projectID, "GCP", serviceID, interfaceID)
+		pe, err := provider.InterfaceEndpoint(projectID, "GCP", interfaceID, serviceID)
 		if err != nil {
 			return nil, err
 		}

internal/kubernetes/operator/project/privateendpoints_test.go

@@ -329,15 +329,15 @@ func TestBuildPrivateEndpoints(t *testing.T) {
 			peStore.EXPECT().PrivateEndpoints(projectID, "GCP").Return(tt.gcpServices, nil)
 
 			if tt.awsEndpointInterface != nil {
-				peStore.EXPECT().InterfaceEndpoint(projectID, "AWS", "aws-pe-1", "vpcpe-123456").Return(tt.awsEndpointInterface, nil)
+				peStore.EXPECT().InterfaceEndpoint(projectID, "AWS", "vpcpe-123456", "aws-pe-1").Return(tt.awsEndpointInterface, nil)
 			}
 
 			if tt.azureEndpointInterface != nil {
-				peStore.EXPECT().InterfaceEndpoint(projectID, "AZURE", "azure-pe-1", "azure/resource/id").Return(tt.azureEndpointInterface, nil)
+				peStore.EXPECT().InterfaceEndpoint(projectID, "AZURE", "azure/resource/id", "azure-pe-1").Return(tt.azureEndpointInterface, nil)
 			}
 
 			if tt.gcpEndpointInterface != nil {
-				peStore.EXPECT().InterfaceEndpoint(projectID, "GCP", "gcp-pe-1", "groupName").Return(tt.gcpEndpointInterface, nil)
+				peStore.EXPECT().InterfaceEndpoint(projectID, "GCP", "groupName", "gcp-pe-1").Return(tt.gcpEndpointInterface, nil)
 			}
 
 			privateEndpoints, err := BuildPrivateEndpointCustomResources(

internal/store/private_endpoints.go

@@ -53,7 +53,7 @@ type DataLakePrivateEndpointDeleter interface {
 }
 
 type InterfaceEndpointDescriber interface {
-	InterfaceEndpoint(string, string, string, string) (*atlasv2.PrivateLinkEndpoint, error)
+	InterfaceEndpoint(projectID, cloudProvider, privateEndpointID, endpointServiceID string) (*atlasv2.PrivateLinkEndpoint, error)
 }
 
 type InterfaceEndpointCreator interface {
@@ -130,8 +130,8 @@ func (s *Store) CreateInterfaceEndpoint(projectID, provider, endpointServiceID s
 }
 
 // InterfaceEndpoint encapsulates the logic to manage different cloud providers.
-func (s *Store) InterfaceEndpoint(projectID, cloudProvider, endpointServiceID, privateEndpointID string) (*atlasv2.PrivateLinkEndpoint, error) {
-	result, _, err := s.clientv2.PrivateEndpointServicesApi.GetPrivateEndpoint(s.ctx, projectID, cloudProvider, endpointServiceID, privateEndpointID).Execute()
+func (s *Store) InterfaceEndpoint(projectID, cloudProvider, privateEndpointID, endpointServiceID string) (*atlasv2.PrivateLinkEndpoint, error) {
+	result, _, err := s.clientv2.PrivateEndpointServicesApi.GetPrivateEndpoint(s.ctx, projectID, cloudProvider, privateEndpointID, endpointServiceID).Execute()
 	return result, err
 }