Skip to content

Commit b464dd4

Browse files
pvormstefiamdevsergiyjensneusethisisnithin
authored
sync changes from wg (#422)
- wundergraph#667 - wundergraph#671 - wundergraph#675 - wundergraph#672 - wundergraph#676 - wundergraph#677 - wundergraph#678 - wundergraph#679 - wundergraph#680 - wundergraph#681 - wundergraph#683 - wundergraph#682 - wundergraph#686 - wundergraph#685 - wundergraph#684 - wundergraph#688 - wundergraph#689 - wundergraph#687 - wundergraph#694 - wundergraph#696 - wundergraph#699 - wundergraph#700 - wundergraph#701 - wundergraph#704 - wundergraph#705 - wundergraph#691 - wundergraph#706 - wundergraph#707 - wundergraph#709 - wundergraph#710 - wundergraph#711 - wundergraph#714 - wundergraph#722 - wundergraph#715 - wundergraph#703 - wundergraph#723 - wundergraph#724 - wundergraph#726 - wundergraph#727 - wundergraph#728 - wundergraph#730 --------- Co-authored-by: Alberto García Hierro <alberto@garciahierro.com> Co-authored-by: Sergiy <818351+devsergiy@users.noreply.github.com> Co-authored-by: Jens Neuse <jens.neuse@gmx.de> Co-authored-by: Nithin Kumar B <nithinkumar5353@gmail.com> Co-authored-by: spetrunin <neyasut@gmail.com>
1 parent c97832a commit b464dd4

File tree

156 files changed

+17076
-7326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+17076
-7326
lines changed

.github/workflows/v1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
matrix:
23-
go: [ '1.19', '1.21' ]
23+
go: [ '1.21' ]
2424
os: [ubuntu-latest]
2525
steps:
2626
- name: Set up Go ${{ matrix.go }}

.github/workflows/v2.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
go: [ '1.19', '1.21' ]
21+
go: [ '1.21' ]
2222
os: [ubuntu-latest]
2323
steps:
24-
- name: Set up Go ${{ matrix.go }}
25-
uses: actions/setup-go@v4
26-
with:
27-
go-version: ^${{ matrix.go }}
28-
id: go
2924
- name: Set git to use LF
3025
run: |
3126
git config --global core.autocrlf false
3227
git config --global core.eol lf
3328
- name: Check out code into the Go module directory
3429
uses: actions/checkout@v3
30+
- name: Set up Go ${{ matrix.go }}
31+
uses: actions/setup-go@v4
32+
with:
33+
go-version: ^${{ matrix.go }}
34+
id: go
3535
- name: CI
3636
working-directory: v2
3737
run: make -f ../Makefile ci
@@ -44,18 +44,17 @@ jobs:
4444
name: Linters
4545
runs-on: ubuntu-latest
4646
steps:
47+
- name: Check out code into the Go module directory
48+
uses: actions/checkout@v3
4749
- name: Set up Go 1.21
4850
uses: actions/setup-go@v4
4951
with:
50-
go-version: ^1.21
51-
- name: Check out code into the Go module directory
52-
uses: actions/checkout@v3
53-
52+
go-version: 1.21
5453
- name: Run linters
5554
uses: golangci/golangci-lint-action@v3
5655
with:
5756
working-directory: v2
58-
version: v1.54.2
57+
version: v1.55.2
5958
args: --timeout=3m
6059
ci:
6160
name: CI Success

pkg/engine/resolve/resolve.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,7 @@ func (r *Resolver) ResolveGraphQLSubscription(ctx *Context, subscription *GraphQ
603603
select {
604604
case <-resolverDone:
605605
return nil
606-
default:
607-
data, ok := <-next
606+
case data, ok := <-next:
608607
if !ok {
609608
return nil
610609
}

v2/cmd/directiveUnmarshalCode.go

Lines changed: 0 additions & 89 deletions
This file was deleted.

v2/cmd/gen.go

Lines changed: 0 additions & 36 deletions
This file was deleted.

v2/cmd/root.go

Lines changed: 0 additions & 77 deletions
This file was deleted.

v2/examples/federation/go.mod

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/TykTechnologies/graphql-go-tools/v2/examples/federation
22

3-
go 1.18
3+
go 1.21.0
4+
5+
toolchain go1.21.6
46

57
require (
68
github.com/99designs/gqlgen v0.17.22
@@ -15,21 +17,26 @@ require (
1517

1618
require (
1719
github.com/agnivade/levenshtein v1.1.1 // indirect
20+
github.com/alitto/pond v1.8.3 // indirect
21+
github.com/andybalholm/brotli v1.1.0 // indirect
1822
github.com/buger/jsonparser v1.1.1 // indirect
1923
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2024
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
2125
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect
2226
github.com/gobwas/pool v0.2.0 // indirect
27+
github.com/google/uuid v1.4.0 // indirect
28+
github.com/hashicorp/errwrap v1.0.0 // indirect
29+
github.com/hashicorp/go-multierror v1.1.1 // indirect
2330
github.com/hashicorp/golang-lru v0.5.4 // indirect
2431
github.com/jensneuse/byte-template v0.0.0-20200214152254-4f3cf06e5c68 // indirect
25-
github.com/klauspost/compress v1.16.7 // indirect
32+
github.com/kr/text v0.2.0 // indirect
2633
github.com/logrusorgru/aurora/v3 v3.0.0 // indirect
2734
github.com/mattn/go-colorable v0.1.13 // indirect
2835
github.com/mattn/go-isatty v0.0.19 // indirect
2936
github.com/mitchellh/mapstructure v1.5.0 // indirect
3037
github.com/pkg/errors v0.9.1 // indirect
31-
github.com/pvormste/websocket v1.8.8 // indirect
3238
github.com/r3labs/sse/v2 v2.8.1 // indirect
39+
github.com/rogpeppe/go-internal v1.12.0 // indirect
3340
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3441
github.com/santhosh-tekuri/jsonschema/v5 v5.3.0 // indirect
3542
github.com/sirupsen/logrus v1.8.1 // indirect
@@ -40,15 +47,16 @@ require (
4047
github.com/urfave/cli/v2 v2.8.1 // indirect
4148
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
4249
go.uber.org/multierr v1.6.0 // indirect
43-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
4450
golang.org/x/mod v0.13.0 // indirect
4551
golang.org/x/net v0.17.0 // indirect
4652
golang.org/x/sync v0.4.0 // indirect
47-
golang.org/x/sys v0.13.0 // indirect
48-
golang.org/x/text v0.13.0 // indirect
53+
golang.org/x/sys v0.16.0 // indirect
54+
golang.org/x/text v0.14.0 // indirect
4955
golang.org/x/tools v0.14.0 // indirect
5056
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
57+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
5158
gopkg.in/yaml.v3 v3.0.1 // indirect
59+
nhooyr.io/websocket v1.8.10 // indirect
5260
)
5361

5462
replace github.com/TykTechnologies/graphql-go-tools/v2 => ../../

0 commit comments

Comments
 (0)