diff --git a/Dockerfile b/Dockerfile index 3a35da441..4fec72010 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # container for this image, the desired binary must be specified (either # /usr/bin/core-service or /usr/bin/db-manager). -FROM golang:1.26-alpine AS build +FROM golang:1.27-alpine AS build ARG EXTRA_GO_INSTALL_FLAGS="" ENV EXTRA_GO_INSTALL_FLAGS=${EXTRA_GO_INSTALL_FLAGS} diff --git a/Makefile b/Makefile index 6c10c89af..9c22a2680 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ shell-lint: .PHONY: go-lint go-lint: - echo "===== Checking Go lint (except for *.gen.go files) =====" && docker run --rm -v $(CURDIR):/dss -w /dss golangci/golangci-lint:v2.12.2 golangci-lint run -v + echo "===== Checking Go lint (except for *.gen.go files) =====" && docker run --rm -v $(CURDIR):/dss -w /dss golangci/golangci-lint:v2.13.2 golangci-lint run -v .PHONY: terraform-lint terraform-lint: diff --git a/build/test-certs/Dockerfile b/build/test-certs/Dockerfile index 45d742285..b2fe50c62 100644 --- a/build/test-certs/Dockerfile +++ b/build/test-certs/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26-alpine +FROM golang:1.27-alpine WORKDIR /go/src/app diff --git a/cmds/core-service/main.go b/cmds/core-service/main.go index 91ee224b1..8e337119b 100644 --- a/cmds/core-service/main.go +++ b/cmds/core-service/main.go @@ -143,16 +143,16 @@ func createRIDServers(ctx context.Context, locality string, logger *zap.Logger) app := application.NewFromTransactor(ridStore, logger) return &rid_v1.Server{ - Store: ridStore, - App: app, - Locality: locality, - AllowHTTPBaseUrls: *allowHTTPBaseUrls, - }, &rid_v2.Server{ - Store: ridStore, - App: app, - Locality: locality, - AllowHTTPBaseUrls: *allowHTTPBaseUrls, - }, nil + Store: ridStore, + App: app, + Locality: locality, + AllowHTTPBaseUrls: *allowHTTPBaseUrls, + }, &rid_v2.Server{ + Store: ridStore, + App: app, + Locality: locality, + AllowHTTPBaseUrls: *allowHTTPBaseUrls, + }, nil } func createSCDServer(ctx context.Context, logger *zap.Logger, locality string) (*scd.Server, error) { diff --git a/cmds/dummy-oauth/Dockerfile b/cmds/dummy-oauth/Dockerfile index d7b1c81af..23fa20a22 100644 --- a/cmds/dummy-oauth/Dockerfile +++ b/cmds/dummy-oauth/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26-alpine AS build +FROM golang:1.27-alpine AS build RUN apk add git bash make RUN mkdir /app WORKDIR /app diff --git a/go.mod b/go.mod index 3fb389a9c..d1ec75ac7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/interuss/dss -go 1.26.2 +go 1.27.1 require ( cloud.google.com/go/profiler v0.4.0 diff --git a/interfaces/openapi-to-go-server/Dockerfile b/interfaces/openapi-to-go-server/Dockerfile index 7001ee754..fae48283c 100644 --- a/interfaces/openapi-to-go-server/Dockerfile +++ b/interfaces/openapi-to-go-server/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/astral-sh/uv:python3.14-alpine -COPY --from=golang:1.22-alpine /usr/local/go/ /usr/local/go/ +COPY --from=golang:1.27-alpine /usr/local/go/ /usr/local/go/ ENV PATH="/usr/local/go/bin:${PATH}" ADD . /app diff --git a/interfaces/openapi-to-go-server/example/Dockerfile b/interfaces/openapi-to-go-server/example/Dockerfile index c1966580b..3afb3fa94 100644 --- a/interfaces/openapi-to-go-server/example/Dockerfile +++ b/interfaces/openapi-to-go-server/example/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26-alpine +FROM golang:1.27-alpine WORKDIR /go/src/server_demo COPY . . diff --git a/interfaces/openapi-to-go-server/example/go.mod b/interfaces/openapi-to-go-server/example/go.mod index ec79f9a33..caa34962c 100644 --- a/interfaces/openapi-to-go-server/example/go.mod +++ b/interfaces/openapi-to-go-server/example/go.mod @@ -1,6 +1,6 @@ module example -go 1.25.0 +go 1.27.1 require ( github.com/interuss/dss v0.0.1 diff --git a/pkg/rid/store/memstore/store.go b/pkg/rid/store/memstore/store.go index 6982daed9..6709955bc 100644 --- a/pkg/rid/store/memstore/store.go +++ b/pkg/rid/store/memstore/store.go @@ -145,13 +145,13 @@ type expiringRecord[M any] interface { toModel() *M } -func (rec *isaRecord) endTime() *time.Time { return rec.EndTime } //nolint:unused +func (rec *isaRecord) endTime() *time.Time { return rec.EndTime } -func (rec *isaRecord) writerName() string { return rec.Writer } //nolint:unused +func (rec *isaRecord) writerName() string { return rec.Writer } -func (rec *subscriptionRecord) endTime() *time.Time { return rec.EndTime } //nolint:unused +func (rec *subscriptionRecord) endTime() *time.Time { return rec.EndTime } -func (rec *subscriptionRecord) writerName() string { return rec.Writer } //nolint:unused +func (rec *subscriptionRecord) writerName() string { return rec.Writer } // listExpired returns the records whose end time is at or before threshold and // whose writer matches. A limit of 0 means unlimited.