Use order-insensitive assertion, remove redundant check

hashicorp · Jul 1, 2022 · 34bf843 · 34bf843
1 parent 931c564
commit 34bf843
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/internal/k8s/controllers/http_route_controller.go b/internal/k8s/controllers/http_route_controller.go
@@ -115,7 +115,7 @@ func (r *HTTPRouteReconciler) getRoutesAffectedByService(service *corev1.Service
 			for _, ref := range rule.BackendRefs {
 				// The BackendRef may or may not specify a namespace, defaults to route's namespace
 				refNamespace := route.Namespace
-				if ref.Namespace != nil && *ref.Namespace != "" {
+				if ref.Namespace != nil {
 					refNamespace = string(*ref.Namespace)
 				}
 

diff --git a/internal/k8s/controllers/http_route_controller_test.go b/internal/k8s/controllers/http_route_controller_test.go
@@ -74,11 +74,11 @@ func TestHTTPRoute(t *testing.T) {
 			})
 			if test.err != nil {
 				require.Error(t, err)
-				require.ErrorIs(t, err, test.err)
+				assert.ErrorIs(t, err, test.err)
 			} else {
 				require.NoError(t, err)
 			}
-			require.Equal(t, test.result, result)
+			assert.Equal(t, test.result, result)
 		})
 	}
 }
@@ -159,9 +159,10 @@ func TestHTTPRouteServiceToRouteRequests(t *testing.T) {
 	}
 
 	requests := controller.serviceToRouteRequests(svc)
-	require.Len(t, requests, 2)
-	assert.Equal(t, "namespace-1/route-1", requests[0].String())
-	assert.Equal(t, "namespace-2/route-2", requests[1].String())
+	assert.ElementsMatch(t, []reconcile.Request{
+		{NamespacedName: types.NamespacedName{Namespace: "namespace-1", Name: "route-1"}},
+		{NamespacedName: types.NamespacedName{Namespace: "namespace-2", Name: "route-2"}},
+	}, requests)
 }
 
 func TestHTTPRouteReferenceGrantToRouteRequests(t *testing.T) {
@@ -245,7 +246,7 @@ func TestHTTPRouteReferenceGrantToRouteRequests(t *testing.T) {
 
 	requests := controller.referenceGrantToRouteRequests(&refGrant)
 
-	require.Equal(t, []reconcile.Request{{
+	assert.Equal(t, []reconcile.Request{{
 		NamespacedName: types.NamespacedName{
 			Name:      "httproute",
 			Namespace: "namespace1",
@@ -334,7 +335,7 @@ func TestHTTPRouteReferencePolicyToRouteRequests(t *testing.T) {
 
 	requests := controller.referencePolicyToRouteRequests(&refPolicy)
 
-	require.Equal(t, []reconcile.Request{{
+	assert.Equal(t, []reconcile.Request{{
 		NamespacedName: types.NamespacedName{
 			Name:      "httproute",
 			Namespace: "namespace1",

diff --git a/internal/k8s/controllers/tcp_route_controller.go b/internal/k8s/controllers/tcp_route_controller.go
@@ -115,7 +115,7 @@ func (r *TCPRouteReconciler) getRoutesAffectedByService(service *corev1.Service)
 			for _, ref := range rule.BackendRefs {
 				// The BackendRef may or may not specify a namespace, defaults to route's namespace
 				refNamespace := route.Namespace
-				if ref.Namespace != nil && *ref.Namespace != "" {
+				if ref.Namespace != nil {
 					refNamespace = string(*ref.Namespace)
 				}
 

diff --git a/internal/k8s/controllers/tcp_route_controller_test.go b/internal/k8s/controllers/tcp_route_controller_test.go
@@ -315,7 +315,8 @@ func TestTCPRouteServiceToRouteRequests(t *testing.T) {
 	}
 
 	requests := controller.serviceToRouteRequests(svc)
-	require.Len(t, requests, 2)
-	assert.Equal(t, "namespace-1/route-1", requests[0].String())
-	assert.Equal(t, "namespace-2/route-2", requests[1].String())
+	assert.ElementsMatch(t, []reconcile.Request{
+		{NamespacedName: types.NamespacedName{Namespace: "namespace-1", Name: "route-1"}},
+		{NamespacedName: types.NamespacedName{Namespace: "namespace-2", Name: "route-2"}},
+	}, requests)
 }