adjust code according to suggestions

Signed-off-by: chengzw <[email protected]>
antrea-io · Aug 26, 2023 · 94e819d · 94e819d
1 parent 1a73d44
commit 94e819d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/pkg/agent/apiserver/handlers/featuregates/handler_test.go b/pkg/agent/apiserver/handlers/featuregates/handler_test.go
@@ -46,9 +46,9 @@ func TestHandleFunc(t *testing.T) {
 	require.Nil(t, err)
 
 	for _, v := range resp {
-		if df, ok := features.DefaultAntreaFeatureGates[featuregate.Feature(v.Name)]; ok {
-			assert.Equal(t, v.Status, getStatus(df.Default))
-			assert.Equal(t, v.Version, string(df.PreRelease))
-		}
+		df, ok := features.DefaultAntreaFeatureGates[featuregate.Feature(v.Name)]
+		require.True(t, ok)
+		assert.Equal(t, v.Status, getStatus(df.Default))
+		assert.Equal(t, v.Version, string(df.PreRelease))
 	}
 }
diff --git a/pkg/antctl/raw/featuregates/command.go b/pkg/antctl/raw/featuregates/command.go
@@ -171,8 +171,8 @@ func getFeatureGatesRequest(client *rest.RESTClient) ([]featuregates.Response, e
 	return resp, nil
 }
 
-func output(resps []featuregates.Response, runtimeMode string, output io.Writer) {
-	switch runtimeMode {
+func output(resps []featuregates.Response, component string, output io.Writer) {
+	switch component {
 	case featuregates.AgentMode:
 		output.Write([]byte("Antrea Agent Feature Gates\n"))
 	case featuregates.AgentWindowsMode:

diff --git a/pkg/apiserver/handlers/featuregates/handler.go b/pkg/apiserver/handlers/featuregates/handler.go
@@ -70,7 +70,7 @@ func HandleFunc(k8sclient clientset.Interface) http.HandlerFunc {
 		})
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
-			klog.ErrorS(err, "Error when getting antrea-windows config map")
+			klog.ErrorS(err, "Error when listing all Antrea ConfigMaps by label")
 			return
 		}
 		antreaWindowsConfigMaps := []v1.ConfigMap{}

diff --git a/pkg/apiserver/handlers/featuregates/handler_test.go b/pkg/apiserver/handlers/featuregates/handler_test.go
@@ -78,7 +78,7 @@ func Test_getGatesResponse(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := getFeatureGatesResponse(tt.cfg, AgentMode)
-			assert.EqualValues(t, got, tt.want, "The feature gates for Antrea agent is not correct")
+			assert.EqualValues(t, got, tt.want, "The feature gates for Antrea agent are not correct")
 		})
 	}
 }
@@ -114,7 +114,7 @@ func Test_getGatesWindowsResponse(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := getFeatureGatesResponse(tt.cfg, AgentWindowsMode)
-			assert.EqualValues(t, got, tt.want, "The feature gates for Antrea agent windows is not correct")
+			assert.EqualValues(t, got, tt.want, "The feature gates for Antrea agent windows are not correct")
 		})
 	}
 }
@@ -172,10 +172,10 @@ func TestHandleFunc(t *testing.T) {
 	require.Nil(t, err)
 
 	for _, v := range resp {
-		if df, ok := features.DefaultAntreaFeatureGates[featuregate.Feature(v.Name)]; ok {
-			assert.Equal(t, v.Status, getStatus(df.Default))
-			assert.Equal(t, v.Version, string(df.PreRelease))
-		}
+		df, ok := features.DefaultAntreaFeatureGates[featuregate.Feature(v.Name)]
+		require.True(t, ok)
+		assert.Equal(t, v.Status, getStatus(df.Default))
+		assert.Equal(t, v.Version, string(df.PreRelease))
 	}
 }
 
@@ -206,7 +206,7 @@ func Test_getControllerGatesResponse(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := getFeatureGatesResponse(&Config{}, ControllerMode)
-			assert.EqualValues(t, got, tt.want, "The feature gates for Antrea Controller is not correct")
+			assert.EqualValues(t, got, tt.want, "The feature gates for Antrea Controller are not correct")
 		})
 	}
 }