fix lint

apache · Jul 12, 2024 · 4766471 · 4766471
1 parent 2676127
commit 4766471
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/pkg/admission/admission_controller_test.go b/pkg/admission/admission_controller_test.go
@@ -114,9 +114,9 @@ func TestUpdateLabels(t *testing.T) {
 	patch = c.updateLabels("default", pod, patch)
 
 	assert.Equal(t, len(patch), 1)
-	assert.Equal(t, patch[0].Op, "add")
-	assert.Equal(t, patch[0].Path, "/metadata/labels")
-	if updatedMap, ok := patch[0].Value.(map[string]string); ok {
+	assert.Equal(t, patch[0].Op, "add")                           //nolint:gosec
+	assert.Equal(t, patch[0].Path, "/metadata/labels")            //nolint:gosec
+	if updatedMap, ok := patch[0].Value.(map[string]string); ok { //nolint:gosec
 		assert.Equal(t, len(updatedMap), 3)
 		assert.Equal(t, updatedMap["random"], "random")
 		assert.Equal(t, updatedMap[constants.CanonicalLabelApplicationID], "app-0001")
@@ -151,9 +151,9 @@ func TestUpdateLabels(t *testing.T) {
 	patch = c.updateLabels("default", pod, patch)
 
 	assert.Equal(t, len(patch), 1)
-	assert.Equal(t, patch[0].Op, "add")
-	assert.Equal(t, patch[0].Path, "/metadata/labels")
-	if updatedMap, ok := patch[0].Value.(map[string]string); ok {
+	assert.Equal(t, patch[0].Op, "add")                           //nolint:gosec
+	assert.Equal(t, patch[0].Path, "/metadata/labels")            //nolint:gosec
+	if updatedMap, ok := patch[0].Value.(map[string]string); ok { //nolint:gosec
 		assert.Equal(t, len(updatedMap), 5)
 		assert.Equal(t, updatedMap["random"], "random")
 		assert.Equal(t, updatedMap[constants.CanonicalLabelQueueName], "root.abc")
@@ -185,9 +185,9 @@ func TestUpdateLabels(t *testing.T) {
 	patch = c.updateLabels("default", pod, patch)
 
 	assert.Equal(t, len(patch), 1)
-	assert.Equal(t, patch[0].Op, "add")
-	assert.Equal(t, patch[0].Path, "/metadata/labels")
-	if updatedMap, ok := patch[0].Value.(map[string]string); ok {
+	assert.Equal(t, patch[0].Op, "add")                           //nolint:gosec
+	assert.Equal(t, patch[0].Path, "/metadata/labels")            //nolint:gosec
+	if updatedMap, ok := patch[0].Value.(map[string]string); ok { //nolint:gosec
 		assert.Equal(t, len(updatedMap), 2)
 		assert.Equal(t, strings.HasPrefix(updatedMap[constants.CanonicalLabelApplicationID], constants.AutoGenAppPrefix), true)
 		assert.Equal(t, strings.HasPrefix(updatedMap[constants.LabelApplicationID], constants.AutoGenAppPrefix), true)
@@ -213,9 +213,9 @@ func TestUpdateLabels(t *testing.T) {
 	patch = c.updateLabels("default", pod, patch)
 
 	assert.Equal(t, len(patch), 1)
-	assert.Equal(t, patch[0].Op, "add")
-	assert.Equal(t, patch[0].Path, "/metadata/labels")
-	if updatedMap, ok := patch[0].Value.(map[string]string); ok {
+	assert.Equal(t, patch[0].Op, "add")                           //nolint:gosec
+	assert.Equal(t, patch[0].Path, "/metadata/labels")            //nolint:gosec
+	if updatedMap, ok := patch[0].Value.(map[string]string); ok { //nolint:gosec
 		assert.Equal(t, len(updatedMap), 2)
 		assert.Equal(t, strings.HasPrefix(updatedMap[constants.CanonicalLabelApplicationID], constants.AutoGenAppPrefix), true)
 		assert.Equal(t, strings.HasPrefix(updatedMap[constants.LabelApplicationID], constants.AutoGenAppPrefix), true)
@@ -239,9 +239,9 @@ func TestUpdateLabels(t *testing.T) {
 	patch = c.updateLabels("default", pod, patch)
 
 	assert.Equal(t, len(patch), 1)
-	assert.Equal(t, patch[0].Op, "add")
-	assert.Equal(t, patch[0].Path, "/metadata/labels")
-	if updatedMap, ok := patch[0].Value.(map[string]string); ok {
+	assert.Equal(t, patch[0].Op, "add")                           //nolint:gosec
+	assert.Equal(t, patch[0].Path, "/metadata/labels")            //nolint:gosec
+	if updatedMap, ok := patch[0].Value.(map[string]string); ok { //nolint:gosec
 		assert.Equal(t, len(updatedMap), 2)
 		assert.Equal(t, strings.HasPrefix(updatedMap[constants.CanonicalLabelApplicationID], constants.AutoGenAppPrefix), true)
 		assert.Equal(t, strings.HasPrefix(updatedMap[constants.LabelApplicationID], constants.AutoGenAppPrefix), true)

diff --git a/pkg/common/utils/utils_test.go b/pkg/common/utils/utils_test.go
@@ -510,6 +510,7 @@ func TestPodUnderCondition(t *testing.T) {
 	assert.Equal(t, PodUnderCondition(pod, condition), false)
 }
 
+// nolint: funlen
 func TestGetApplicationIDFromPod(t *testing.T) {
 	defer SetPluginMode(false)
 	defer func() { conf.GetSchedulerConf().GenerateUniqueAppIds = false }()