From 7f43fe04b954f7a6fd35bb0b2a8c79fc5d6be7cd Mon Sep 17 00:00:00 2001 From: tschneid Date: Mon, 20 Nov 2023 09:02:14 -0600 Subject: [PATCH] cleanup / fix lint --- pkg/frontend/adminactions/delete_managedresource.go | 1 - pkg/frontend/adminactions/delete_managedresource_test.go | 2 +- pkg/util/loadbalancer/loadbalancer_test.go | 5 +---- test/e2e/adminapi_delete_managedresource.go | 6 +++++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/frontend/adminactions/delete_managedresource.go b/pkg/frontend/adminactions/delete_managedresource.go index 2b8d93aea12..47f8f57ea6d 100644 --- a/pkg/frontend/adminactions/delete_managedresource.go +++ b/pkg/frontend/adminactions/delete_managedresource.go @@ -14,7 +14,6 @@ import ( ) func (a *azureActions) ResourceDeleteAndWait(ctx context.Context, resourceID string) error { - idParts, err := azure.ParseResourceID(resourceID) if err != nil { return err diff --git a/pkg/frontend/adminactions/delete_managedresource_test.go b/pkg/frontend/adminactions/delete_managedresource_test.go index 4cfd6c9d6a6..a4abdfc3e7b 100644 --- a/pkg/frontend/adminactions/delete_managedresource_test.go +++ b/pkg/frontend/adminactions/delete_managedresource_test.go @@ -171,7 +171,7 @@ func TestDeleteManagedResource(t *testing.T) { if tt.expectedErr != nil { assert.Equal(t, tt.expectedErr, err, "Unexpected error exception") } else { - assert.Equal(t, nil, err, "Unexpected error exception") + assert.NoError(t, nil, err, "Unexpected error exception") } }) } diff --git a/pkg/util/loadbalancer/loadbalancer_test.go b/pkg/util/loadbalancer/loadbalancer_test.go index abd9f42d1a6..bafd65892ab 100644 --- a/pkg/util/loadbalancer/loadbalancer_test.go +++ b/pkg/util/loadbalancer/loadbalancer_test.go @@ -14,8 +14,6 @@ import ( var infraID = "infraID" var location = "eastus" -var subscription = "00000000-0000-0000-0000-000000000000" -var clusterRG = "clusterRG" var publicIngressFIPConfigID = to.StringPtr("/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clusterRG/providers/Microsoft.Network/loadBalancers/infraID/frontendIPConfigurations/ae3506385907e44eba9ef9bf76eac973") var originalLB = mgmtnetwork.LoadBalancer{ Sku: &mgmtnetwork.LoadBalancerSku{ @@ -126,12 +124,11 @@ func TestRemoveLoadBalancerFrontendIPConfiguration(t *testing.T) { }, } { t.Run(tt.name, func(t *testing.T) { - // Run addOutboundIPsToLB and assert the correct results err := RemoveFrontendIPConfiguration(&tt.currentLB, tt.fipResourceID) if tt.expectedErr != nil { assert.Equal(t, tt.expectedErr, err, "Unexpected error exception") } else { - assert.Equal(t, nil, err, "Unexpected error exception") + assert.NoError(t, nil, err, "Unexpected error exception") } assert.Equal(t, tt.expectedLB, tt.currentLB) }) diff --git a/test/e2e/adminapi_delete_managedresource.go b/test/e2e/adminapi_delete_managedresource.go index 530bd498a69..380163fcb81 100644 --- a/test/e2e/adminapi_delete_managedresource.go +++ b/test/e2e/adminapi_delete_managedresource.go @@ -64,7 +64,7 @@ var _ = Describe("[Admin API] Delete managed resource action", func() { Eventually(func(g Gomega, ctx context.Context) { service, err = clients.Kubernetes.CoreV1().Services("default").Get(ctx, "test", metav1.GetOptions{}) g.Expect(err).NotTo(HaveOccurred()) - g.Expect(len(service.Status.LoadBalancer.Ingress)).To(Equal(1)) + g.Expect(service.Status.LoadBalancer.Ingress).To(HaveLen(1)) }).WithContext(ctx).WithTimeout(DefaultEventuallyTimeout).Should(Succeed()) By("getting the newly created k8s service frontend IP configuration") @@ -73,8 +73,11 @@ var _ = Describe("[Admin API] Delete managed resource action", func() { rgName := stringutils.LastTokenByte(*oc.OpenShiftClusterProperties.ClusterProfile.ResourceGroupID, '/') lbName, err := getPublicLoadBalancerName(ctx) + Expect(err).NotTo(HaveOccurred()) lb, err := clients.LoadBalancers.Get(ctx, rgName, lbName, "") + Expect(err).NotTo(HaveOccurred()) + for _, fipConfig := range *lb.LoadBalancerPropertiesFormat.FrontendIPConfigurations { if !strings.Contains(*fipConfig.PublicIPAddress.ID, "default-v4") && !strings.Contains(*fipConfig.PublicIPAddress.ID, "pip-v4") { lbRuleID = *(*fipConfig.LoadBalancingRules)[0].ID @@ -99,6 +102,7 @@ var _ = Describe("[Admin API] Delete managed resource action", func() { Expect(err).NotTo(HaveOccurred()) resp, err := adminRequest(ctx, http.MethodPost, "/admin"+clusterResourceID+"/deletemanagedresource", url.Values{"resourceid": []string{*oc.OpenShiftClusterProperties.MasterProfile.SubnetID}}, true, nil, nil) + Expect(err).NotTo(HaveOccurred()) Expect(resp.StatusCode).To(Equal(http.StatusBadRequest)) }) })