From 89e4f16adf0582cc1ffbf93139919d334082be61 Mon Sep 17 00:00:00 2001 From: Ari Lima <35818947+ArielLima@users.noreply.github.com> Date: Wed, 16 Mar 2022 19:10:11 -0700 Subject: [PATCH] Filter out unwanted data from azure list geneva action (#1969) * filter our Microsoft.Compute/snapshots from azure list geneva action * change filter input for test --- pkg/frontend/adminactions/resources_list.go | 2 +- pkg/frontend/adminactions/resources_list_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/frontend/adminactions/resources_list.go b/pkg/frontend/adminactions/resources_list.go index 8b1b1efb9c5..c95856101c7 100644 --- a/pkg/frontend/adminactions/resources_list.go +++ b/pkg/frontend/adminactions/resources_list.go @@ -19,7 +19,7 @@ import ( func (a *azureActions) ResourcesList(ctx context.Context) ([]byte, error) { clusterRGName := stringutils.LastTokenByte(a.oc.Properties.ClusterProfile.ResourceGroupID, '/') - resources, err := a.resources.ListByResourceGroup(ctx, clusterRGName, "", "", nil) + resources, err := a.resources.ListByResourceGroup(ctx, clusterRGName, "resourceType ne 'Microsoft.Compute/snapshots'", "", nil) if err != nil { return nil, err } diff --git a/pkg/frontend/adminactions/resources_list_test.go b/pkg/frontend/adminactions/resources_list_test.go index 7dc34aac9de..521cd14d36d 100644 --- a/pkg/frontend/adminactions/resources_list_test.go +++ b/pkg/frontend/adminactions/resources_list_test.go @@ -25,7 +25,7 @@ import ( ) func validListByResourceGroupMock(resources *mock_features.MockResourcesClient) { - resources.EXPECT().ListByResourceGroup(gomock.Any(), "test-cluster", "", "", nil).Return([]mgmtfeatures.GenericResourceExpanded{ + resources.EXPECT().ListByResourceGroup(gomock.Any(), "test-cluster", "resourceType ne 'Microsoft.Compute/snapshots'", "", nil).Return([]mgmtfeatures.GenericResourceExpanded{ { Name: to.StringPtr("vm-1"), ID: to.StringPtr("/subscriptions/id"),