build: update to go 1.25 and golanci-lint 2.5.0

related to edgexfoundry/edgex-go#5302

Also fixes all errors as reported by golanci-lint 2.5.0

Signed-off-by: Jude Hung <[email protected]>

Author: judehung

.golangci.yml

@@ -1,10 +1,22 @@
+version: "2"
 linters:
-  disable:
   enable:
     - gosec
-linters-settings:
-  gosec:
-    excludes:
-      # G115: integer overflow conversion
-      # exclude the rule since it tends to be false positive
-      - G115
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Jenkinsfile

@@ -16,5 +16,5 @@
 
 edgeXBuildGoMod (
     project: 'go-mod-core-contracts',
-    goVersion: '1.23'
-)
+    goVersion: '1.25'
+)

Makefile

@@ -14,7 +14,7 @@ lint:
 	@if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi
 
 install-lint:
-	sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.61.0
+	sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v2.5.0
 
 test: unittest lint
 	$(GO) vet ./...

README.md

@@ -11,7 +11,7 @@ The default encoding for the models is JSON, although in at least one case --
 YAML encoding is also supported since a device profile is defined as a YAML document.
 
 ### Installation ###
-* Make sure you're using at least Go 1.11.1 (EdgeX currently uses Go 1.17.x) and have modules enabled, i.e. have an initialized  go.mod file 
+* Make sure you're using at least Go 1.25.0 and have modules enabled, i.e. have an initialized  go.mod file 
 * If your code is in your GOPATH then make sure ```GO111MODULE=on``` is set
 * Run ```go get github.com/edgexfoundry/go-mod-core-contracts```
     * This will add the go-mod-core-contracts to the go.mod file and download it into the module cache

clients/http/authinjector_test.go

@@ -19,12 +19,12 @@ func NewNullAuthenticationInjector() interfaces.AuthenticationInjector {
 	return &emptyAuthenticationInjector{}
 }
 
-func (_ *emptyAuthenticationInjector) AddAuthenticationData(_ *http.Request) error {
+func (*emptyAuthenticationInjector) AddAuthenticationData(_ *http.Request) error {
 	// Do nothing to the request; used for unit tests
 	return nil
 }
 
-func (_ *emptyAuthenticationInjector) RoundTripper() http.RoundTripper {
+func (*emptyAuthenticationInjector) RoundTripper() http.RoundTripper {
 	// Do nothing to the request; used for unit tests
 	return nil
 }

clients/http/utils/common.go

@@ -189,7 +189,7 @@ func CreateRequestFromFilePath(ctx context.Context, httpMethod string, baseUrl s
 		return nil, errors.NewCommonEdgeX(errors.KindServerError, "failed to parse baseUrl and requestPath", err)
 	}
 
-	fileContents, err := os.ReadFile(filePath)
+	fileContents, err := os.ReadFile(filePath) // #nosec G304 -- filePath is controlled and safe to be read
 	if err != nil {
 		return nil, errors.NewCommonEdgeX(errors.KindIOError, fmt.Sprintf("fail to read file from %s", filePath), err)
 	}
@@ -204,7 +204,10 @@ func CreateRequestFromFilePath(ctx context.Context, httpMethod string, baseUrl s
 	if err != nil {
 		return nil, errors.NewCommonEdgeX(errors.KindIOError, "fail to copy file to form data", err)
 	}
-	writer.Close()
+	err = writer.Close()
+	if err != nil {
+		return nil, errors.NewCommonEdgeX(errors.KindIOError, "fail to close multipart writer", err)
+	}
 
 	req, err := http.NewRequest(httpMethod, u.String(), body)
 	if err != nil {
@@ -222,7 +225,9 @@ func SendRequest(ctx context.Context, req *http.Request, authInjector interfaces
 	if err != nil {
 		return nil, errors.NewCommonEdgeXWrapper(err)
 	}
-	defer resp.Body.Close()
+	defer func(Body io.ReadCloser) {
+		_ = Body.Close()
+	}(resp.Body)
 
 	bodyBytes, err := getBody(resp)
 	if err != nil {

clients/http/utils/common_test.go

@@ -98,7 +98,9 @@ func TestCreateRequestFromFilePath(t *testing.T) {
 	requestPathWithSlash := "/test-path"
 	f, err := os.CreateTemp("", "sample")
 	assert.NoError(t, err)
-	defer os.Remove(f.Name())
+	defer func(name string) {
+		_ = os.Remove(name)
+	}(f.Name())
 
 	tests := []struct {
 		name        string

clients/http/utils/request.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -39,7 +40,9 @@ func GetRequestAndReturnBinaryRes(ctx context.Context, baseUrl string, requestPa
 	if edgeXerr != nil {
 		return nil, "", errors.NewCommonEdgeXWrapper(edgeXerr)
 	}
-	defer resp.Body.Close()
+	defer func(Body io.ReadCloser) {
+		_ = Body.Close()
+	}(resp.Body)
 
 	res, edgeXerr = getBody(resp)
 	if edgeXerr != nil {

common/utils.go

@@ -44,11 +44,11 @@ func BuildTopic(parts ...string) string {
 // URLEncode encodes the input string with additional common character support
 func URLEncode(s string) string {
 	res := url.PathEscape(s)
-	res = strings.Replace(res, "+", "%2B", -1) // MQTT topic reserved char
-	res = strings.Replace(res, "-", "%2D", -1)
-	res = strings.Replace(res, ".", "%2E", -1) // RegexCmd and Redis topic reserved char
-	res = strings.Replace(res, "_", "%5F", -1)
-	res = strings.Replace(res, "~", "%7E", -1)
+	res = strings.ReplaceAll(res, "+", "%2B") // MQTT topic reserved char
+	res = strings.ReplaceAll(res, "-", "%2D")
+	res = strings.ReplaceAll(res, ".", "%2E") // RegexCmd and Redis topic reserved char
+	res = strings.ReplaceAll(res, "_", "%5F")
+	res = strings.ReplaceAll(res, "~", "%7E")
 
 	return res
 }

dtos/address.go

@@ -166,9 +166,9 @@ func ToAddressModel(a Address) models.Address {
 			BaseAddress: models.BaseAddress{
 				Type: a.Type, Host: a.Host, Port: a.Port, Scheme: a.Scheme,
 			},
-			Path:            a.RESTAddress.Path,
-			HTTPMethod:      a.RESTAddress.HTTPMethod,
-			InjectEdgeXAuth: a.RESTAddress.InjectEdgeXAuth,
+			Path:            a.Path,
+			HTTPMethod:      a.HTTPMethod,
+			InjectEdgeXAuth: a.InjectEdgeXAuth,
 		}
 	case common.MQTT:
 		address = models.MQTTPubAddress{
@@ -181,7 +181,7 @@ func ToAddressModel(a Address) models.Address {
 				SkipCertVerify: a.SkipCertVerify,
 			},
 			MessageBus:     models.MessageBus{Topic: a.Topic},
-			Publisher:      a.MQTTPubAddress.Publisher,
+			Publisher:      a.Publisher,
 			QoS:            a.QoS,
 			KeepAlive:      a.KeepAlive,
 			Retained:       a.Retained,
@@ -200,7 +200,7 @@ func ToAddressModel(a Address) models.Address {
 			BaseAddress: models.BaseAddress{
 				Type: a.Type,
 			},
-			Recipients: a.EmailAddress.Recipients,
+			Recipients: a.Recipients,
 		}
 	}
 	return address