Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/code.analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- ".github/workflows/code.analysis.yml"

env:
GO_VERSION: "1.23"
GO_VERSION: "1.24"

jobs:
analysis:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci.lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- ".github/workflows/golangci.lint.yml"

env:
GO_VERSION: "1.23"
GO_VERSION: "1.24"

jobs:
analysis:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "v*"

env:
GO_VERSION: "1.23"
GO_VERSION: "1.24"

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- ".github/workflows/test.yml"

env:
GO_VERSION: "1.23"
GO_VERSION: "1.24"

jobs:
test-ubuntu:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build/package/Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM golang:1.23-alpine
FROM golang:1.24-alpine
RUN apk --no-cache add make git
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/megaease/easegress/v2

go 1.23.0
go 1.24

toolchain go1.24.5

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/object/autocertmanager/autocertmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/object/httpserver/mux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion pkg/object/httpserver/spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion pkg/object/meshcontroller/spec/spec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
9 changes: 5 additions & 4 deletions pkg/object/meshcontroller/worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package worker

import (
"encoding/base64"
"errors"
"fmt"
"net/http"
"net/url"
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
Loading