diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml index 253602fa8..aba5e289f 100644 --- a/.github/workflows/license.yaml +++ b/.github/workflows/license.yaml @@ -18,10 +18,10 @@ jobs: name: License runs-on: ubuntu-22.04 steps: - - name: Set up Go 1.23 + - name: Set up Go 1.24 uses: actions/setup-go@v3 with: - go-version: 1.23 + go-version: 1.24.11 - name: Checkout repo uses: actions/checkout@v3 - name: Check Eclipse license headers diff --git a/api/jsonrpc/handlers.go b/api/jsonrpc/handlers.go index b32537e4e..36a3c533a 100644 --- a/api/jsonrpc/handlers.go +++ b/api/jsonrpc/handlers.go @@ -55,7 +55,7 @@ func jsonRpcCreateExec(tunnel *jsonrpc.Tunnel, params interface{}, t jsonrpc.Res machineExec := params.(*model.MachineExec) err := setToken(tunnel, machineExec) if err != nil { - logrus.Errorf(err.Error()) + logrus.Errorf("%s", err.Error()) t.SendError(jsonrpc.NewArgsError(err)) return } @@ -107,7 +107,7 @@ func jsonRpcListContainersExec(tunnel *jsonrpc.Tunnel, _ interface{}, t jsonrpc. machineExec := &model.MachineExec{} err := setToken(tunnel, machineExec) if err != nil { - logrus.Errorf(err.Error()) + logrus.Errorf("%s", err.Error()) t.SendError(jsonrpc.NewArgsError(err)) return } diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index 3c0f501f7..8686875ec 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -12,7 +12,7 @@ # Dockerfile defines che-machine-exec production image eclipse/che-machine-exec-dev # -FROM docker.io/golang:1.23.8-alpine as go_builder +FROM docker.io/golang:1.24.11-alpine as go_builder ENV USER=machine-exec ENV UID=12345 diff --git a/go.mod b/go.mod index 1da65f109..3888a5689 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/eclipse-che/che-machine-exec -go 1.23.0 - -toolchain go1.23.8 +go 1.24.11 replace ( cloud.google.com/go => cloud.google.com/go v0.54.0 @@ -165,14 +163,14 @@ replace ( require ( github.com/eclipse/che-go-jsonrpc v0.0.0-20200317130110-931966b891fe - github.com/gin-gonic/gin v1.10.0 + github.com/gin-gonic/gin v1.11.0 github.com/gorilla/websocket v1.5.3 github.com/pkg/errors v0.9.1 - github.com/sirupsen/logrus v1.9.3 - github.com/stretchr/testify v1.9.0 + github.com/sirupsen/logrus v1.9.4 + github.com/stretchr/testify v1.11.1 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.31.1 - k8s.io/apimachinery v0.31.1 + k8s.io/api v0.35.0 + k8s.io/apimachinery v0.35.0 k8s.io/client-go v1.5.2 ) diff --git a/vendor/modules.txt b/vendor/modules.txt index dccce96b3..e3d15c6ec 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -9,7 +9,7 @@ github.com/eclipse/che-go-jsonrpc/jsonrpcws # github.com/gin-contrib/sse v0.1.0 => github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 ## explicit github.com/gin-contrib/sse -# github.com/gin-gonic/gin v1.10.0 => github.com/gin-gonic/gin v1.8.2 +# github.com/gin-gonic/gin v1.11.0 => github.com/gin-gonic/gin v1.8.2 ## explicit; go 1.18 github.com/gin-gonic/gin github.com/gin-gonic/gin/binding @@ -105,13 +105,13 @@ github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 => github.com/pmezard/go-difflib v1.0.0 ## explicit github.com/pmezard/go-difflib/difflib -# github.com/sirupsen/logrus v1.9.3 => github.com/sirupsen/logrus v1.4.2 +# github.com/sirupsen/logrus v1.9.4 => github.com/sirupsen/logrus v1.4.2 ## explicit github.com/sirupsen/logrus # github.com/stretchr/objx v0.2.0 => github.com/stretchr/objx v0.3.0 ## explicit; go 1.12 github.com/stretchr/objx -# github.com/stretchr/testify v1.9.0 => github.com/stretchr/testify v1.4.0 +# github.com/stretchr/testify v1.11.1 => github.com/stretchr/testify v1.4.0 ## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/mock @@ -203,7 +203,7 @@ gopkg.in/inf.v0 # gopkg.in/yaml.v2 v2.4.0 => gopkg.in/yaml.v2 v2.4.0 ## explicit; go 1.15 gopkg.in/yaml.v2 -# k8s.io/api v0.31.1 => k8s.io/api v0.21.0 +# k8s.io/api v0.35.0 => k8s.io/api v0.21.0 ## explicit; go 1.16 k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1beta1 @@ -248,7 +248,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.31.1 => k8s.io/apimachinery v0.21.0 +# k8s.io/apimachinery v0.35.0 => k8s.io/apimachinery v0.21.0 ## explicit; go 1.16 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta