Skip to content

Commit 195ea65

Browse files
adiantumadiantum
authored
Get rid of FIQL in Nutanix API list methods (#8997)
1 parent 112571b commit 195ea65

File tree

6 files changed

+299
-218
lines changed

6 files changed

+299
-218
lines changed

‎internal/pkg/nutanix/prismclient.go

+37-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"strings"
77

88
prismgoclient "github.com/nutanix-cloud-native/prism-go-client"
9-
"github.com/nutanix-cloud-native/prism-go-client/utils"
109
v3 "github.com/nutanix-cloud-native/prism-go-client/v3"
1110

1211
"github.com/aws/eks-anywhere/pkg/providers/nutanix"
@@ -44,30 +43,39 @@ func NewPrismClient(endpoint, port string, insecure bool) (PrismClient, error) {
4443

4544
// GetImageUUIDFromName retrieves the image uuid from the given image name.
4645
func (c *client) GetImageUUIDFromName(ctx context.Context, imageName string) (*string, error) {
47-
res, err := c.V3.ListImage(ctx, &v3.DSMetadata{
48-
Filter: utils.StringPtr(fmt.Sprintf("name==%s", imageName)),
49-
})
50-
if err != nil || len(res.Entities) == 0 {
46+
res, err := c.V3.ListAllImage(ctx, "")
47+
if err != nil {
48+
return nil, fmt.Errorf("failed to list images: %v", err)
49+
}
50+
51+
images := make([]*v3.ImageIntentResponse, 0)
52+
53+
for _, image := range res.Entities {
54+
if image.Spec.Name != nil && *image.Spec.Name == imageName {
55+
images = append(images, image)
56+
}
57+
}
58+
59+
if len(images) == 0 {
5160
return nil, fmt.Errorf("failed to find image by name %q: %v", imageName, err)
5261
}
5362

54-
if len(res.Entities) > 1 {
55-
return nil, fmt.Errorf("found more than one (%v) image with name %q", len(res.Entities), imageName)
63+
if len(images) > 1 {
64+
return nil, fmt.Errorf("found more than one (%v) image with name %q", len(images), imageName)
5665
}
5766

58-
return res.Entities[0].Metadata.UUID, nil
67+
return images[0].Metadata.UUID, nil
5968
}
6069

6170
// GetClusterUUIDFromName retrieves the cluster uuid from the given cluster name.
6271
//
6372
//nolint:gocyclo
6473
func (c *client) GetClusterUUIDFromName(ctx context.Context, clusterName string) (*string, error) {
65-
res, err := c.V3.ListCluster(ctx, &v3.DSMetadata{
66-
Filter: utils.StringPtr(fmt.Sprintf("name==%s", clusterName)),
67-
})
74+
res, err := c.V3.ListAllCluster(ctx, "")
6875
if err != nil {
69-
return nil, fmt.Errorf("failed to find cluster by name %q: %v", clusterName, err)
76+
return nil, fmt.Errorf("failed to list clusters: %v", err)
7077
}
78+
7179
entities := make([]*v3.ClusterIntentResponse, 0)
7280
for _, entity := range res.Entities {
7381
if entity.Status != nil && entity.Status.Resources != nil && entity.Status.Resources.Config != nil {
@@ -97,16 +105,26 @@ func (c *client) GetClusterUUIDFromName(ctx context.Context, clusterName string)
97105

98106
// GetSubnetUUIDFromName retrieves the subnet uuid from the given subnet name.
99107
func (c *client) GetSubnetUUIDFromName(ctx context.Context, subnetName string) (*string, error) {
100-
res, err := c.V3.ListSubnet(ctx, &v3.DSMetadata{
101-
Filter: utils.StringPtr(fmt.Sprintf("name==%s", subnetName)),
102-
})
103-
if err != nil || len(res.Entities) == 0 {
108+
res, err := c.V3.ListAllSubnet(ctx, "", nil)
109+
if err != nil {
110+
return nil, fmt.Errorf("failed to list subnets: %v", err)
111+
}
112+
113+
subnets := make([]*v3.SubnetIntentResponse, 0)
114+
115+
for _, subnet := range res.Entities {
116+
if subnet.Spec.Name != nil && *subnet.Spec.Name == subnetName {
117+
subnets = append(subnets, subnet)
118+
}
119+
}
120+
121+
if len(subnets) == 0 {
104122
return nil, fmt.Errorf("failed to find subnet by name %q: %v", subnetName, err)
105123
}
106124

107-
if len(res.Entities) > 1 {
108-
return nil, fmt.Errorf("found more than one (%v) subnet with name %q", len(res.Entities), subnetName)
125+
if len(subnets) > 1 {
126+
return nil, fmt.Errorf("found more than one (%v) subnet with name %q", len(subnets), subnetName)
109127
}
110128

111-
return res.Entities[0].Metadata.UUID, nil
129+
return subnets[0].Metadata.UUID, nil
112130
}

‎pkg/providers/nutanix/client.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ package nutanix
33
import (
44
"context"
55

6+
prismgoclient "github.com/nutanix-cloud-native/prism-go-client"
67
v3 "github.com/nutanix-cloud-native/prism-go-client/v3"
78
)
89

910
type Client interface {
1011
GetSubnet(ctx context.Context, uuid string) (*v3.SubnetIntentResponse, error)
1112
ListAllHost(ctx context.Context) (*v3.HostListResponse, error)
12-
ListSubnet(ctx context.Context, getEntitiesRequest *v3.DSMetadata) (*v3.SubnetListIntentResponse, error)
13+
ListAllSubnet(ctx context.Context, filter string, clientSideFilters []*prismgoclient.AdditionalFilter) (*v3.SubnetListIntentResponse, error)
1314
GetImage(ctx context.Context, uuid string) (*v3.ImageIntentResponse, error)
14-
ListImage(ctx context.Context, getEntitiesRequest *v3.DSMetadata) (*v3.ImageListIntentResponse, error)
15+
ListAllImage(ctx context.Context, filter string) (*v3.ImageListIntentResponse, error)
1516
GetCluster(ctx context.Context, uuid string) (*v3.ClusterIntentResponse, error)
16-
ListCluster(ctx context.Context, getEntitiesRequest *v3.DSMetadata) (*v3.ClusterListIntentResponse, error)
17+
ListAllCluster(ctx context.Context, filter string) (*v3.ClusterListIntentResponse, error)
1718
GetProject(ctx context.Context, uuid string) (*v3.Project, error)
18-
ListProject(ctx context.Context, getEntitiesRequest *v3.DSMetadata) (*v3.ProjectListResponse, error)
19+
ListAllProject(ctx context.Context, filter string) (*v3.ProjectListResponse, error)
1920
GetCurrentLoggedInUser(ctx context.Context) (*v3.UserIntentResponse, error)
2021
ListCategories(ctx context.Context, getEntitiesRequest *v3.CategoryListMetadata) (*v3.CategoryKeyListResponse, error)
2122
GetCategoryKey(ctx context.Context, name string) (*v3.CategoryKeyStatus, error)

‎pkg/providers/nutanix/mocks/client.go

+50-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/providers/nutanix/provider_test.go

+16-3
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ func TestNutanixProviderSetupAndValidateCreate(t *testing.T) {
391391
},
392392
},
393393
}
394-
mockClient.EXPECT().ListCluster(gomock.Any(), gomock.Any()).Return(clusters, nil).AnyTimes()
394+
mockClient.EXPECT().ListAllCluster(gomock.Any(), gomock.Any()).Return(clusters, nil).AnyTimes()
395395
subnets := &v3.SubnetListIntentResponse{
396396
Entities: []*v3.SubnetIntentResponse{
397397
{
@@ -400,11 +400,16 @@ func TestNutanixProviderSetupAndValidateCreate(t *testing.T) {
400400
},
401401
Spec: &v3.Subnet{
402402
Name: utils.StringPtr("prism-subnet"),
403+
ClusterReference: &v3.Reference{
404+
Kind: utils.StringPtr("cluster"),
405+
UUID: utils.StringPtr("a15f6966-bfc7-4d1e-8575-224096fc1cda"),
406+
Name: utils.StringPtr("prism-cluster"),
407+
},
403408
},
404409
},
405410
},
406411
}
407-
mockClient.EXPECT().ListSubnet(gomock.Any(), gomock.Any()).Return(subnets, nil).AnyTimes()
412+
mockClient.EXPECT().ListAllSubnet(gomock.Any(), gomock.Any(), nil).Return(subnets, nil).AnyTimes()
408413
images := &v3.ImageListIntentResponse{
409414
Entities: []*v3.ImageIntentResponse{
410415
{
@@ -415,9 +420,17 @@ func TestNutanixProviderSetupAndValidateCreate(t *testing.T) {
415420
Name: utils.StringPtr("prism-image"),
416421
},
417422
},
423+
{
424+
Metadata: &v3.Metadata{
425+
UUID: utils.StringPtr("a15f6966-bfc7-4d1e-8575-224096fc1cdd"),
426+
},
427+
Spec: &v3.Image{
428+
Name: utils.StringPtr("prism-image-1-19"),
429+
},
430+
},
418431
},
419432
}
420-
mockClient.EXPECT().ListImage(gomock.Any(), gomock.Any()).Return(images, nil).AnyTimes()
433+
mockClient.EXPECT().ListAllImage(gomock.Any(), gomock.Any()).Return(images, nil).AnyTimes()
421434
mockClient.EXPECT().ListAllHost(gomock.Any()).Return(fakeHostList(), nil).AnyTimes()
422435
mockCertValidator := mockCrypto.NewMockTlsValidator(ctrl)
423436
mockCertValidator.EXPECT().ValidateCert(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)

0 commit comments

Comments
 (0)