From 2e033d78ab249bb2b4d3e15c5f7ebe2bae6c76f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= Date: Thu, 21 Mar 2024 13:52:43 +0100 Subject: [PATCH] chore(build): upgrade Go to 1.21.8 (#6085) --- .circleci/config.yml | 8 ++++---- .github/workflows/chronograf-cypress-tests.yaml | 2 +- CHANGELOG.md | 6 ++++++ etc/Dockerfile_build | 3 ++- etc/scripts/docker/run.sh | 2 +- go.mod | 4 ++-- go.sum | 6 +++--- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 959ea08f13..f61285433e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,7 +72,7 @@ workflows: jobs: build: environment: - DOCKER_TAG: chronograf-20240123 + DOCKER_TAG: chronograf-20240320 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 @@ -96,7 +96,7 @@ jobs: deploy-nightly: environment: - DOCKER_TAG: chronograf-20240123 + DOCKER_TAG: chronograf-20240320 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 @@ -125,7 +125,7 @@ jobs: deploy-pre-release: environment: - DOCKER_TAG: chronograf-20240123 + DOCKER_TAG: chronograf-20240320 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 @@ -160,7 +160,7 @@ jobs: deploy-release: environment: - DOCKER_TAG: chronograf-20240123 + DOCKER_TAG: chronograf-20240320 GO111MODULE: "ON" machine: image: ubuntu-2004:202201-02 diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml index 72689d36c9..a65af86e53 100644 --- a/.github/workflows/chronograf-cypress-tests.yaml +++ b/.github/workflows/chronograf-cypress-tests.yaml @@ -26,7 +26,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '1.20.13' + go-version: '1.21.8' - uses: actions/setup-node@v2 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eccdb8e2a..c2f6c7d2ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [unreleased] + +### Other + +1. [#6085](https://github.com/influxdata/chronograf/pull/6085): Upgrade golang to 1.21.8. + ## v1.10.3 [2024-02-28] ### Features diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build index 981ff451b9..f68f91a45b 100644 --- a/etc/Dockerfile_build +++ b/etc/Dockerfile_build @@ -17,6 +17,7 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \ libtool RUN pip3 install boto requests python-jose --upgrade +RUN gem install dotenv -v 2.8.1 RUN gem install fpm # Install node @@ -33,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.20.13 +ENV GO_VERSION 1.21.8 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 de657582f3..6acd155471 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-20240123" +test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240320" docker run \ -e AWS_ACCESS_KEY_ID \ diff --git a/go.mod b/go.mod index f78be2ecf2..21feee7fac 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/influxdata/chronograf -go 1.20 +go 1.21 require ( cloud.google.com/go/bigtable v1.10.0 // indirect @@ -17,7 +17,7 @@ require ( github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 github.com/jessevdk/go-flags v1.4.0 github.com/lestrrat-go/jwx/v2 v2.0.19 - github.com/microcosm-cc/bluemonday v1.0.16 + github.com/microcosm-cc/bluemonday v1.0.26 github.com/sergi/go-diff v1.1.0 github.com/sirupsen/logrus v1.7.0 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 68ffae3516..5b41129cac 100644 --- a/go.sum +++ b/go.sum @@ -537,8 +537,8 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/microcosm-cc/bluemonday v1.0.16 h1:kHmAq2t7WPWLjiGvzKa5o3HzSfahUKiOq7fAPUiMNIc= -github.com/microcosm-cc/bluemonday v1.0.16/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= +github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= +github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5/go.mod h1:JWhYAp2EXqUtsxTKdeGlY8Wp44M7VxThC9FEoNGi2IE= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -943,7 +943,6 @@ golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -971,6 +970,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=