diff --git a/.github/workflows/contrib-test.yml b/.github/workflows/contrib-test.yml index 9559da47..0c4b64fb 100644 --- a/.github/workflows/contrib-test.yml +++ b/.github/workflows/contrib-test.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Go uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: '~1.24' + go-version: '1.27.3' - name: Clone the code uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: @@ -33,7 +33,7 @@ jobs: - name: Setup Go uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: '~1.24' + go-version: '1.27.3' - name: Clone the code uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 39a393ad..ea002490 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,10 +29,10 @@ jobs: - name: Setup Go uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: '~1.24' + go-version: '1.27.3' - name: Clone the code uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - name: Install linter - uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8 + uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0 with: - version: v2.12.2 + version: v2.15.0 diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 14632eaa..bbcc25f0 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -16,7 +16,7 @@ jobs: - name: Set up golang uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: "1.24" + go-version: "1.27.3" - name: Checkout code uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0f344f4..805e0252 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Set up golang uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: "1.24" + go-version: "1.27.3" - name: Build binary run: | make fioserver @@ -54,7 +54,7 @@ jobs: - name: Set up golang uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: "1.24" + go-version: "1.27.3" - name: Build binaries run: | @@ -78,7 +78,7 @@ jobs: - name: Set up golang uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: "1.24" + go-version: "1.27.3" - name: Install swag run: go install github.com/swaggo/swag/cmd/swag@latest - name: Generate Swagger docs diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index b9fb6b17..83f9873c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Go uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: '~1.24' + go-version: '1.27.3' - name: Clone the code uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: @@ -36,7 +36,7 @@ jobs: - name: Set up golang uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5 with: - go-version: "1.24" + go-version: "1.27.3" - name: Checkout code uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - name: Install swag diff --git a/contrib/Dockerfile.devshell b/contrib/Dockerfile.devshell index 7e72bb78..811c440c 100644 --- a/contrib/Dockerfile.devshell +++ b/contrib/Dockerfile.devshell @@ -1,4 +1,4 @@ -FROM public.ecr.aws/docker/library/golang:1.25-bookworm +FROM public.ecr.aws/docker/library/golang:1.27.3-bookworm RUN --mount=target=/ctx \ if [ -d /ctx/.extra-certs/ ] ; then \ diff --git a/contrib/e2e/Dockerfile.fioup b/contrib/e2e/Dockerfile.fioup index 78e90f39..d0d618be 100644 --- a/contrib/e2e/Dockerfile.fioup +++ b/contrib/e2e/Dockerfile.fioup @@ -1,4 +1,4 @@ -FROM golang:alpine AS builder +FROM golang:1.27.3-alpine AS builder RUN apk add --no-cache git make RUN git clone https://github.com/foundriesio/fioup diff --git a/contrib/e2e/Makefile b/contrib/e2e/Makefile index e1a9bff2..53413012 100644 --- a/contrib/e2e/Makefile +++ b/contrib/e2e/Makefile @@ -41,7 +41,7 @@ $(CACHE)/aktualizr-lite: # Build fiopull from source using a throwaway Go container. $(CACHE)/fiopull: mkdir -p $(CACHE) - docker run --rm -v $(CACHE):/out golang:1.24 sh -c "\ + docker run --rm -v $(CACHE):/out golang:1.27.3 sh -c "\ git clone --depth=1 https://github.com/foundriesio/ostreeuploader.git /src && \ cd /src && make fiopull && cp bin/fiopull /out/fiopull" diff --git a/contrib/perf-test/Dockerfile b/contrib/perf-test/Dockerfile index 34cd7cae..2dd92441 100644 --- a/contrib/perf-test/Dockerfile +++ b/contrib/perf-test/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause-Clear # Stage 1: build fioserver and gen-certs from source -FROM public.ecr.aws/docker/library/golang:1.25 AS builder +FROM public.ecr.aws/docker/library/golang:1.27.3 AS builder # hack for building on QC managed laptops RUN --mount=target=/ctx \ diff --git a/contrib/perf-test/gen-certs/main.go b/contrib/perf-test/gen-certs/main.go index bcb152b2..ec56b236 100644 --- a/contrib/perf-test/gen-certs/main.go +++ b/contrib/perf-test/gen-certs/main.go @@ -21,8 +21,7 @@ import ( "runtime" "sync" "time" - - "github.com/google/uuid" + "uuid" ) func main() { diff --git a/go.mod b/go.mod index 50dbf9f9..2c086f18 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,11 @@ module github.com/foundriesio/update-server -go 1.25.0 +go 1.27.3 require ( github.com/alexflint/go-arg v1.6.0 github.com/foundriesio/go-ecies v0.3.0 github.com/go-pkgz/expirable-cache/v3 v3.1.0 - github.com/google/uuid v1.6.0 github.com/labstack/echo/v4 v4.15.3 github.com/labstack/gommon v0.5.0 github.com/mattn/go-sqlite3 v1.14.32 diff --git a/go.sum b/go.sum index c90d6046..29473bdb 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,6 @@ github.com/go-pkgz/expirable-cache/v3 v3.1.0 h1:s05P851/O6QJ6Mc+7o2bh9aGtD3romB1 github.com/go-pkgz/expirable-cache/v3 v3.1.0/go.mod h1:6pVgNleydKPj0J2/mzrI02/RDo4ivKx5v2XlNmIjhjo= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/server/gateway/handlers_fiotest.go b/server/gateway/handlers_fiotest.go index b88e843b..870252ab 100644 --- a/server/gateway/handlers_fiotest.go +++ b/server/gateway/handlers_fiotest.go @@ -8,9 +8,9 @@ import ( "mime" "net/http" "path/filepath" + "uuid" "github.com/foundriesio/update-server/storage" - "github.com/google/uuid" "github.com/labstack/echo/v4" ) diff --git a/server/ui/api/handlers_rollouts.go b/server/ui/api/handlers_rollouts.go index ba01e7e2..108b0f4d 100644 --- a/server/ui/api/handlers_rollouts.go +++ b/server/ui/api/handlers_rollouts.go @@ -343,7 +343,7 @@ func streamUpdateLogs(c echo.Context, reader iter.Seq2[string, error]) error { } // Errors are already handled by the eventStreamReader - for line := range keepaliveReader(eventStreamReader) { + for line := range keepaliveReader(eventStreamReader) { //nolint:errcheck if _, err := r.Write([]byte(line)); err != nil { // Client disconnected - only log unexpected errors if !errors.Is(err, io.EOF) && !errors.Is(err, net.ErrClosed) { diff --git a/storage/gateway/storage_test.go b/storage/gateway/storage_test.go index 396e3d74..218b8094 100644 --- a/storage/gateway/storage_test.go +++ b/storage/gateway/storage_test.go @@ -13,10 +13,10 @@ import ( "strings" "testing" "time" + "uuid" "github.com/foundriesio/update-server/storage" "github.com/foundriesio/update-server/storage/api" - "github.com/google/uuid" "github.com/stretchr/testify/require" )