Update golangci-lint

go-goyave · Nov 12, 2024 · d603d25 · d603d25
1 parent aded2d6
commit d603d25
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 34 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,5 +40,5 @@ jobs:
       - name: Run lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.61
+          version: v1.62
           args: --timeout 5m
diff --git a/.golangci.yml b/.golangci.yml
@@ -14,6 +14,7 @@ linters-settings:
       - require-error
       - error-nil
       - formatter
+      - encoded-compare
   revive:
     rules:
       - name: var-naming

diff --git a/database/log_test.go b/database/log_test.go
@@ -48,7 +48,7 @@ func TestLogger(t *testing.T) {
 
 		l.Info(context.Background(), "message %d", 1)
 
-		assert.Regexp(t, regexp.MustCompile(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"message 1"}\n`), buf.String())
+		assert.Regexp(t, `{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"message 1"}\n`, buf.String())
 	})
 
 	t.Run("Warn", func(t *testing.T) {
@@ -66,7 +66,7 @@ func TestLogger(t *testing.T) {
 
 		l.Warn(context.Background(), "message %d", 1)
 
-		assert.Regexp(t, regexp.MustCompile(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"WARN","source":{"function":".+","file":".+","line":\d+},"msg":"message 1"}\n`), buf.String())
+		assert.Regexp(t, `{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"WARN","source":{"function":".+","file":".+","line":\d+},"msg":"message 1"}\n`, buf.String())
 	})
 
 	t.Run("Error", func(t *testing.T) {
@@ -84,7 +84,7 @@ func TestLogger(t *testing.T) {
 
 		l.Error(context.Background(), "message %d", 1)
 
-		assert.Regexp(t, regexp.MustCompile(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"message 1"}\n`), buf.String())
+		assert.Regexp(t, `{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"message 1"}\n`, buf.String())
 	})
 
 	t.Run("Trace", func(t *testing.T) {

diff --git a/log/log_test.go b/log/log_test.go
@@ -59,10 +59,10 @@ func TestWriter(t *testing.T) {
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s","details":{"host":"192\.0\.2\.1","username":"-","time":"2020-03-23T13:58:26\.371Z","method":"GET","uri":"/log","proto":"HTTP/1\.1","status":200,"length":13}}\n`,
 				regexp.QuoteMeta(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 13`),
-			)),
+			),
 			buffer.String(),
 		)
 	})
@@ -90,10 +90,10 @@ func TestWriter(t *testing.T) {
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s","details":{"host":"192\.0\.2\.1","username":"-","time":"2020-03-23T13:58:26\.371Z","method":"GET","uri":"/log","proto":"HTTP/1\.1","status":200,"length":13}}\n`,
 				regexp.QuoteMeta(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 13`),
-			)),
+			),
 			buffer.String(),
 		)
 	})
@@ -128,10 +128,10 @@ func TestWriter(t *testing.T) {
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s","details":{"host":"192\.0\.2\.1","username":"-","time":"2020-03-23T13:58:26\.371Z","method":"GET","uri":"/log","proto":"HTTP/1\.1","status":200,"length":13}}\n`,
 				regexp.QuoteMeta(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 13`),
-			)),
+			),
 			buffer.String(),
 		)
 		assert.True(t, child.closed)
@@ -167,10 +167,10 @@ func TestWriter(t *testing.T) {
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s"}\n`, // Same thing but details are omitted
 				regexp.QuoteMeta(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 13`),
-			)),
+			),
 			buffer.String(),
 		)
 		assert.True(t, child.closed)
@@ -192,10 +192,10 @@ func TestMiddleware(t *testing.T) {
 		})
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s","details":{"host":"192\.0\.2\.1","username":"-","time":"2020-03-23T13:58:26\.371Z","method":"GET","uri":"/log","proto":"HTTP/1\.1","status":200,"length":11}}\n`,
 				regexp.QuoteMeta(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 11`),
-			)),
+			),
 			buffer.String(),
 		)
 	})
@@ -214,10 +214,10 @@ func TestMiddleware(t *testing.T) {
 		})
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s"}\n`, // Same thing but details are omitted
 				regexp.QuoteMeta(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 11`),
-			)),
+			),
 			buffer.String(),
 		)
 	})
@@ -244,12 +244,12 @@ func TestMiddleware(t *testing.T) {
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s","details":{"host":"192\.0\.2\.1","username":"-","time":"2020-03-23T13:58:26\.371Z","method":"GET","uri":"/log","proto":"HTTP/1\.1","status":200,"length":11,"referrer":"%s","userAgent":"%s"}}\n`,
 				regexp.QuoteMeta(fmt.Sprintf(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 11 \"%s\" \"%s\"`, referrer, userAgent)),
 				regexp.QuoteMeta(referrer),
 				regexp.QuoteMeta(userAgent),
-			)),
+			),
 			buffer.String(),
 		)
 	})
@@ -275,10 +275,10 @@ func TestMiddleware(t *testing.T) {
 		_ = httpResponse.Body.Close()
 		assert.Equal(t, http.StatusOK, httpResponse.StatusCode)
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"INFO","source":{"function":".+","file":".+","line":\d+},"msg":"%s"}\n`, // Same thing but details are omitted
 				regexp.QuoteMeta(fmt.Sprintf(`192.0.2.1 - - [23/Mar/2020:13:58:26 +0000] \"GET \"/log\" HTTP/1.1\" 200 11 \"%s\" \"%s\"`, referrer, userAgent)),
-			)),
+			),
 			buffer.String(),
 		)
 	})

diff --git a/middleware_test.go b/middleware_test.go
@@ -109,10 +109,10 @@ func TestRecoveryMiddleware(t *testing.T) {
 			return
 		}
 		assert.Equal(t, []error{panicErr}, returnedErr.Unwrap())
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s","trace":%s}\n`,
 				regexp.QuoteMeta(returnedErr.Error()), regexp.QuoteMeta(string(lo.Must(json.Marshal(returnedErr.StackFrames().String())))),
-			)),
+			),
 			logBuffer.String(),
 		)
 		assert.Equal(t, http.StatusInternalServerError, response.status)
@@ -163,10 +163,10 @@ func TestRecoveryMiddleware(t *testing.T) {
 			return
 		}
 		assert.Equal(t, []error{&runtime.PanicNilError{}}, returnedErr.Unwrap())
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s","trace":%s}\n`,
 				regexp.QuoteMeta(returnedErr.Error()), regexp.QuoteMeta(string(lo.Must(json.Marshal(returnedErr.StackFrames().String())))),
-			)),
+			),
 			logBuffer.String(),
 		)
 		assert.Equal(t, http.StatusInternalServerError, response.status)
@@ -197,10 +197,10 @@ func TestRecoveryMiddleware(t *testing.T) {
 			return
 		}
 		assert.Len(t, returnedErr.Unwrap(), 1)
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s","trace":%s}\n`,
 				regexp.QuoteMeta(returnedErr.Error()), regexp.QuoteMeta(string(lo.Must(json.Marshal(returnedErr.StackFrames().String())))),
-			)),
+			),
 			logBuffer.String(),
 		)
 		assert.Equal(t, http.StatusInternalServerError, response.status)

diff --git a/response_test.go b/response_test.go
@@ -364,10 +364,10 @@ func TestResponse(t *testing.T) {
 		}
 		assert.Equal(t, []error{err}, e.Unwrap())
 		assert.Equal(t, http.StatusInternalServerError, resp.status)
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s","trace":%s}\n`,
 				regexp.QuoteMeta(e.Error()), regexp.QuoteMeta(string(lo.Must(json.Marshal(e.StackFrames().String())))),
-			)),
+			),
 			logBuffer.String(),
 		)
 	})
@@ -475,10 +475,10 @@ func TestResponse(t *testing.T) {
 		assert.Equal(t, "application/json; charset=utf-8", res.Header.Get("Content-Type"))
 		assert.Equal(t, "{\"error\":\"custom error\"}\n", string(body))
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s","trace":%s}\n`,
 				regexp.QuoteMeta(e.Error()), regexp.QuoteMeta(string(lo.Must(json.Marshal(e.StackFrames().String())))),
-			)),
+			),
 			logBuffer.String(),
 		)
 	})
@@ -507,10 +507,10 @@ func TestResponse(t *testing.T) {
 		assert.Equal(t, http.StatusForbidden, res.StatusCode)
 		assert.Equal(t, "forbidden", string(body))
 
-		assert.Regexp(t, regexp.MustCompile(
+		assert.Regexp(t,
 			fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s","trace":%s}\n`,
 				regexp.QuoteMeta(e.Error()), regexp.QuoteMeta(string(lo.Must(json.Marshal(e.StackFrames().String())))),
-			)),
+			),
 			logBuffer.String(),
 		)
 	})

diff --git a/server_test.go b/server_test.go
@@ -636,10 +636,10 @@ func TestErrLogWriter(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, len(message), n)
 
-	assert.Regexp(t, regexp.MustCompile(
+	assert.Regexp(t,
 		fmt.Sprintf(`{"time":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{1,9}((\+\d{2}:\d{2})|Z)?","level":"ERROR","source":{"function":".+","file":".+","line":\d+},"msg":"%s"}\n`,
 			regexp.QuoteMeta(message),
-		)),
+		),
 		buf.String(),
 	)
 }