cleanup / fix lint

Azure · Nov 20, 2023 · 7f43fe0 · 7f43fe0
1 parent ccce9dd
commit 7f43fe0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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))
 	})
 })