test(TestPromClientControllerSync_ClientCreation): have prometheus client tests build an entire descheduler as well

Author: ingvagabund

pkg/descheduler/descheduler_test.go

@@ -1968,75 +1968,106 @@ func TestPromClientControllerSync_ClientCreation(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(context.TODO())
-			defer cancel()
-			setup := setupPromClientControllerTest(ctx, tc.objects, newPrometheusConfig())
+			for _, setupMode := range []struct {
+				name    string
+				setupFn func(context.Context, *testing.T, []runtime.Object) *promClientController
+			}{
+				{
+					name: "running with prom reconciler directly",
+					setupFn: func(ctx context.Context, t *testing.T, objects []runtime.Object) *promClientController {
+						setup := setupPromClientControllerTest(ctx, objects, newPrometheusConfig())
+						return setup.ctrl
+					},
+				},
+				{
+					name: "running with full descheduler",
+					setupFn: func(ctx context.Context, t *testing.T, objects []runtime.Object) *promClientController {
+						deschedulerPolicy := &api.DeschedulerPolicy{
+							MetricsProviders: []api.MetricsProvider{
+								{
+									Source:     api.PrometheusMetrics,
+									Prometheus: newPrometheusConfig(),
+								},
+							},
+						}
+						_, descheduler, _, _ := initDescheduler(t, ctx, initFeatureGates(), deschedulerPolicy, nil, false, objects...)
+						return descheduler.promClientCtrl
+					},
+				},
+			} {
+				t.Run(setupMode.name, func(t *testing.T) {
+					ctx, cancel := context.WithCancel(context.TODO())
+					defer cancel()
 
-			// Set additional test-specific fields
-			setup.ctrl.currentPrometheusAuthToken = tc.currentAuthToken
-			if tc.currentAuthToken != "" {
-				setup.ctrl.previousPrometheusClientTransport = &http.Transport{}
-			}
+					ctrl := setupMode.setupFn(ctx, t, tc.objects)
 
-			// Mock createPrometheusClient
-			clientCreated := false
-			if tc.createPrometheusClientFunc != nil {
-				setup.ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
-					client, transport, err := tc.createPrometheusClientFunc(url, token)
-					if err == nil {
-						clientCreated = true
+					// Set additional test-specific fields
+					ctrl.currentPrometheusAuthToken = tc.currentAuthToken
+					if tc.currentAuthToken != "" {
+						ctrl.previousPrometheusClientTransport = &http.Transport{}
 					}
-					return client, transport, err
-				}
-			}
 
-			// Call sync
-			err := setup.ctrl.sync()
+					// Mock createPrometheusClient
+					clientCreated := false
+					if tc.createPrometheusClientFunc != nil {
+						ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
+							client, transport, err := tc.createPrometheusClientFunc(url, token)
+							if err == nil {
+								clientCreated = true
+							}
+							return client, transport, err
+						}
+					}
 
-			// Verify error expectations
-			if tc.expectedErr != nil {
-				if err == nil {
-					t.Errorf("Expected error %q but got none", tc.expectedErr)
-				} else if err.Error() != tc.expectedErr.Error() {
-					t.Errorf("Expected error %q but got %q", tc.expectedErr, err.Error())
-				}
-			} else {
-				if err != nil {
-					t.Errorf("Expected no error but got: %v", err)
-				}
-			}
+					// Call sync
+					err := ctrl.sync()
 
-			// Verify client creation expectations
-			if tc.expectClientCreated && !clientCreated {
-				t.Errorf("Expected prometheus client to be created but it wasn't")
-			}
-			if !tc.expectClientCreated && clientCreated {
-				t.Errorf("Expected prometheus client not to be created but it was")
-			}
+					// Verify error expectations
+					if tc.expectedErr != nil {
+						if err == nil {
+							t.Errorf("Expected error %q but got none", tc.expectedErr)
+						} else if err.Error() != tc.expectedErr.Error() {
+							t.Errorf("Expected error %q but got %q", tc.expectedErr, err.Error())
+						}
+					} else {
+						if err != nil {
+							t.Errorf("Expected no error but got: %v", err)
+						}
+					}
 
-			// Verify token cleared expectations
-			if tc.expectCurrentTokenCleared && setup.ctrl.currentPrometheusAuthToken != "" {
-				t.Errorf("Expected current auth token to be cleared but it wasn't")
-			}
+					// Verify client creation expectations
+					if tc.expectClientCreated && !clientCreated {
+						t.Errorf("Expected prometheus client to be created but it wasn't")
+					}
+					if !tc.expectClientCreated && clientCreated {
+						t.Errorf("Expected prometheus client not to be created but it was")
+					}
 
-			// Verify previous transport cleared expectations
-			if tc.expectPreviousTransportCleared && setup.ctrl.previousPrometheusClientTransport != nil {
-				t.Errorf("Expected previous transport to be cleared but it wasn't")
-			}
+					// Verify token cleared expectations
+					if tc.expectCurrentTokenCleared && ctrl.currentPrometheusAuthToken != "" {
+						t.Errorf("Expected current auth token to be cleared but it wasn't")
+					}
 
-			// Verify promClient cleared when secret not found
-			if tc.expectPreviousTransportCleared && setup.ctrl.promClient != nil {
-				t.Errorf("Expected promClient to be cleared but it wasn't")
-			}
+					// Verify previous transport cleared expectations
+					if tc.expectPreviousTransportCleared && ctrl.previousPrometheusClientTransport != nil {
+						t.Errorf("Expected previous transport to be cleared but it wasn't")
+					}
 
-			// Verify token updated when client created
-			if tc.expectClientCreated && len(tc.objects) > 0 {
-				if secret, ok := tc.objects[0].(*v1.Secret); ok && secret.Data != nil {
-					expectedToken := string(secret.Data[prometheusAuthTokenSecretKey])
-					if setup.ctrl.currentPrometheusAuthToken != expectedToken {
-						t.Errorf("Expected current auth token to be %q but got %q", expectedToken, setup.ctrl.currentPrometheusAuthToken)
+					// Verify promClient cleared when secret not found
+					if tc.expectPreviousTransportCleared && ctrl.promClient != nil {
+						t.Errorf("Expected promClient to be cleared but it wasn't")
 					}
-				}
+
+					// Verify token updated when client created
+					if tc.expectClientCreated && len(tc.objects) > 0 {
+						if secret, ok := tc.objects[0].(*v1.Secret); ok && secret.Data != nil {
+							expectedToken := string(secret.Data[prometheusAuthTokenSecretKey])
+							if ctrl.currentPrometheusAuthToken != expectedToken {
+								t.Errorf("Expected current auth token to be %q but got %q", expectedToken, ctrl.currentPrometheusAuthToken)
+							}
+						}
+					}
+				})
 			}
 		})
 	}