diff --git a/.circleci/config.yml b/.circleci/config.yml index 66b9e9cc36..de9b341100 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,7 +88,7 @@ workflows: jobs: build: environment: - DOCKER_TAG: chronograf-20250404 + DOCKER_TAG: chronograf-20251013 GO111MODULE: "ON" machine: image: ubuntu-2204:current @@ -112,7 +112,7 @@ jobs: deploy-nightly: environment: - DOCKER_TAG: chronograf-20250404 + DOCKER_TAG: chronograf-20251013 GO111MODULE: "ON" machine: image: ubuntu-2204:current @@ -141,7 +141,7 @@ jobs: build-nightly: environment: - DOCKER_TAG: chronograf-20250404 + DOCKER_TAG: chronograf-20251013 GO111MODULE: "ON" machine: image: ubuntu-2204:current @@ -162,7 +162,7 @@ jobs: deploy-pre-release: environment: - DOCKER_TAG: chronograf-20250404 + DOCKER_TAG: chronograf-20251013 GO111MODULE: "ON" machine: image: ubuntu-2204:current @@ -197,7 +197,7 @@ jobs: deploy-release: environment: - DOCKER_TAG: chronograf-20250404 + DOCKER_TAG: chronograf-20251013 GO111MODULE: "ON" machine: image: ubuntu-2204:current diff --git a/CHANGELOG.md b/CHANGELOG.md index a249f722c8..bf4cdafff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [unreleased] +### Other + +1. [#6148](https://github.com/influxdata/chronograf/pull/6148): Upgrade golang to 1.25.1 + ## v1.10.8 [2025-08-15] ### Bug Fixes diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build index 5b2b144067..3969d1af84 100644 --- a/etc/Dockerfile_build +++ b/etc/Dockerfile_build @@ -34,7 +34,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ # Install go ENV GOPATH /root/go -ENV GO_VERSION 1.23.8 +ENV GO_VERSION 1.25.1 ENV GO_ARCH amd64 ENV GO111MODULES ON RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ diff --git a/etc/scripts/docker/run.sh b/etc/scripts/docker/run.sh index c103dc054a..9cda7a76de 100755 --- a/etc/scripts/docker/run.sh +++ b/etc/scripts/docker/run.sh @@ -14,7 +14,7 @@ test -z $SSH_KEY_PATH && SSH_KEY_PATH="$HOME/.ssh/id_rsa" echo "Using SSH key located at: $SSH_KEY_PATH" # Default docker tag if not specified -test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20250404" +test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20251013" docker run \ -e AWS_ACCESS_KEY_ID \ diff --git a/go.mod b/go.mod index cf94e52f3b..a1b8769f3c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/influxdata/chronograf -go 1.23.0 +go 1.25.1 require ( cloud.google.com/go/bigtable v1.10.0 // indirect diff --git a/influx/databases.go b/influx/databases.go index 10ff3f4a45..6560e55e69 100644 --- a/influx/databases.go +++ b/influx/databases.go @@ -126,7 +126,7 @@ func (c *Client) UpdateRP(ctx context.Context, db string, rp string, upd *chrono // At last, we can check if there are any error strings for _, r := range results { if r.Error != "" { - return nil, fmt.Errorf(r.Error) + return nil, fmt.Errorf("%s", r.Error) } } diff --git a/influx/influx.go b/influx/influx.go index ea3fd520dc..bd9d6c246f 100644 --- a/influx/influx.go +++ b/influx/influx.go @@ -327,7 +327,7 @@ func (c *Client) ping(u *url.URL) (string, string, error) { } if resp.StatusCode != http.StatusNoContent { - var err = fmt.Errorf(string(body)) + var err = fmt.Errorf("%s", string(body)) return "", "", err } diff --git a/influx/users.go b/influx/users.go index 1ecf5a10cc..c85f4a1da8 100644 --- a/influx/users.go +++ b/influx/users.go @@ -48,7 +48,7 @@ func (c *Client) Delete(ctx context.Context, u *chronograf.User) error { // At last, we can check if there are any error strings for _, r := range results { if r.Error != "" { - return fmt.Errorf(r.Error) + return fmt.Errorf("%s", r.Error) } } return nil @@ -227,7 +227,7 @@ func (c *Client) updatePassword(ctx context.Context, name, passwd string) error // At last, we can check if there are any error strings for _, r := range results { if r.Error != "" { - return fmt.Errorf(r.Error) + return fmt.Errorf("%s", r.Error) } } return nil diff --git a/oauth2/generic.go b/oauth2/generic.go index da691d98e4..c191e3198e 100644 --- a/oauth2/generic.go +++ b/oauth2/generic.go @@ -115,7 +115,7 @@ func (g *Generic) PrincipalID(provider *http.Client) (string, error) { if ok := ofDomain(g.Domains, email); !ok { msg := "Not a member of required domain" g.Logger.Error(msg) - return "", fmt.Errorf(msg) + return "", fmt.Errorf("%s", msg) } } diff --git a/server/kapacitors.go b/server/kapacitors.go index 87e4fbfa64..9d104b6d5c 100644 --- a/server/kapacitors.go +++ b/server/kapacitors.go @@ -350,7 +350,7 @@ func (s *Service) deactivateOtherKapacitors(ctx context.Context, srcID int, ID i } } if len(deactivationErrors) > 1 { - return fmt.Errorf(strings.Join(deactivationErrors, "\n")) + return fmt.Errorf("%s", strings.Join(deactivationErrors, "\n")) } return deactivationError } diff --git a/server/mountable_router_test.go b/server/mountable_router_test.go index 8ea6060106..645450f839 100644 --- a/server/mountable_router_test.go +++ b/server/mountable_router_test.go @@ -24,7 +24,7 @@ func Test_MountableRouter_MountsRoutesUnderPrefix(t *testing.T) { expected := "Hello?! McFly?! Anybody in there?!" mr.GET("/biff", http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { - fmt.Fprintf(rw, expected) + fmt.Fprintf(rw, "%s", expected) })) ts := httptest.NewServer(mr) diff --git a/server/url_prefixer_test.go b/server/url_prefixer_test.go index 054e5a7448..0e4d2235b8 100644 --- a/server/url_prefixer_test.go +++ b/server/url_prefixer_test.go @@ -180,7 +180,7 @@ func Test_Server_Prefixer_NoPrefixingWithoutFlusther(t *testing.T) { func Test_Server_Prefixer_IgnoreJsAndSvg(t *testing.T) { expected := "Keep it the same please" backend := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { - fmt.Fprintf(rw, expected) + fmt.Fprintf(rw, "%s", expected) }) tl := &mocks.TestLogger{}