@@ -2372,89 +2372,89 @@ func TestReconcileInClusterSAToken(t *testing.T) {
23722372
23732373 for _ , tc := range testCases {
23742374 t .Run (tc .name , func (t * testing.T ) {
2375- ctrl := & promClientController {
2376- currentPrometheusAuthToken : tc .currentAuthToken ,
2377- metricsProviders : map [api.MetricsSource ]* api.MetricsProvider {
2378- api .PrometheusMetrics : {
2379- Source : api .PrometheusMetrics ,
2380- Prometheus : & api.Prometheus {
2381- URL : prometheusURL ,
2375+ ctrl := & promClientController {
2376+ currentPrometheusAuthToken : tc .currentAuthToken ,
2377+ metricsProviders : map [api.MetricsSource ]* api.MetricsProvider {
2378+ api .PrometheusMetrics : {
2379+ Source : api .PrometheusMetrics ,
2380+ Prometheus : & api.Prometheus {
2381+ URL : prometheusURL ,
2382+ },
2383+ },
23822384 },
2383- },
2384- },
2385- inClusterConfig : tc .inClusterConfigFunc ,
2386- }
2385+ inClusterConfig : tc .inClusterConfigFunc ,
2386+ }
23872387
2388- // Set previous transport and client if test expects them to be cleared
2389- if tc .expectPreviousTransportCleared {
2390- ctrl .previousPrometheusClientTransport = & http.Transport {}
2391- }
2392- if tc .expectPromClientCleared {
2393- ctrl .promClient = & mockPrometheusClient {name : "old-client" }
2394- }
2388+ // Set previous transport and client if test expects them to be cleared
2389+ if tc .expectPreviousTransportCleared {
2390+ ctrl .previousPrometheusClientTransport = & http.Transport {}
2391+ }
2392+ if tc .expectPromClientCleared {
2393+ ctrl .promClient = & mockPrometheusClient {name : "old-client" }
2394+ }
23952395
2396- // Mock createPrometheusClient
2397- clientCreated := false
2398- if tc .createPrometheusClientFunc != nil {
2399- ctrl .createPrometheusClient = func (url , token string ) (promapi.Client , * http.Transport , error ) {
2400- client , transport , err := tc .createPrometheusClientFunc (url , token )
2401- if err == nil {
2402- clientCreated = true
2396+ // Mock createPrometheusClient
2397+ clientCreated := false
2398+ if tc .createPrometheusClientFunc != nil {
2399+ ctrl .createPrometheusClient = func (url , token string ) (promapi.Client , * http.Transport , error ) {
2400+ client , transport , err := tc .createPrometheusClientFunc (url , token )
2401+ if err == nil {
2402+ clientCreated = true
2403+ }
2404+ return client , transport , err
2405+ }
24032406 }
2404- return client , transport , err
2405- }
2406- }
24072407
2408- // Call reconcileInClusterSAToken
2409- err := ctrl .reconcileInClusterSAToken ()
2408+ // Call reconcileInClusterSAToken
2409+ err := ctrl .reconcileInClusterSAToken ()
24102410
2411- // Verify error expectations
2412- if tc .expectedErr != nil {
2413- if err == nil {
2414- t .Errorf ("Expected error %q but got none" , tc .expectedErr )
2415- } else if err .Error () != tc .expectedErr .Error () {
2416- t .Errorf ("Expected error %q but got %q" , tc .expectedErr , err .Error ())
2417- }
2418- } else {
2419- if err != nil {
2420- t .Errorf ("Expected no error but got: %v" , err )
2421- }
2422- }
2423-
2424- // Verify client creation expectations
2425- if tc .expectClientCreated && ! clientCreated {
2426- t .Errorf ("Expected prometheus client to be created but it wasn't" )
2427- }
2428- if ! tc .expectClientCreated && clientCreated {
2429- t .Errorf ("Expected prometheus client not to be created but it was" )
2430- }
2411+ // Verify error expectations
2412+ if tc .expectedErr != nil {
2413+ if err == nil {
2414+ t .Errorf ("Expected error %q but got none" , tc .expectedErr )
2415+ } else if err .Error () != tc .expectedErr .Error () {
2416+ t .Errorf ("Expected error %q but got %q" , tc .expectedErr , err .Error ())
2417+ }
2418+ } else {
2419+ if err != nil {
2420+ t .Errorf ("Expected no error but got: %v" , err )
2421+ }
2422+ }
24312423
2432- // Verify token expectations
2433- if ctrl .currentPrometheusAuthToken != tc .expectCurrentToken {
2434- t .Errorf ("Expected current token to be %q but got %q" , tc .expectCurrentToken , ctrl .currentPrometheusAuthToken )
2435- }
2424+ // Verify client creation expectations
2425+ if tc .expectClientCreated && ! clientCreated {
2426+ t .Errorf ("Expected prometheus client to be created but it wasn't" )
2427+ }
2428+ if ! tc .expectClientCreated && clientCreated {
2429+ t .Errorf ("Expected prometheus client not to be created but it was" )
2430+ }
24362431
2437- // Verify previous transport cleared when expected
2438- if tc .expectPreviousTransportCleared {
2439- if tc .expectClientCreated {
2440- // Success case: new transport should be set
2441- if ctrl .previousPrometheusClientTransport == nil {
2442- t .Error ("Expected previous transport to be set to new transport, but it was nil" )
2432+ // Verify token expectations
2433+ if ctrl .currentPrometheusAuthToken != tc .expectCurrentToken {
2434+ t .Errorf ("Expected current token to be %q but got %q" , tc .expectCurrentToken , ctrl .currentPrometheusAuthToken )
24432435 }
2444- } else if tc .expectedErr != nil {
2445- // Failure case: transport should be nil
2446- if ctrl .previousPrometheusClientTransport != nil {
2447- t .Error ("Expected previous transport to be cleared on error, but it was set" )
2436+
2437+ // Verify previous transport cleared when expected
2438+ if tc .expectPreviousTransportCleared {
2439+ if tc .expectClientCreated {
2440+ // Success case: new transport should be set
2441+ if ctrl .previousPrometheusClientTransport == nil {
2442+ t .Error ("Expected previous transport to be set to new transport, but it was nil" )
2443+ }
2444+ } else if tc .expectedErr != nil {
2445+ // Failure case: transport should be nil
2446+ if ctrl .previousPrometheusClientTransport != nil {
2447+ t .Error ("Expected previous transport to be cleared on error, but it was set" )
2448+ }
2449+ }
24482450 }
2449- }
2450- }
24512451
2452- // Verify promClient cleared when expected
2453- if tc .expectPromClientCleared {
2454- if ctrl .promClient != nil {
2455- t .Error ("Expected promClient to be cleared, but it was set" )
2456- }
2457- }
2452+ // Verify promClient cleared when expected
2453+ if tc .expectPromClientCleared {
2454+ if ctrl .promClient != nil {
2455+ t .Error ("Expected promClient to be cleared, but it was set" )
2456+ }
2457+ }
24582458 })
24592459 }
24602460}
0 commit comments