mod: bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#56)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joe Chen <jc@unknwon.io>
flamego · Nov 26, 2024 · c565349 · c565349
1 parent 173ffd4
commit c565349
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 54 deletions.
diff --git a/.github/workflows/lsif.yml b/.github/workflows/lsif.yml
diff --git a/.golangci.yml b/.golangci.yml
@@ -4,18 +4,16 @@ linters-settings:
 
 linters:
   enable:
-    - deadcode
+    - unused
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - typecheck
-    - unused
-    - varcheck
     - nakedret
     - gofmt
     - rowserrcheck
     - unconvert
     - goimports
+    - unparam
diff --git a/csrf.go b/csrf.go
@@ -160,32 +160,28 @@ func Csrfer(opts ...Options) flamego.Handler {
 		opt = opts[0]
 	}
 
-	parseOptions := func(opts Options) Options {
-		if opt.Secret == "" {
-			opt.Secret = string(randomBytes(10))
-		}
+	if opt.Secret == "" {
+		opt.Secret = string(randomBytes(10))
+	}
 
-		if opt.Header == "" {
-			opt.Header = defaultHeader
-		}
+	if opt.Header == "" {
+		opt.Header = defaultHeader
+	}
 
-		if opt.Form == "" {
-			opt.Form = defaultForm
-		}
+	if opt.Form == "" {
+		opt.Form = defaultForm
+	}
 
-		if opt.SessionKey == "" {
-			opt.SessionKey = defaultSessionKey
-		}
+	if opt.SessionKey == "" {
+		opt.SessionKey = defaultSessionKey
+	}
 
-		if opt.ErrorFunc == nil {
-			opt.ErrorFunc = func(w http.ResponseWriter) {
-				http.Error(w, "Bad Request: invalid CSRF token", http.StatusBadRequest)
-			}
+	if opt.ErrorFunc == nil {
+		opt.ErrorFunc = func(w http.ResponseWriter) {
+			http.Error(w, "Bad Request: invalid CSRF token", http.StatusBadRequest)
 		}
-		return opt
 	}
 
-	opt = parseOptions(opt)
 	return csrfInvoker(func(c flamego.Context, s session.Session) {
 		x := &csrf{
 			secret:    opt.Secret,

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/flamego/flamego v1.9.4
 	github.com/flamego/session v1.6.3
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -45,8 +45,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=