Disabled revive linter

ansible · Mar 1, 2024 · 107bd0f · 107bd0f
1 parent d002377
commit 107bd0f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -49,7 +49,7 @@ linters:
     # - paralleltest # TODO: missing at some locations
     - prealloc
     - predeclared
-    - revive
+    # - revive
     - rowserrcheck
     - sqlclosecheck
     - staticcheck

diff --git a/pkg/certificates/ca_test.go b/pkg/certificates/ca_test.go
@@ -162,7 +162,7 @@ rydzkVNNVeMVX2TER9yc8AdFqkRlaBWHmO61rYmV+N1quLM0uMVsu55ZNCY=
 			mockRsa := mock_certificates.NewMockRsaer(ctrl)
 
 			mockRsa.EXPECT().GenerateKey(gomock.Any(), gomock.Any()).DoAndReturn(
-				func(random io.Reader, bits int) (*rsa.PrivateKey, error) { //nolint:revive
+				func(random io.Reader, bits int) (*rsa.PrivateKey, error) {
 					return goodCaPrivateKey, nil
 				},
 			)

diff --git a/pkg/controlsvc/controlsvc_test.go b/pkg/controlsvc/controlsvc_test.go
@@ -49,7 +49,7 @@ func TestConnectionListener(t *testing.T) {
 	}
 
 	for _, testCase := range connectionListenerTestCases {
-		t.Run(testCase.name, func(t *testing.T) { //nolint:revive
+		t.Run(testCase.name, func(t *testing.T) {
 			ctx, ctxCancel := context.WithCancel(context.Background())
 			defer ctxCancel()
 
@@ -89,7 +89,7 @@ func TestSetupConnection(t *testing.T) {
 	}
 
 	for _, testCase := range setupConnectionTestCases {
-		t.Run(testCase.name, func(t *testing.T) { //nolint:revive
+		t.Run(testCase.name, func(t *testing.T) {
 			testCase.expectedCalls()
 			s := controlsvc.New(false, mockNetceptor)
 			tlsConn := tls.Client(mockConn, &tls.Config{})
@@ -452,7 +452,7 @@ func TestAddControlFunc(t *testing.T) {
 		{
 			name:  "obliterate command",
 			input: "obliterate",
-			testCase: func(msg string, err error) { //nolint:revive
+			testCase: func(msg string, err error) {
 				if err != nil {
 					t.Errorf("error should be nil. received %s", err)
 				}
@@ -461,7 +461,7 @@ func TestAddControlFunc(t *testing.T) {
 	}
 
 	for _, testCase := range controlFuncTestsCases {
-		t.Run(testCase.name, func(t *testing.T) { //nolint:revive
+		t.Run(testCase.name, func(t *testing.T) {
 			s := controlsvc.New(true, mockNetceptor)
 			err := s.AddControlFunc(testCase.input, mockCtrlCmd)
 			testCase.testCase(testCase.errorMessage, err)
@@ -522,7 +522,7 @@ func TestRunControlSession(t *testing.T) {
 	}
 
 	for _, testCase := range runControlSessionTestCases {
-		t.Run(testCase.name, func(t *testing.T) { //nolint:revive
+		t.Run(testCase.name, func(t *testing.T) {
 			mandatoryExpects()
 			testCase.expectedCalls()
 			s := controlsvc.New(false, mockNetceptor)
@@ -592,7 +592,7 @@ func TestRunControlSessionTwo(t *testing.T) {
 	}
 
 	for _, testCase := range runControlSessionTestCases {
-		t.Run(testCase.name, func(t *testing.T) { //nolint:revive
+		t.Run(testCase.name, func(t *testing.T) {
 			testCase.expectedCalls()
 			s := controlsvc.New(true, mockNetceptor)
 			pipeA, pipeB := net.Pipe()

diff --git a/pkg/controlsvc/reload.go b/pkg/controlsvc/reload.go
@@ -17,7 +17,7 @@ type (
 
 var configPath = ""
 
-var reloadParseAndRun = func(toRun []string) error { //nolint:revive
+var reloadParseAndRun = func(toRun []string) error {
 	return fmt.Errorf("no configuration file was provided, reload function not set")
 }
 

diff --git a/pkg/netceptor/firewall_rules.go b/pkg/netceptor/firewall_rules.go
@@ -131,7 +131,7 @@ func firewallRule(comparers []CompareFunc, action string) (FirewallRuleFunc, err
 		return nil, fmt.Errorf("unknown action: %s", action)
 	}
 	if len(comparers) == 0 {
-		return func(md *MessageData) FirewallResult { //nolint:revive
+		return func(md *MessageData) FirewallResult {
 			return result
 		}, nil
 	}

diff --git a/pkg/netceptor/netceptor.go b/pkg/netceptor/netceptor.go
@@ -1014,7 +1014,7 @@ const (
 func ReceptorVerifyFunc(tlscfg *tls.Config, pinnedFingerprints [][]byte, expectedHostname string,
 	expectedHostnameType ExpectedHostnameType, verifyType VerifyType, logger *logger.ReceptorLogger,
 ) func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
-	return func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error { //nolint:revive
+	return func(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
 		if len(rawCerts) == 0 {
 			logger.Error("RVF failed: peer certificate missing")
 

diff --git a/pkg/netceptor/packetconn_test.go b/pkg/netceptor/packetconn_test.go
@@ -155,7 +155,7 @@ func TestPacketConn(t *testing.T) {
 		{
 			"ReadFrom Error",
 			"",
-			func(ctx context.Context) { //nolint:revive
+			func(ctx context.Context) {
 				newCtx, ctxCancel := context.WithCancel(context.Background())
 				time.AfterFunc(time.Microsecond*200, ctxCancel)
 				mockNetceptorForPacketConn.EXPECT().Context().Return(newCtx)

diff --git a/pkg/netceptor/tlsconfig_test.go b/pkg/netceptor/tlsconfig_test.go
@@ -144,7 +144,7 @@ FdaOLykGKfMCYVBP+xs97IJO8En/5N9QQwc+N4cfCg9/BWoZKHPbRx/V+57VEj0m
 -----END CERTIFICATE-----
 `))
 
-	return tempCertFile, tempCertKey, tempCA, func(t *testing.T) { //nolint:revive
+	return tempCertFile, tempCertKey, tempCA, func(t *testing.T) {
 		defer os.Remove(tempCertFile.Name())
 		defer os.Remove(tempCertKey.Name())
 		defer os.Remove(tempCA.Name())
@@ -162,7 +162,7 @@ func useUtilsSetupSuite(t *testing.T, name string) (string, string, string, func
 		t.Error(err.Error())
 	}
 
-	return ca, certKey, cert, func(t *testing.T) { //nolint:revive
+	return ca, certKey, cert, func(t *testing.T) {
 		defer os.Remove(ca)
 		defer os.Remove(certKey)
 		defer os.Remove(cert)
@@ -179,7 +179,7 @@ func useUtilsSetupSuiteWithGenerateWithCA(t *testing.T, name string) (string, st
 		t.Error(err.Error())
 	}
 
-	return caCert, cert, certKey, func(t *testing.T) { //nolint:revive
+	return caCert, cert, certKey, func(t *testing.T) {
 		defer os.Remove(caCert)
 		defer os.Remove(caKey)
 		defer os.Remove(certKey)

diff --git a/pkg/workceptor/workceptor.go b/pkg/workceptor/workceptor.go
@@ -224,7 +224,7 @@ func (w *Workceptor) VerifySignature(signature string) error {
 	if err != nil {
 		return fmt.Errorf("could not load verifying key file: %s", err.Error())
 	}
-	token, err := jwt.ParseWithClaims(signature, &jwt.RegisteredClaims{}, func(token *jwt.Token) (interface{}, error) { //nolint:revive
+	token, err := jwt.ParseWithClaims(signature, &jwt.RegisteredClaims{}, func(token *jwt.Token) (interface{}, error) {
 		return rsaPublicKey, nil
 	})
 	if err != nil {

diff --git a/pkg/workceptor/workceptor_test.go b/pkg/workceptor/workceptor_test.go
@@ -44,7 +44,7 @@ func TestAllocateUnit(t *testing.T) {
 	logger := logger.NewReceptorLogger("")
 	mockNetceptor.EXPECT().GetLogger().AnyTimes().Return(logger)
 
-	workFunc := func(bwu workceptor.BaseWorkUnitForWorkUnit, w *workceptor.Workceptor, unitID string, workType string) workceptor.WorkUnit { //nolint:revive
+	workFunc := func(bwu workceptor.BaseWorkUnitForWorkUnit, w *workceptor.Workceptor, unitID string, workType string) workceptor.WorkUnit {
 		return mockWorkUnit
 	}
 

diff --git a/pkg/workceptor/workunitbase_test.go b/pkg/workceptor/workunitbase_test.go
@@ -214,7 +214,7 @@ func TestBaseLoad(t *testing.T) {
 func TestBaseUpdateFullStatus(t *testing.T) {
 	ctrl, bwu, w, _ := setUp(t)
 	bwu.Init(w, "test", "", workceptor.FileSystem{}, &workceptor.RealWatcher{})
-	sf := func(sfd *workceptor.StatusFileData) { //nolint:revive
+	sf := func(sfd *workceptor.StatusFileData) {
 		// Do nothing
 	}
 	bwu.UpdateFullStatus(sf)