Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/go-linter/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ runs:
- name: Run staticcheck linter
uses: dominikh/staticcheck-action@v1.3.1
with:
version: 2024.1.1
version: 2025.1.1
install-go: false
working-directory: ${{ inputs.working-directory }}
2 changes: 1 addition & 1 deletion .github/actions/go/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: 'This action install go and cache modules and build dependencies'
inputs:
go-version:
description: 'The go version to install'
default: '1.23'
default: '1.25'
required: false
cache-dependency-path:
description: 'The path to the dependency to cache'
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ The following sections provide a guide on how to contribute to the WunderGraph C

This guide assumes you have already installed the following software:

- make (should be installed on all linux / IOS systems)
- [golang](https://go.dev/dl/) `>= 1.18`
- make (should be installed on all Linux / MacOS systems)
- [golang](https://go.dev/dl/) `>= 1.25`
- [pnpm](https://pnpm.io/installation) >= 9
- Node.js [LTS](https://nodejs.org/en/about/releases/). You can also pnpm to [install](https://pnpm.io/cli/env) Node.js.
- [docker desktop](https://docs.docker.com/desktop/) (includes: engine, buildkit & compose) **or**:
Expand Down Expand Up @@ -44,7 +44,7 @@ According to best practices, we don't commit the `go.work` or `go.work.sum` file
### Example

```
go 1.23
go 1.25

use (
./demo
Expand Down Expand Up @@ -86,8 +86,8 @@ We merge all pull requests in `squash merge` mode. You're not enforced to use [c
- [Docker](https://docs.docker.com/get-docker/)
- [Docker Compose V2](https://docs.docker.com/compose/install/)
- [NodeJS LTS](https://nodejs.org/en/download/)
- [PNPM 8+](https://pnpm.io/installation)
- [Go 1.23+](https://golang.org/doc/install)
- [PNPM 9+](https://pnpm.io/installation)
- [Go 1.25+](https://golang.org/doc/install)
Comment thread
miklosbarabas marked this conversation as resolved.
- [wgc](https://www.npmjs.com/package/wgc)
- .env/.env.local (see below)

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ setup-build-tools:
go install github.com/bufbuild/buf/cmd/buf@v1.32.2
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2
go install connectrpc.com/connect/cmd/protoc-gen-connect-go@v1.16.2
go install gotest.tools/gotestsum@v1.12.2
go install gotest.tools/gotestsum@v1.12.3

setup-dev-tools: setup-build-tools
go install github.com/amacneil/dbmate/v2@v2.6.0
go install honnef.co/go/tools/cmd/staticcheck@2024.1.1
go install honnef.co/go/tools/cmd/staticcheck@2025.1.1
go install github.com/yannh/kubeconform/cmd/kubeconform@v0.6.3
go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.3
go install github.com/vektra/mockery/v3@v3.3.1
Expand Down
2 changes: 1 addition & 1 deletion adr/custom-modules-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ Every custom router has its own `go.mod` file which represents in Go a module. T

module github.com/myorg/myrouter

go 1.23
go 1.25

require (
"github.com/wundergraph/cosmo/router v0.93.0
Expand Down
2 changes: 1 addition & 1 deletion aws-lambda-router/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/aws-lambda-router

go 1.23.0
go 1.25

require (
github.com/akrylysov/algnhsa v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions cli/src/commands/router/commands/plugin/templates/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
const goMod = `
module {modulePath}

go 1.24.1
go 1.25.1
Comment thread
miklosbarabas marked this conversation as resolved.

require (
github.com/stretchr/testify v1.10.0
Expand Down Expand Up @@ -402,7 +402,7 @@ generated/service.proto
bin/
`;

const dockerfile = `FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS builder
const dockerfile = `FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS builder

# Multi-platform build arguments
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion composition-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/composition-go

go 1.23
go 1.25

require (
github.com/dop251/goja v0.0.0-20230906160731-9410bcaa81d2
Expand Down
2 changes: 1 addition & 1 deletion connect-go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/connect-go

go 1.23
go 1.25

require (
connectrpc.com/connect v1.17.0
Expand Down
2 changes: 1 addition & 1 deletion demo/docker/availability.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/countries.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/employees.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/family.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/hobbies.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/mood.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/products.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/products_fg.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion demo/docker/test1.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions demo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/demo

go 1.23.0
go 1.25

require (
github.com/99designs/gqlgen v0.17.76
Expand Down Expand Up @@ -92,7 +92,7 @@ require (
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/logrusorgru/aurora/v4 v4.0.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mark3labs/mcp-go v0.30.0 // indirect
github.com/mark3labs/mcp-go v0.36.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
Expand Down
1 change: 1 addition & 0 deletions demo/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/mark3labs/mcp-go v0.30.0 h1:Taz7fiefkxY/l8jz1nA90V+WdM2eoMtlvwfWforVYbo=
github.com/mark3labs/mcp-go v0.30.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
github.com/mark3labs/mcp-go v0.36.0/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g=
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
Expand Down
2 changes: 1 addition & 1 deletion demo/pkg/subgraphs/projects/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS builder

# Multi-platform build arguments
ARG TARGETOS
Expand Down
2 changes: 1 addition & 1 deletion demo/pkg/subgraphs/projects/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/demo/pkg/subgraphs/projects

go 1.23.0
go 1.25
Comment thread
miklosbarabas marked this conversation as resolved.

require (
github.com/hashicorp/go-hclog v1.6.3
Expand Down
2 changes: 1 addition & 1 deletion graphqlmetrics/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
FROM --platform=${BUILDPLATFORM} golang:1.25 AS builder

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion graphqlmetrics/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/graphqlmetrics

go 1.23.0
go 1.25

require (
connectrpc.com/connect v1.16.2
Expand Down
4 changes: 2 additions & 2 deletions otelcollector/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
FROM --platform=${BUILDPLATFORM} golang:1.25 AS builder
Comment thread
StarpTech marked this conversation as resolved.

ARG TARGETOS
ARG TARGETARCH
Expand All @@ -16,7 +16,7 @@ RUN ./ocb --config otelcol-builder.yaml \
&& chmod +x /app/otelcol-dev/otelcol \
&& /app/otelcol-dev/otelcol --version

FROM --platform=${BUILDPLATFORM} golang:1.23
FROM --platform=${BUILDPLATFORM} golang:1.25
Comment thread
miklosbarabas marked this conversation as resolved.

COPY ./otel-config.yaml /etc/otel-config.yaml
COPY --from=builder /app/otelcol-dev/otelcol /otelcol
Expand Down
4 changes: 2 additions & 2 deletions router-plugin/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module github.com/wundergraph/cosmo/router-plugin

go 1.23.0
go 1.25

require (
github.com/hashicorp/go-hclog v1.6.3
github.com/hashicorp/go-plugin v1.6.3
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/tonglil/opentelemetry-go-datadog-propagator v0.1.3
Expand All @@ -25,7 +26,6 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand Down
2 changes: 1 addition & 1 deletion router-tests/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/router-tests

go 1.23.0
go 1.25

require (
github.com/MicahParks/jwkset v0.9.0
Expand Down
2 changes: 2 additions & 0 deletions router-tests/testenv/testexec.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,10 @@ func runRouterBin(t *testing.T, ctx context.Context, opts RunRouterBinConfigOpti
}

newCtx, cancel := context.WithCancelCause(ctx)

err = runCmdWithLogs(t, ctx, cmd, false, cmdLogChannel)
if err != nil {
cancel(err)
return nil, err
}

Expand Down
2 changes: 1 addition & 1 deletion router/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${BUILDPLATFORM} golang:1.23 AS builder
FROM --platform=${BUILDPLATFORM} golang:1.25 AS builder

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion router/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The router is the component that understands the GraphQL Federation protocol. It

### Prerequisites

- [Go 1.21](https://golang.org/doc/install)
- [Go 1.25](https://golang.org/doc/install)

Use the `.env.example` file to create a `.env` file with the specified environment variables.

Expand Down
2 changes: 1 addition & 1 deletion router/custom.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23 as builder
FROM golang:1.25 as builder

ARG TARGETOS
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion router/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wundergraph/cosmo/router

go 1.23.0
go 1.25
Comment thread
miklosbarabas marked this conversation as resolved.

require (
connectrpc.com/connect v1.16.2
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-proto-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail

# Versions
GO_VERSION="${GO_VERSION:-1.24.1}"
GO_VERSION="${GO_VERSION:-1.25.1}"
PROTOC_VERSION="${PROTOC_VERSION:-29.3}"
PROTOC_GEN_GO_VERSION="${PROTOC_GEN_GO_VERSION:-1.36.5}"
PROTOC_GEN_GO_GRPC_VERSION="${PROTOC_GEN_GO_GRPC_VERSION:-1.5.1}"
Expand Down
Loading