backport of commit 95b3f7c

hashicorp · Jun 13, 2023 · 27fe0a2 · 27fe0a2
1 parent 47c623f
commit 27fe0a2
Showing 1 changed file with 55 additions and 93 deletions.
diff --git a/control-plane/catalog/to-consul/resource_test.go b/control-plane/catalog/to-consul/resource_test.go
@@ -102,105 +102,67 @@ func TestServiceWeight_ingress(t *testing.T) {
 // Test that Loadbalancer service weight is set from service annotation.
 func TestServiceWeight_externalIP(t *testing.T) {
 	t.Parallel()
-	client := fake.NewSimpleClientset()
-	syncer := newTestSyncer()
-	serviceResource := defaultServiceResource(client, syncer)
-
-	// Start the controller
-	closer := controller.TestControllerRun(&serviceResource)
-	defer closer()
-
-	// Insert an LB service
-	svc := lbService("foo", metav1.NamespaceDefault, "1.2.3.4")
-	svc.Annotations[annotationServiceWeight] = "22"
-	svc.Spec.ExternalIPs = []string{"3.3.3.3", "4.4.4.4"}
-
-	_, err := client.CoreV1().Services(metav1.NamespaceDefault).Create(context.Background(), svc, metav1.CreateOptions{})
-	require.NoError(t, err)
-
-	// Verify what we got
-	retry.Run(t, func(r *retry.R) {
-		syncer.Lock()
-		defer syncer.Unlock()
-		actual := syncer.Registrations
-		require.Len(r, actual, 2)
-		require.Equal(r, "foo", actual[0].Service.Service)
-		require.Equal(r, "3.3.3.3", actual[0].Service.Address)
-		require.Equal(r, 22, actual[0].Service.Weights.Passing)
-		require.Equal(r, "foo", actual[1].Service.Service)
-		require.Equal(r, "4.4.4.4", actual[1].Service.Address)
-		require.Equal(r, 22, actual[1].Service.Weights.Passing)
-		require.NotEqual(r, actual[0].Service.ID, actual[1].Service.ID)
-	})
-}
-
-// Test that Loadbalancer service weight is set from service annotation.
-func TestServiceWeight_invalidValue(t *testing.T) {
-	t.Parallel()
-	client := fake.NewSimpleClientset()
-	syncer := newTestSyncer()
-	serviceResource := defaultServiceResource(client, syncer)
 
-	// Start the controller
-	closer := controller.TestControllerRun(&serviceResource)
-	defer closer()
-
-	// Insert an LB service
-	svc := lbService("foo", metav1.NamespaceDefault, "1.2.3.4")
-	svc.Annotations[annotationServiceWeight] = "1"
-	svc.Spec.ExternalIPs = []string{"3.3.3.3", "4.4.4.4"}
-
-	_, err := client.CoreV1().Services(metav1.NamespaceDefault).Create(context.Background(), svc, metav1.CreateOptions{})
-	require.NoError(t, err)
-
-	// Verify what we got
-	retry.Run(t, func(r *retry.R) {
-		syncer.Lock()
-		defer syncer.Unlock()
-		actual := syncer.Registrations
-		require.Len(r, actual, 2)
-		require.Equal(r, "foo", actual[0].Service.Service)
-		require.Equal(r, "3.3.3.3", actual[0].Service.Address)
-		require.Equal(r, 0, actual[0].Service.Weights.Passing)
-		require.Equal(r, "foo", actual[1].Service.Service)
-		require.Equal(r, "4.4.4.4", actual[1].Service.Address)
-		require.Equal(r, 0, actual[1].Service.Weights.Passing)
-		require.NotEqual(r, actual[0].Service.ID, actual[1].Service.ID)
-	})
-}
+	cases := map[string]struct {
+		Weight         string
+		ExtectedWeight int
+	}{
+		"external-IP": {
+			Weight:         "22",
+			ExtectedWeight: 22,
+		},
+		"non-int-weight": {
+			Weight:         "non-int",
+			ExtectedWeight: 0,
+		},
+		"one-weight": {
+			Weight:         "1",
+			ExtectedWeight: 0,
+		},
+		"zero-weight": {
+			Weight:         "0",
+			ExtectedWeight: 0,
+		},
+		"greater-than-100-is-allowed": {
+			Weight:         "1000",
+			ExtectedWeight: 1000,
+		},
+	}
 
-func TestServiceWeight_nonIntWeight(t *testing.T) {
-	t.Parallel()
-	client := fake.NewSimpleClientset()
-	syncer := newTestSyncer()
-	serviceResource := defaultServiceResource(client, syncer)
+	for name, c := range cases {
+		t.Run(name, func(tt *testing.T) {
+			client := fake.NewSimpleClientset()
+			syncer := newTestSyncer()
+			serviceResource := defaultServiceResource(client, syncer)
 
-	// Start the controller
-	closer := controller.TestControllerRun(&serviceResource)
-	defer closer()
+			// Start the controller
+			closer := controller.TestControllerRun(&serviceResource)
+			defer closer()
 
-	// Insert an LB service
-	svc := lbService("foo", metav1.NamespaceDefault, "1.2.3.4")
-	svc.Annotations[annotationServiceWeight] = "non-int"
-	svc.Spec.ExternalIPs = []string{"3.3.3.3", "4.4.4.4"}
+			// Insert an LB service
+			svc := lbService("foo", metav1.NamespaceDefault, "1.2.3.4")
+			svc.Annotations[annotationServiceWeight] = c.Weight
+			svc.Spec.ExternalIPs = []string{"3.3.3.3", "4.4.4.4"}
 
-	_, err := client.CoreV1().Services(metav1.NamespaceDefault).Create(context.Background(), svc, metav1.CreateOptions{})
-	require.NoError(t, err)
+			_, err := client.CoreV1().Services(metav1.NamespaceDefault).Create(context.Background(), svc, metav1.CreateOptions{})
+			require.NoError(tt, err)
 
-	// Verify what we got
-	retry.Run(t, func(r *retry.R) {
-		syncer.Lock()
-		defer syncer.Unlock()
-		actual := syncer.Registrations
-		require.Len(r, actual, 2)
-		require.Equal(r, "foo", actual[0].Service.Service)
-		require.Equal(r, "3.3.3.3", actual[0].Service.Address)
-		require.Equal(r, 0, actual[0].Service.Weights.Passing)
-		require.Equal(r, "foo", actual[1].Service.Service)
-		require.Equal(r, "4.4.4.4", actual[1].Service.Address)
-		require.Equal(r, 0, actual[1].Service.Weights.Passing)
-		require.NotEqual(r, actual[0].Service.ID, actual[1].Service.ID)
-	})
+			// Verify what we got
+			retry.Run(tt, func(r *retry.R) {
+				syncer.Lock()
+				defer syncer.Unlock()
+				actual := syncer.Registrations
+				require.Len(r, actual, 2)
+				require.Equal(r, "foo", actual[0].Service.Service)
+				require.Equal(r, "3.3.3.3", actual[0].Service.Address)
+				require.Equal(r, c.ExtectedWeight, actual[0].Service.Weights.Passing)
+				require.Equal(r, "foo", actual[1].Service.Service)
+				require.Equal(r, "4.4.4.4", actual[1].Service.Address)
+				require.Equal(r, c.ExtectedWeight, actual[1].Service.Weights.Passing)
+				require.NotEqual(r, actual[0].Service.ID, actual[1].Service.ID)
+			})
+		})
+	}
 }
 
 // Test that we're default enabled.