Merge branch 'main' into nithin/eng-5878-fix-federated-graph-schema-v…

…ersion-relation
wundergraph · Nov 19, 2024 · 8beaec0 · 8beaec0
2 parents 87e8326 + 4e6bf7a
commit 8beaec0
Show file tree

Hide file tree

Showing 118 changed files with 8,508 additions and 5,950 deletions.
diff --git a/.github/workflows/aws-lambda-router-ci.yaml b/.github/workflows/aws-lambda-router-ci.yaml
@@ -19,8 +19,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/cdn-ci.yaml b/.github/workflows/cdn-ci.yaml
@@ -19,8 +19,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 
@@ -41,8 +39,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.github/workflows/cli-ci.yaml b/.github/workflows/cli-ci.yaml
@@ -20,8 +20,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 

diff --git a/.github/workflows/composition-ci.yaml b/.github/workflows/composition-ci.yaml
@@ -22,8 +22,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 

diff --git a/.github/workflows/controlplane-ci.yaml b/.github/workflows/controlplane-ci.yaml
@@ -48,8 +48,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 
@@ -83,8 +81,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.github/workflows/graphqlmetrics-ci.yaml b/.github/workflows/graphqlmetrics-ci.yaml
@@ -31,8 +31,6 @@ jobs:
           CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: actions/cache@v4
         with:
@@ -83,8 +81,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.github/workflows/helm-ci.yaml b/.github/workflows/helm-ci.yaml
@@ -18,8 +18,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/keycloak-ci.yaml b/.github/workflows/keycloak-ci.yaml
@@ -19,8 +19,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.github/workflows/otelcollector-ci.yaml b/.github/workflows/otelcollector-ci.yaml
@@ -19,8 +19,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.github/workflows/playground-ci.yaml b/.github/workflows/playground-ci.yaml
@@ -19,8 +19,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 

diff --git a/.github/workflows/router-ci.yaml b/.github/workflows/router-ci.yaml
@@ -38,8 +38,6 @@ jobs:
           - 6379:6379
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: actions/cache@v4
         with:
@@ -117,8 +115,6 @@ jobs:
           - 6379:6379
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Log in to Docker Container registry (With write access)
         uses: docker/login-action@v3
@@ -185,8 +181,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.github/workflows/shared-ci.yaml b/.github/workflows/shared-ci.yaml
@@ -21,8 +21,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 

diff --git a/.github/workflows/studio-ci.yaml b/.github/workflows/studio-ci.yaml
@@ -20,8 +20,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/node
 
@@ -59,8 +57,6 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - uses: ./.github/actions/build-push-image
         with:

diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,8 @@ lerna-debug.log
 /demo/cmd/subscriptiontest/subscriptiontest
 .github/scripts/keycloak-22.0.4/**
 .github/scripts/keycloak-22.0.4.zip
-/router-tests/cmd/config-validator/router-configs/**
+/router-tests/cmd/config-validator/router-configs/**
+
+# Go workspace files
+go.work
+go.work.sum
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -37,6 +37,26 @@ make
 
 Ready! You can now start contributing to the WunderGraph Cosmo repository. Feel free to open an issue or pull request to add a new feature or fix a bug.
 
+## Go workspace
+
+According to best practices, we don't commit the `go.work` or `go.sum` files. Those files are personal to each developer. As a result, we use the `go.mod` file to manage the dependencies and overwrites. You can still create `go.work` file in the root of the repository if you are feeling more comfortable with it or to improve tooling support.
+
+### Example
+
+```
+go 1.21.5
+
+toolchain go1.22.0
+
+use (
+	./demo
+	./router
+	./router-tests
+)
+
+// Here you can add custom replacements
+```
+
 ## Conventional Commit Standard
 
 We use [conventionalcommits](https://www.conventionalcommits.org/en/v1.0.0-beta.2/#why-use-conventional-commits) for changelog generation and more structured commit messages.

diff --git a/Makefile b/Makefile
@@ -150,11 +150,9 @@ run-subgraphs-local:
 sync-go-workspace:
 	cd router && go mod tidy
 	cd demo && make bump-deps
-	cd aws-lambda-router && make bump-deps
 	cd composition-go && go mod tidy
 	cd graphqlmetrics && go mod tidy
 	cd router-tests && make bump-deps
-	go work sync
 
 # Validates if any breaking changes has been introduced.
 # Compares the head of the branch with your local changes

diff --git a/aws-lambda-router/CHANGELOG.md b/aws-lambda-router/CHANGELOG.md
@@ -4,6 +4,28 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.37.6](https://github.com/wundergraph/cosmo/compare/[email protected]@0.37.6) (2024-11-16)
+
+### Bug Fixes
+
+* **tests:** deadlock on unsubscribe when epoll disabled ([#1380](https://github.com/wundergraph/cosmo/issues/1380)) ([337a60f](https://github.com/wundergraph/cosmo/commit/337a60f15577b373ca67a83497304d53fe19f55d)) (@StarpTech)
+
+## [0.37.5](https://github.com/wundergraph/cosmo/compare/[email protected]@0.37.5) (2024-11-14)
+
+### Bug Fixes
+
+* fix merging of response nodes of enum type ([#1373](https://github.com/wundergraph/cosmo/issues/1373)) ([f3927e3](https://github.com/wundergraph/cosmo/commit/f3927e3cfc382bff9beff0a7868b444db213b9d6)) (@devsergiy)
+
+## [0.37.4](https://github.com/wundergraph/cosmo/compare/[email protected]@0.37.4) (2024-11-12)
+
+### Bug Fixes
+
+* variables normalization for the anonymous operations ([#1365](https://github.com/wundergraph/cosmo/issues/1365)) ([0b8ff06](https://github.com/wundergraph/cosmo/commit/0b8ff06592954bef2329fa69a660c60e55e4eb3d)) (@devsergiy)
+
+## [0.37.3](https://github.com/wundergraph/cosmo/compare/[email protected]@0.37.3) (2024-11-12)
+
+**Note:** Version bump only for package aws-lambda-router
+
 ## [0.37.2](https://github.com/wundergraph/cosmo/compare/[email protected]@0.37.2) (2024-11-08)
 
 ### Bug Fixes

diff --git a/aws-lambda-router/Makefile b/aws-lambda-router/Makefile
@@ -3,7 +3,6 @@
 bump-router:
 	go get github.com/wundergraph/cosmo/router@upgrade
 	go mod tidy
-	cd .. && go work sync
 
 VERSION?=dev
 # RFC3339 format
@@ -40,4 +39,3 @@ create-lambda-zip: build fetch-router-config
 bump-deps:
 	go get github.com/wundergraph/cosmo/router@upgrade
 	go mod tidy
-	cd .. && go work sync
diff --git a/aws-lambda-router/go.mod b/aws-lambda-router/go.mod
@@ -1,10 +1,14 @@
 module github.com/wundergraph/cosmo/aws-lambda-router
 
+go 1.21.5
+
+toolchain go1.22.0
+
 require (
 	github.com/akrylysov/algnhsa v1.1.0
 	github.com/aws/aws-lambda-go v1.43.0
 	github.com/stretchr/testify v1.9.0
-	github.com/wundergraph/cosmo/router v0.0.0-20241108151630-db3184e032a7
+	github.com/wundergraph/cosmo/router v0.0.0-20241115174502-7156536a93bf
 	go.uber.org/zap v1.27.0
 )
 
@@ -90,7 +94,7 @@ require (
 	github.com/twmb/franz-go v1.16.1 // indirect
 	github.com/twmb/franz-go/pkg/kmsg v1.7.0 // indirect
 	github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5 // indirect
-	github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121 // indirect
+	github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.123 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.23.0 // indirect
@@ -124,6 +128,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-go 1.21.5
-
-toolchain go1.22.0
+// replace github.com/wundergraph/cosmo/router => ../router
diff --git a/aws-lambda-router/go.sum b/aws-lambda-router/go.sum
@@ -250,10 +250,10 @@ github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0
 github.com/vektah/gqlparser/v2 v2.5.16/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww=
 github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5 h1:rc+IQxG3rrAXEjBywirkzhKkyCKvXLGQXABVD8GiUtU=
 github.com/wundergraph/astjson v0.0.0-20241108124845-44485579ffa5/go.mod h1:eOTL6acwctsN4F3b7YE+eE2t8zcJ/doLm9sZzsxxxrE=
-github.com/wundergraph/cosmo/router v0.0.0-20241108151630-db3184e032a7 h1:UcdtoevbUSn79W0g/XarFn7E65owhzT7IWKA58iPnbk=
-github.com/wundergraph/cosmo/router v0.0.0-20241108151630-db3184e032a7/go.mod h1:xSraMjn2YsV+yGHKmzBu7g5Z1UV96OFAhCm+9S7T1iA=
-github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121 h1:VsrSvBsOcQNiTwESJg55tecBzHfZPUdII/zDstHyBuc=
-github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.121/go.mod h1:s4r/lhVEU5s0c6tCgpR0hK6FHEmX0cbrKcMU1pMc/ZI=
+github.com/wundergraph/cosmo/router v0.0.0-20241115174502-7156536a93bf h1:HOiFhmZkl4RORU6E7JJi+MTEDt6KhP0qhSQouzgNMYQ=
+github.com/wundergraph/cosmo/router v0.0.0-20241115174502-7156536a93bf/go.mod h1:MR8hksFCSekDg/5OPKb7HIXvboAc8xZX0DusUFOqpds=
+github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.123 h1:JI7axu4G8p52i866OZfXYTLrA2tAE3fjUk3XiBBe6Y8=
+github.com/wundergraph/graphql-go-tools/v2 v2.0.0-rc.123/go.mod h1:s4r/lhVEU5s0c6tCgpR0hK6FHEmX0cbrKcMU1pMc/ZI=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=

diff --git a/aws-lambda-router/package.json b/aws-lambda-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-lambda-router",
-  "version": "0.37.2",
+  "version": "0.37.6",
   "private": true,
   "description": "Placeholder package to simplify versioning and releasing with lerna.",
   "keywords": [

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -4,6 +4,24 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.70.3](https://github.com/wundergraph/cosmo/compare/[email protected]@0.70.3) (2024-11-18)
+
+**Note:** Version bump only for package wgc
+
+## [0.70.2](https://github.com/wundergraph/cosmo/compare/[email protected]@0.70.2) (2024-11-14)
+
+**Note:** Version bump only for package wgc
+
+## [0.70.1](https://github.com/wundergraph/cosmo/compare/[email protected]@0.70.1) (2024-11-13)
+
+**Note:** Version bump only for package wgc
+
+# [0.70.0](https://github.com/wundergraph/cosmo/compare/[email protected]@0.70.0) (2024-11-12)
+
+### Features
+
+* display warning in wgc router compose command ([#1360](https://github.com/wundergraph/cosmo/issues/1360)) ([5abe634](https://github.com/wundergraph/cosmo/commit/5abe6340906cfd40cc9f5756410a5584695afb6c)) (@JivusAyrus)
+
 ## [0.69.2](https://github.com/wundergraph/cosmo/compare/[email protected]@0.69.2) (2024-11-07)
 
 **Note:** Version bump only for package wgc

diff --git a/cli/package.json b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wgc",
-  "version": "0.69.2",
+  "version": "0.70.3",
   "description": "The official CLI tool to manage the GraphQL Federation Platform Cosmo",
   "type": "module",
   "main": "dist/index.js",