From 7c68951d402e196e281324f1513d9c6f95f7c093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geyslan=20Greg=C3=B3rio?= Date: Tue, 23 Apr 2024 10:23:13 -0300 Subject: [PATCH] chore: bump go to 1.22.2 --- .github/actions/build-dependencies/action.yaml | 2 +- Vagrantfile | 2 +- builder/Dockerfile.k8s | 2 +- builder/Dockerfile.protoc | 2 +- builder/Dockerfile.ubuntu-tracee-make | 2 +- docs/contributing/building/building.md | 2 +- signatures/helpers/go.mod | 2 +- signatures/helpers/go.sum | 10 ++++++++++ tests/e2e-install-deps.sh | 4 ++-- types/go.mod | 2 +- 10 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 signatures/helpers/go.sum diff --git a/.github/actions/build-dependencies/action.yaml b/.github/actions/build-dependencies/action.yaml index e81417094e3f..0c36cc22f353 100644 --- a/.github/actions/build-dependencies/action.yaml +++ b/.github/actions/build-dependencies/action.yaml @@ -15,7 +15,7 @@ runs: run: | sudo rm -f /usr/bin/go sudo rm -f /usr/bin/gofmt - curl -L -o /tmp/golang.tar.gz https://go.dev/dl/go1.21.6.linux-amd64.tar.gz + curl -L -o /tmp/golang.tar.gz https://go.dev/dl/go1.22.2.linux-amd64.tar.gz sudo tar -C /usr/local -xzf /tmp/golang.tar.gz sudo ln -s /usr/local/go/bin/go /usr/bin/go sudo ln -s /usr/local/go/bin/gofmt /usr/bin/gofmt diff --git a/Vagrantfile b/Vagrantfile index 58951af8bd72..655722d454af 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -70,7 +70,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", privileged: true, inline: <<-SHELL VAGRANT_HOME="/home/vagrant" - GO_VERSION="1.21.6" + GO_VERSION="1.22.2" OPA_VERSION="v0.63.0" KUBECTL_VERSION="v1.29" diff --git a/builder/Dockerfile.k8s b/builder/Dockerfile.k8s index c6178d54bcb9..c6ceeda10306 100644 --- a/builder/Dockerfile.k8s +++ b/builder/Dockerfile.k8s @@ -1,4 +1,4 @@ -FROM golang:1.21 +FROM golang:1.22.2 RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 diff --git a/builder/Dockerfile.protoc b/builder/Dockerfile.protoc index a7d3d5730ce3..0daebae3f5ef 100644 --- a/builder/Dockerfile.protoc +++ b/builder/Dockerfile.protoc @@ -1,4 +1,4 @@ -FROM golang:1.21 +FROM golang:1.22.2 ARG PROTOC_VERSION="23.4" ARG PROTOC_ZIP="protoc-${PROTOC_VERSION}-linux-x86_64.zip" diff --git a/builder/Dockerfile.ubuntu-tracee-make b/builder/Dockerfile.ubuntu-tracee-make index 0030365b4b7b..41b8e7cc0882 100644 --- a/builder/Dockerfile.ubuntu-tracee-make +++ b/builder/Dockerfile.ubuntu-tracee-make @@ -62,7 +62,7 @@ RUN export uid=$uid gid=$gid && \ RUN export DEBIAN_FRONTEND=noninteractive && \ altarch=$(uname -m | sed 's:x86_64:amd64:g' | sed 's:aarch64:arm64:g') && \ apt-get update && \ - curl -L -o /tmp/golang.tar.xz https://go.dev/dl/go1.21.5.linux-${altarch}.tar.gz && \ + curl -L -o /tmp/golang.tar.xz https://go.dev/dl/go1.22.2.linux-${altarch}.tar.gz && \ tar -C /usr/local -xzf /tmp/golang.tar.xz && \ update-alternatives --install /usr/bin/go go /usr/local/go/bin/go 1 && \ update-alternatives --install /usr/bin/gofmt gofmt /usr/local/go/bin/gofmt 1 diff --git a/docs/contributing/building/building.md b/docs/contributing/building/building.md index 420bf25465a8..5cf24106407c 100644 --- a/docs/contributing/building/building.md +++ b/docs/contributing/building/building.md @@ -13,7 +13,7 @@ 2. Building **dependencies** 1. **clang** && **llvm** (12, 13 or 14) - 1. **golang** (1.21) + 1. **golang** (1.22.2) 1. **libelf** and **libelf-dev** (or elfutils-libelf and elfutils-libelf-devel) 1. **zlib1g** and **zlib1g-dev** diff --git a/signatures/helpers/go.mod b/signatures/helpers/go.mod index 0df7dc9edc45..6e9c451f185f 100644 --- a/signatures/helpers/go.mod +++ b/signatures/helpers/go.mod @@ -1,5 +1,5 @@ module github.com/aquasecurity/tracee/signatures/helpers -go 1.21 +go 1.22.2 require github.com/aquasecurity/tracee/types v0.0.0-20240122122429-7f84f526758d diff --git a/signatures/helpers/go.sum b/signatures/helpers/go.sum new file mode 100644 index 000000000000..13b66b1c4777 --- /dev/null +++ b/signatures/helpers/go.sum @@ -0,0 +1,10 @@ +github.com/aquasecurity/tracee/types v0.0.0-20240122122429-7f84f526758d h1:6CQjy5G6Cj/VKm8RP1uZnBZxDgfyGo15HfWFnYrkGro= +github.com/aquasecurity/tracee/types v0.0.0-20240122122429-7f84f526758d/go.mod h1:J0f9nzJWrFmFgMoK0s4Yirfh82vfKMatXytd1YdfU2I= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tests/e2e-install-deps.sh b/tests/e2e-install-deps.sh index 4b1ee49caec2..2c05386d1d8b 100755 --- a/tests/e2e-install-deps.sh +++ b/tests/e2e-install-deps.sh @@ -213,9 +213,9 @@ install_clang_from_github() { install_golang_from_github() { if [[ $ARCH == x86_64 ]]; then - GO_URL="https://go.dev/dl/go1.21.6.linux-amd64.tar.gz" + GO_URL="https://go.dev/dl/go1.22.2.linux-amd64.tar.gz" else - GO_URL="https://go.dev/dl/go1.21.6.linux-arm64.tar.gz" + GO_URL="https://go.dev/dl/go1.22.2.linux-arm64.tar.gz" fi GO_FILE=$(echo $(basename $GO_URL)) diff --git a/types/go.mod b/types/go.mod index 8349f96a1c12..0cb51abc6646 100644 --- a/types/go.mod +++ b/types/go.mod @@ -1,6 +1,6 @@ module github.com/aquasecurity/tracee/types -go 1.21 +go 1.22.2 require github.com/stretchr/testify v1.7.0