diff --git a/.github/workflows/code.analysis.yml b/.github/workflows/code.analysis.yml index 1b3690b589..b690e9007a 100644 --- a/.github/workflows/code.analysis.yml +++ b/.github/workflows/code.analysis.yml @@ -11,7 +11,7 @@ on: - ".github/workflows/code.analysis.yml" env: - GO_VERSION: "1.23" + GO_VERSION: "1.24" jobs: analysis: diff --git a/.github/workflows/golangci.lint.yml b/.github/workflows/golangci.lint.yml index 8cd91e7233..df2bf64761 100644 --- a/.github/workflows/golangci.lint.yml +++ b/.github/workflows/golangci.lint.yml @@ -9,7 +9,7 @@ on: - ".github/workflows/golangci.lint.yml" env: - GO_VERSION: "1.23" + GO_VERSION: "1.24" jobs: analysis: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fc117a324..ed11f20ab6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: - "v*" env: - GO_VERSION: "1.23" + GO_VERSION: "1.24" permissions: contents: write diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84f7436bb5..27b1f2705b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ on: - ".github/workflows/test.yml" env: - GO_VERSION: "1.23" + GO_VERSION: "1.24" jobs: test-ubuntu: diff --git a/Makefile b/Makefile index b0ab2696fe..d6f44c9754 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ INTEGRATION_TEST_PATH := build/test # Image Name IMAGE_NAME?=megaease/easegress -BUILDER_IMAGE_NAME?=megaease/golang:1.23-alpine +BUILDER_IMAGE_NAME?=megaease/golang:1.24-alpine # Version RELEASE?=v2.9.0 diff --git a/SECURITY.md b/SECURITY.md index 2307d2efb8..5493721cb3 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,9 +6,9 @@ Supported [Go versions](https://go.dev/dl/): | Version | Supported | | ------- | ------------------ | +| 1.25.x | :white_check_mark: | | 1.24.x | :white_check_mark: | -| 1.23.x | :white_check_mark: | -| < 1.23 | :x: | +| < 1.24 | :x: | # Reporting a Vulnerability diff --git a/build/package/Dockerfile.builder b/build/package/Dockerfile.builder index d309c23de1..d02912f87b 100644 --- a/build/package/Dockerfile.builder +++ b/build/package/Dockerfile.builder @@ -1,2 +1,2 @@ -FROM golang:1.23-alpine +FROM golang:1.24-alpine RUN apk --no-cache add make git diff --git a/go.mod b/go.mod index a2690ff033..1be06936d2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/megaease/easegress/v2 -go 1.23.0 +go 1.24 toolchain go1.24.5 diff --git a/pkg/api/profile.go b/pkg/api/profile.go index d060206206..e29ef6dc7b 100644 --- a/pkg/api/profile.go +++ b/pkg/api/profile.go @@ -98,7 +98,7 @@ func (s *Server) startCPUProfile(w http.ResponseWriter, r *http.Request) { err = s.profile.UpdateCPUProfile(spr.Path) if err != nil { - HandleAPIError(w, r, http.StatusBadRequest, fmt.Errorf(err.Error())) + HandleAPIError(w, r, http.StatusBadRequest, err) return } } diff --git a/pkg/object/autocertmanager/autocertmanager_test.go b/pkg/object/autocertmanager/autocertmanager_test.go index 4964c48508..d7d3ad88f3 100644 --- a/pkg/object/autocertmanager/autocertmanager_test.go +++ b/pkg/object/autocertmanager/autocertmanager_test.go @@ -544,7 +544,7 @@ domains: directoryURL: ` + url etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) @@ -599,7 +599,7 @@ directoryURL: ` + url w := httptest.NewRecorder() r, err := http.NewRequest("GET", "http://example.org/challenge-suffix", nil) if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } acm.spec.EnableHTTP01 = false acm.HandleHTTP01Challenge(w, r) @@ -624,7 +624,7 @@ directoryURL: ` + url token := "asdlijasdoiashvouid" err = cls.Put(key, token) // add data for http01 challenge if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } w = httptest.NewRecorder() @@ -678,7 +678,7 @@ domains: directoryURL: ` + url etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) @@ -726,7 +726,7 @@ domains: directoryURL: ` + url etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) @@ -819,7 +819,7 @@ func waitDNSRecordTest(t *testing.T, d Domain) { func TestDomain(t *testing.T) { etcdDirName, err := os.MkdirTemp("", "autocertmanager-domain-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) cls := cluster.CreateClusterForTest(etcdDirName) diff --git a/pkg/object/httpserver/mux_test.go b/pkg/object/httpserver/mux_test.go index a5883edcfe..97404ff421 100644 --- a/pkg/object/httpserver/mux_test.go +++ b/pkg/object/httpserver/mux_test.go @@ -126,7 +126,7 @@ func TestServerACME(t *testing.T) { // NOTE: For loading system controller AutoCertManager. etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) diff --git a/pkg/object/httpserver/spec_test.go b/pkg/object/httpserver/spec_test.go index 7e673cf874..04f965fc24 100644 --- a/pkg/object/httpserver/spec_test.go +++ b/pkg/object/httpserver/spec_test.go @@ -114,7 +114,7 @@ func TestTlsConfig(t *testing.T) { // NOTE: For loading system controller AutoCertManager. etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) diff --git a/pkg/object/meshcontroller/spec/spec_test.go b/pkg/object/meshcontroller/spec/spec_test.go index 982b459c80..bbb6fc4b66 100644 --- a/pkg/object/meshcontroller/spec/spec_test.go +++ b/pkg/object/meshcontroller/spec/spec_test.go @@ -794,7 +794,7 @@ func TestSidecarIngressPipelineSpecCert(t *testing.T) { // NOTE: For loading system controller AutoCertManager. etcdDirName, err := os.MkdirTemp("", "autocertmanager-test") if err != nil { - t.Errorf(err.Error()) + t.Error(err.Error()) } defer os.RemoveAll(etcdDirName) diff --git a/pkg/object/meshcontroller/worker/worker.go b/pkg/object/meshcontroller/worker/worker.go index 4c4caea4f0..48d9cf4868 100644 --- a/pkg/object/meshcontroller/worker/worker.go +++ b/pkg/object/meshcontroller/worker/worker.go @@ -20,6 +20,7 @@ package worker import ( "encoding/base64" + "errors" "fmt" "net/http" "net/url" @@ -176,7 +177,7 @@ func (worker *Worker) validate() error { if len(worker.serviceName) == 0 { errMsg := "empty service name" logger.Errorf(errMsg) - return fmt.Errorf(errMsg) + return errors.New(errMsg) } _, err = url.ParseRequestURI(worker.aliveProbe) @@ -188,19 +189,19 @@ func (worker *Worker) validate() error { if worker.applicationPort == 0 { errMsg := "empty application port" logger.Errorf(errMsg) - return fmt.Errorf(errMsg) + return errors.New(errMsg) } if len(worker.instanceID) == 0 { errMsg := "empty env HOSTNAME" logger.Errorf(errMsg) - return fmt.Errorf(errMsg) + return errors.New(errMsg) } if len(worker.applicationIP) == 0 { errMsg := "empty env APPLICATION_IP" logger.Errorf(errMsg) - return fmt.Errorf(errMsg) + return errors.New(errMsg) } logger.Infof("sidecar works for service: %s", worker.serviceName) return nil