Simplify test setup

rancher · Jun 28, 2024 · 114bf38 · 114bf38
1 parent 7698d0e
commit 114bf38
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/pkg/resources/management.cattle.io/v3/setting/agent_tls_mode_test.go b/pkg/resources/management.cattle.io/v3/setting/agent_tls_mode_test.go
@@ -19,9 +19,6 @@ import (
 
 func TestValidateAgentTLSMode(t *testing.T) {
 	t.Parallel()
-	type testState struct {
-		clusterCache *fake.MockNonNamespacedCacheInterface[*v3.Cluster]
-	}
 	tests := map[string]struct {
 		oldSetting         v3.Setting
 		newSetting         v3.Setting
@@ -278,17 +275,15 @@ func TestValidateAgentTLSMode(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 			ctrl := gomock.NewController(t)
-			state := testState{
-				clusterCache: fake.NewMockNonNamespacedCacheInterface[*v3.Cluster](ctrl),
-			}
+			clusterCache := fake.NewMockNonNamespacedCacheInterface[*v3.Cluster](ctrl)
 			_, force := tc.newSetting.Annotations["cattle.io/force"]
 			if tc.operation == admissionv1.Update && !force && len(tc.clusters) > 0 {
-				state.clusterCache.EXPECT().List(gomock.Any()).Return(tc.clusters, nil)
+				clusterCache.EXPECT().List(gomock.Any()).Return(tc.clusters, nil)
 			}
 			if tc.clusterListerFails {
-				state.clusterCache.EXPECT().List(gomock.Any()).Return(tc.clusters, errors.New("some error"))
+				clusterCache.EXPECT().List(gomock.Any()).Return(tc.clusters, errors.New("some error"))
 			}
-			v := NewValidator(state.clusterCache)
+			v := NewValidator(clusterCache)
 			admitters := v.Admitters()
 			require.Len(t, admitters, 1)