fix: Bump from go 1.18 to 1.23 (#22)

Author: keelerm84

.github/workflows/go-test.yml

@@ -11,9 +11,9 @@ jobs:
     strategy:
       matrix:
         go:
-        - version: '1.18'
+        - version: '1.23'
           run_lint: 'false'
-        - version: '1.19'
+        - version: '1.24'
           run_lint: 'true'
 
     name: Go Test (Linux)

.golangci.yml

@@ -1,51 +1,49 @@
+version: "2"
 run:
-  deadline: 120s
   tests: false
-
 linters:
   enable:
     - bodyclose
-    - deadcode
-    - depguard
     - dupl
-    - errcheck
-    - goconst
     - gochecknoglobals
     - gochecknoinits
     - goconst
     - gocritic
     - gocyclo
     - godox
-    - gofmt
-    - goimports
     - gosec
-    - gosimple
-    - govet
-    - ineffassign
     - lll
-    - megacheck
     - misspell
     - nakedret
     - nolintlint
     - prealloc
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
-    - unused
-    - varcheck
     - whitespace
-  fast: false
-
-linters-settings:
-  gofmt:
-    simplify: false
-  goimports:
-    local-prefixes: gopkg.in/launchdarkly,github.com/launchdarkly
-  
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude-use-default: false
   max-same-issues: 1000
-  max-per-linter: 1000
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      simplify: false
+    goimports:
+      local-prefixes:
+        - gopkg.in/launchdarkly
+        - github.com/launchdarkly
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.ldrelease/config.yml

@@ -2,7 +2,7 @@ version: 2
 
 jobs:
   - docker:
-      image: golang:1.18-buster
+      image: golang:1.23-buster
     template:
       name: go
 

Makefile

@@ -1,5 +1,4 @@
-
-GOLANGCI_LINT_VERSION=v1.48.0
+GOLANGCI_LINT_VERSION=v1.64.5
 
 LINTER=./bin/golangci-lint
 LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)

README.md

@@ -6,7 +6,7 @@ This project centralizes some test support code that is used by LaunchDarkly's G
 
 While this code may be useful in other projects, it is primarily geared toward LaunchDarkly's own development needs and is not meant to provide a large general-purpose framework. It is meant for unit test code and should not be used as a runtime dependency.
 
-This version of the project requires Go 1.18 or higher.
+This version of the project requires Go 1.23 or higher.
 
 ## Contents
 

files.go

@@ -57,6 +57,6 @@ func WithTempDir(f func(path string)) {
 	if err != nil {
 		panic(err)
 	}
-	defer os.RemoveAll(path) //nolint:errcheck
+	defer os.RemoveAll(path)
 	f(path)
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/launchdarkly/go-test-helpers/v3
 
-go 1.18
+go 1.23
 
 require github.com/stretchr/testify v1.5.1
 

httphelpers/certificates.go

@@ -49,7 +49,7 @@ func WithSelfSignedServer(handler http.Handler, action func(*httptest.Server, []
 	if err != nil {
 		panic(fmt.Errorf("can't create self-signed certificate: %s", err))
 	}
-	certData, err := os.ReadFile(certFilePath) //nolint:gosec
+	certData, err := os.ReadFile(certFilePath)
 	if err != nil {
 		panic(fmt.Errorf("can't read self-signed certificate: %s", err))
 	}
@@ -132,7 +132,7 @@ func MakeSelfSignedCert(certFilePath, keyFilePath string) error {
 		return err
 	}
 
-	certOut, err := os.Create(certFilePath) //nolint:gosec
+	certOut, err := os.Create(certFilePath)
 	if err != nil {
 		return err
 	}
@@ -143,7 +143,7 @@ func MakeSelfSignedCert(certFilePath, keyFilePath string) error {
 		return err
 	}
 
-	keyOut, err := os.OpenFile(keyFilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) //nolint:gosec
+	keyOut, err := os.OpenFile(keyFilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
 		return err
 	}
@@ -160,7 +160,7 @@ func MakeSelfSignedCert(certFilePath, keyFilePath string) error {
 	return nil
 }
 
-func pemBlockForKey(priv interface{}) (*pem.Block, error) {
+func pemBlockForKey(priv any) (*pem.Block, error) {
 	switch k := priv.(type) {
 	case *rsa.PrivateKey:
 		return &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(k)}, nil
@@ -175,7 +175,7 @@ func pemBlockForKey(priv interface{}) (*pem.Block, error) {
 	}
 }
 
-func publicKey(priv interface{}) interface{} {
+func publicKey(priv any) any {
 	switch k := priv.(type) {
 	case *rsa.PrivateKey:
 		return &k.PublicKey

httphelpers/handlers.go

@@ -88,8 +88,8 @@ func HandlerForPathRegex(pathRegex string, handlerForPath http.Handler, defaultH
 
 // HandlerWithJSONResponse creates an HTTP handler that returns a 200 status and the JSON encoding of
 // the specified object.
-func HandlerWithJSONResponse(contentToEncode interface{}, additionalHeaders http.Header) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+func HandlerWithJSONResponse(contentToEncode any, additionalHeaders http.Header) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		bytes, err := json.Marshal(contentToEncode)
 		if err != nil {
 			log.Printf("error encoding JSON response: %s", err)
@@ -107,7 +107,7 @@ func HandlerWithJSONResponse(contentToEncode interface{}, additionalHeaders http
 
 // HandlerWithResponse creates an HTTP handler that always returns the same status code, headers, and body.
 func HandlerWithResponse(status int, headers http.Header, body []byte) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		for k, vv := range headers {
 			w.Header()[k] = vv
 		}
@@ -120,7 +120,7 @@ func HandlerWithResponse(status int, headers http.Header, body []byte) http.Hand
 
 // HandlerWithStatus creates an HTTP handler that always returns the same status code.
 func HandlerWithStatus(status int) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(status)
 	})
 }
@@ -174,7 +174,7 @@ func SequentialHandler(firstHandler http.Handler, remainingHandlers ...http.Hand
 //	client := NewClientFromHandler(handler)
 //	// All requests made with this client will return an error
 func BrokenConnectionHandler() http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		if _, ok := w.(*httptest.ResponseRecorder); ok {
 			panic("httphelpers.BrokenConnectionHandler cannot be used with a ResponseRecorder")
 		}

httphelpers/handlers_streaming.go

@@ -157,7 +157,7 @@ func (s *chunkedStreamingHandlerImpl) removeChannel(channelToRemove chan []byte)
 	// This is called when the client closed the connection.
 	go func() {
 		// Consume anything else that gets sent on this channel, until it's closed, to avoid deadlock
-		for range channelToRemove {
+		for range channelToRemove { //nolint:revive // Intentionally draining the channel
 		}
 	}()
 
@@ -176,7 +176,7 @@ func (s *chunkedStreamingHandlerImpl) removeChannel(channelToRemove chan []byte)
 	close(channelToRemove)
 }
 
-func (s *chunkedStreamingHandlerImpl) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (s *chunkedStreamingHandlerImpl) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
 	flusher, ok := w.(http.Flusher)
 	if !ok {
 		log.Println("httphelpers.ChunkedStreamingHandler can't be used with a ResponseWriter that does not support Flush")