chore: fix linter issues

.golangci.yml

@@ -19,7 +19,9 @@ linters:
   - govet
   - importas
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
+  - unused
   - misspell
   - nakedret
   - nilerr

cmd/common.go

@@ -515,11 +515,11 @@ func checkForRBACResources(content reconcilerUtils.KongRawState,
 		common := "At a time, state file(s) must entirely consist of either proxy " +
 			"configuration or RBAC configuration."
 		if rbacResourcesOnly {
-			return fmt.Errorf("When --rbac-resources-only is used, state file(s) " +
-				"cannot contain any resources other than RBAC resources. " + common)
+			return fmt.Errorf("when --rbac-resources-only is used, state file(s) "+
+				"cannot contain any resources other than RBAC resources. %s", common)
 		}
-		return fmt.Errorf("State file(s) contains RBAC resources. " +
-			"Please use --rbac-resources-only flag to manage these resources. " + common)
+		return fmt.Errorf("state file(s) contains RBAC resources. "+
+			"Please use --rbac-resources-only flag to manage these resources. %s", common)
 	}
 	return nil
 }

kong2kic/writer.go

@@ -36,7 +36,7 @@ func WriteContentToFile(content *file.Content, filename string, format file.Form
 			return err
 		}
 	default:
-		return fmt.Errorf("unknown file format: " + string(format))
+		return fmt.Errorf("unknown file format: %s", format)
 	}
 
 	if filename == "-" {

tests/integration/lint_test.go

@@ -157,7 +157,7 @@ func Test_LintStructured(t *testing.T) {
 				cmpopts.EquateEmpty(),
 			}
 			if diff := cmp.Diff(outputErrors, expectedErrors, cmpOpts...); diff != "" {
-				t.Errorf(diff)
+				t.Errorf("got unexpected diff\n:%s", diff)
 			}
 		})
 	}

tests/integration/reset_test.go

@@ -39,9 +39,7 @@ u8S6yNlu2Q==
 func Test_Reset_SkipCACert_2x(t *testing.T) {
 	// setup stage
 	client, err := getTestClient()
-	if err != nil {
-		t.Errorf(err.Error())
-	}
+	require.NoError(t, err)
 
 	tests := []struct {
 		name          string
@@ -75,9 +73,7 @@ func Test_Reset_SkipCACert_2x(t *testing.T) {
 func Test_Reset_SkipCACert_3x(t *testing.T) {
 	// setup stage
 	client, err := getTestClient()
-	if err != nil {
-		t.Errorf(err.Error())
-	}
+	require.NoError(t, err)
 
 	tests := []struct {
 		name          string
@@ -113,9 +109,7 @@ func Test_Reset_ConsumerGroupConsumersWithCustomID(t *testing.T) {
 	setup(t)
 
 	client, err := getTestClient()
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
+	require.NoError(t, err)
 
 	require.NoError(t, sync("testdata/sync/028-consumer-group-consumers-custom_id/kong.yaml"))
 	reset(t)