Skip to content

Commit a32ba33

Browse files
matthewmcneelymatthewmcneely
authored
chore: Upgrade to dgo v25 and dgraph v25 (#102)
**Description** This PR upgrades to v25 Dgraph and v250 dgo preview releases **Checklist** - [x] Code compiles correctly and linting passes locally - [ ] For all _code_ changes, an entry added to the `CHANGELOG.md` file describing and linking to this PR - [x] Tests added for new functionality, or regression tests for bug fixes added as applicable
1 parent e83af4e commit a32ba33

20 files changed

+187
-197
lines changed

‎api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"errors"
1111
"reflect"
1212

13-
"github.com/hypermodeinc/dgraph/v24/dql"
14-
"github.com/hypermodeinc/dgraph/v24/schema"
13+
"github.com/hypermodeinc/dgraph/v25/dql"
14+
"github.com/hypermodeinc/dgraph/v25/schema"
1515
"github.com/hypermodeinc/modusgraph/api/apiutils"
1616
"github.com/hypermodeinc/modusgraph/api/structreflect"
1717
)

‎api/apiutils/apiutils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package apiutils
88
import (
99
"fmt"
1010

11-
"github.com/hypermodeinc/dgraph/v24/x"
11+
"github.com/hypermodeinc/dgraph/v25/x"
1212
)
1313

1414
var (

‎api/dgraphtypes/dgraphtypes.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"fmt"
1111
"time"
1212

13-
"github.com/dgraph-io/dgo/v240/protos/api"
14-
"github.com/hypermodeinc/dgraph/v24/protos/pb"
15-
"github.com/hypermodeinc/dgraph/v24/types"
13+
"github.com/dgraph-io/dgo/v250/protos/api"
14+
"github.com/hypermodeinc/dgraph/v25/protos/pb"
15+
"github.com/hypermodeinc/dgraph/v25/types"
1616
"github.com/pkg/errors"
1717
"github.com/twpayne/go-geom"
1818
"github.com/twpayne/go-geom/encoding/wkb"

‎api/mutations/mutations.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"reflect"
1111
"strings"
1212

13-
"github.com/dgraph-io/dgo/v240/protos/api"
14-
"github.com/hypermodeinc/dgraph/v24/protos/pb"
15-
"github.com/hypermodeinc/dgraph/v24/schema"
13+
"github.com/dgraph-io/dgo/v250/protos/api"
14+
"github.com/hypermodeinc/dgraph/v25/protos/pb"
15+
"github.com/hypermodeinc/dgraph/v25/schema"
1616
"github.com/hypermodeinc/modusgraph/api/apiutils"
1717
"github.com/hypermodeinc/modusgraph/api/dgraphtypes"
1818
)

‎api_mutation_gen.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"reflect"
1212
"strings"
1313

14-
"github.com/dgraph-io/dgo/v240/protos/api"
15-
"github.com/hypermodeinc/dgraph/v24/dql"
16-
"github.com/hypermodeinc/dgraph/v24/protos/pb"
17-
"github.com/hypermodeinc/dgraph/v24/schema"
18-
"github.com/hypermodeinc/dgraph/v24/x"
14+
"github.com/dgraph-io/dgo/v250/protos/api"
15+
"github.com/hypermodeinc/dgraph/v25/dql"
16+
"github.com/hypermodeinc/dgraph/v25/protos/pb"
17+
"github.com/hypermodeinc/dgraph/v25/schema"
18+
"github.com/hypermodeinc/dgraph/v25/x"
1919
"github.com/hypermodeinc/modusgraph/api/apiutils"
2020
"github.com/hypermodeinc/modusgraph/api/dgraphtypes"
2121
"github.com/hypermodeinc/modusgraph/api/mutations"

‎api_mutation_helpers.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"fmt"
1111
"reflect"
1212

13-
"github.com/hypermodeinc/dgraph/v24/dql"
14-
"github.com/hypermodeinc/dgraph/v24/protos/pb"
15-
"github.com/hypermodeinc/dgraph/v24/query"
16-
"github.com/hypermodeinc/dgraph/v24/schema"
17-
"github.com/hypermodeinc/dgraph/v24/worker"
13+
"github.com/hypermodeinc/dgraph/v25/dql"
14+
"github.com/hypermodeinc/dgraph/v25/protos/pb"
15+
"github.com/hypermodeinc/dgraph/v25/query"
16+
"github.com/hypermodeinc/dgraph/v25/schema"
17+
"github.com/hypermodeinc/dgraph/v25/worker"
1818
"github.com/hypermodeinc/modusgraph/api/apiutils"
1919
"github.com/hypermodeinc/modusgraph/api/structreflect"
2020
)

‎api_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"fmt"
1111
"strings"
1212

13-
"github.com/hypermodeinc/dgraph/v24/x"
13+
"github.com/hypermodeinc/dgraph/v25/x"
1414
"github.com/hypermodeinc/modusgraph/api/apiutils"
1515
"github.com/hypermodeinc/modusgraph/api/querygen"
1616
)

‎buf_server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"net"
1414
"strings"
1515

16-
"github.com/dgraph-io/dgo/v240"
17-
"github.com/dgraph-io/dgo/v240/protos/api"
18-
"github.com/hypermodeinc/dgraph/v24/x"
16+
"github.com/dgraph-io/dgo/v250"
17+
"github.com/dgraph-io/dgo/v250/protos/api"
18+
"github.com/hypermodeinc/dgraph/v25/x"
1919
"google.golang.org/grpc"
2020
"google.golang.org/grpc/credentials/insecure"
2121
"google.golang.org/grpc/test/bufconn"

‎client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"reflect"
1313
"strings"
1414

15-
"github.com/dgraph-io/dgo/v240"
16-
"github.com/dgraph-io/dgo/v240/protos/api"
15+
"github.com/dgraph-io/dgo/v250"
16+
"github.com/dgraph-io/dgo/v250/protos/api"
1717
dg "github.com/dolan-in/dgman/v2"
1818
"github.com/go-logr/logr"
1919
)

‎engine.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ import (
1717
"time"
1818

1919
"github.com/dgraph-io/badger/v4"
20-
"github.com/dgraph-io/dgo/v240"
21-
"github.com/dgraph-io/dgo/v240/protos/api"
20+
"github.com/dgraph-io/dgo/v250"
21+
"github.com/dgraph-io/dgo/v250/protos/api"
2222
"github.com/dgraph-io/ristretto/v2/z"
2323
"github.com/go-logr/logr"
24-
"github.com/hypermodeinc/dgraph/v24/dql"
25-
"github.com/hypermodeinc/dgraph/v24/edgraph"
26-
"github.com/hypermodeinc/dgraph/v24/posting"
27-
"github.com/hypermodeinc/dgraph/v24/protos/pb"
28-
"github.com/hypermodeinc/dgraph/v24/query"
29-
"github.com/hypermodeinc/dgraph/v24/schema"
30-
"github.com/hypermodeinc/dgraph/v24/worker"
31-
"github.com/hypermodeinc/dgraph/v24/x"
24+
"github.com/hypermodeinc/dgraph/v25/dql"
25+
"github.com/hypermodeinc/dgraph/v25/edgraph"
26+
"github.com/hypermodeinc/dgraph/v25/posting"
27+
"github.com/hypermodeinc/dgraph/v25/protos/pb"
28+
"github.com/hypermodeinc/dgraph/v25/query"
29+
"github.com/hypermodeinc/dgraph/v25/schema"
30+
"github.com/hypermodeinc/dgraph/v25/worker"
31+
"github.com/hypermodeinc/dgraph/v25/x"
3232
"google.golang.org/grpc"
3333
"google.golang.org/grpc/test/bufconn"
3434
)

‎go.mod

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module github.com/hypermodeinc/modusgraph
22

3-
go 1.24.2
3+
go 1.24.3
44

55
require (
66
github.com/cavaliergopher/grab/v3 v3.0.1
77
github.com/dgraph-io/badger/v4 v4.7.0
8-
github.com/dgraph-io/dgo/v240 v240.2.0
8+
github.com/dgraph-io/dgo/v250 v250.0.0-preview4
99
github.com/dgraph-io/ristretto/v2 v2.2.0
10-
github.com/dolan-in/dgman/v2 v2.0.0
10+
github.com/dolan-in/dgman/v2 v2.1.0-preview1
1111
github.com/go-logr/logr v1.4.3
1212
github.com/go-logr/stdr v1.2.2
13-
github.com/hypermodeinc/dgraph/v24 v24.1.3
13+
github.com/hypermodeinc/dgraph/v25 v25.0.0-preview4
1414
github.com/pkg/errors v0.9.1
1515
github.com/stretchr/testify v1.10.0
1616
github.com/twpayne/go-geom v1.6.1
@@ -19,27 +19,26 @@ require (
1919
)
2020

2121
require (
22-
contrib.go.opencensus.io/exporter/jaeger v0.2.1 // indirect
23-
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
24-
github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20220622145613-731d59e8b567 // indirect
25-
github.com/Microsoft/go-winio v0.6.2 // indirect
26-
github.com/docker/docker v28.0.4+incompatible // indirect
22+
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
2723
github.com/dolan-in/reflectwalk v1.0.2-0.20210101124621-dc2073a29d71 // indirect
2824
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
29-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
30-
github.com/philhofer/fwd v1.1.3-0.20240916144458-20a13a1f6b7c // indirect
31-
github.com/sagikazarmark/locafero v0.7.0 // indirect
25+
github.com/google/uuid v1.6.0 // indirect
26+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
27+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
28+
github.com/sagikazarmark/locafero v0.9.0 // indirect
3229
github.com/sergi/go-diff v1.2.0 // indirect
3330
github.com/sourcegraph/conc v0.3.0 // indirect
34-
github.com/tinylib/msgp v1.2.5 // indirect
35-
github.com/uber/jaeger-client-go v2.28.0+incompatible // indirect
3631
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
37-
go.opentelemetry.io/otel v1.35.0 // indirect
38-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
39-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
32+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
33+
go.opentelemetry.io/otel v1.36.0 // indirect
34+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
35+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
36+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
37+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
38+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
39+
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
4040
gonum.org/v1/gonum v0.12.0 // indirect
41-
google.golang.org/api v0.219.0 // indirect
42-
gopkg.in/DataDog/dd-trace-go.v1 v1.71.0 // indirect
41+
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
4342
)
4443

4544
require (
@@ -48,11 +47,11 @@ require (
4847
github.com/IBM/sarama v1.45.1 // indirect
4948
github.com/agnivade/levenshtein v1.2.1 // indirect
5049
github.com/beorn7/perks v1.0.1 // indirect
51-
github.com/bits-and-blooms/bitset v1.20.0 // indirect
50+
github.com/bits-and-blooms/bitset v1.22.0 // indirect
5251
// trunk-ignore(osv-scanner/GHSA-9w9f-6mg8-jp7w)
53-
github.com/blevesearch/bleve/v2 v2.4.4 // indirect
54-
github.com/blevesearch/bleve_index_api v1.2.1 // indirect
55-
github.com/blevesearch/geo v0.1.20 // indirect
52+
github.com/blevesearch/bleve/v2 v2.5.1 // indirect
53+
github.com/blevesearch/bleve_index_api v1.2.8 // indirect
54+
github.com/blevesearch/geo v0.2.3 // indirect
5655
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
5756
github.com/blevesearch/segment v0.9.1 // indirect
5857
github.com/blevesearch/snowballstem v0.9.0 // indirect
@@ -71,24 +70,24 @@ require (
7170
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
7271
github.com/eapache/queue v1.1.0 // indirect
7372
github.com/felixge/fgprof v0.9.5 // indirect
74-
github.com/fsnotify/fsnotify v1.8.0 // indirect
75-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
73+
github.com/fsnotify/fsnotify v1.9.0 // indirect
74+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
7675
github.com/gogo/protobuf v1.3.2 // indirect
7776
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
78-
github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
79-
github.com/golang/glog v1.2.4 // indirect
77+
github.com/golang/geo v0.0.0-20250516193853-92f93c4cb289 // indirect
78+
github.com/golang/glog v1.2.5 // indirect
8079
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
8180
github.com/golang/protobuf v1.5.4 // indirect
8281
github.com/golang/snappy v1.0.0 // indirect
8382
github.com/google/codesearch v1.2.0 // indirect
8483
github.com/google/flatbuffers v25.2.10+incompatible // indirect
85-
github.com/google/pprof v0.0.0-20250128161936-077ca0a936bf // indirect
84+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
8685
github.com/hashicorp/errwrap v1.1.0 // indirect
8786
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
8887
github.com/hashicorp/go-multierror v1.1.1 // indirect
8988
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
9089
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
91-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 // indirect
90+
github.com/hashicorp/go-secure-stdlib/parseutil v0.2.0 // indirect
9291
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
9392
github.com/hashicorp/go-sockaddr v1.0.7 // indirect
9493
github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -102,7 +101,7 @@ require (
102101
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
103102
github.com/json-iterator/go v1.1.12 // indirect
104103
github.com/klauspost/compress v1.18.0 // indirect
105-
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
104+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
106105
github.com/minio/md5-simd v1.1.2 // indirect
107106
github.com/minio/minio-go/v6 v6.0.57 // indirect
108107
github.com/minio/sha256-simd v1.0.1 // indirect
@@ -114,16 +113,16 @@ require (
114113
github.com/pierrec/lz4/v4 v4.1.22 // indirect
115114
github.com/pkg/profile v1.7.0 // indirect
116115
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
117-
github.com/prometheus/client_golang v1.21.1 // indirect
118-
github.com/prometheus/client_model v0.6.1 // indirect
119-
github.com/prometheus/common v0.62.0 // indirect
120-
github.com/prometheus/procfs v0.15.1 // indirect
116+
github.com/prometheus/client_golang v1.22.0 // indirect
117+
github.com/prometheus/client_model v0.6.2 // indirect
118+
github.com/prometheus/common v0.63.0 // indirect
119+
github.com/prometheus/procfs v0.16.1 // indirect
121120
github.com/prometheus/statsd_exporter v0.28.0 // indirect
122-
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
121+
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
123122
github.com/ryanuber/go-glob v1.0.0 // indirect
124123
github.com/soheilhy/cmux v0.1.5 // indirect
125-
github.com/spf13/afero v1.12.0 // indirect
126-
github.com/spf13/cast v1.7.1 // indirect
124+
github.com/spf13/afero v1.14.0 // indirect
125+
github.com/spf13/cast v1.8.0 // indirect
127126
github.com/spf13/cobra v1.9.1 // indirect
128127
github.com/spf13/pflag v1.0.6 // indirect
129128
github.com/spf13/viper v1.20.1 // indirect
@@ -136,14 +135,14 @@ require (
136135
go.opencensus.io v0.24.0 // indirect
137136
go.uber.org/multierr v1.11.0 // indirect
138137
go.uber.org/zap v1.27.0 // indirect
139-
golang.org/x/crypto v0.37.0 // indirect
140-
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
141-
golang.org/x/net v0.39.0 // indirect
142-
golang.org/x/sys v0.32.0 // indirect
143-
golang.org/x/term v0.31.0 // indirect
144-
golang.org/x/text v0.24.0 // indirect
145-
golang.org/x/time v0.9.0 // indirect
146-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
138+
golang.org/x/crypto v0.38.0 // indirect
139+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
140+
golang.org/x/net v0.40.0 // indirect
141+
golang.org/x/sys v0.33.0 // indirect
142+
golang.org/x/term v0.32.0 // indirect
143+
golang.org/x/text v0.25.0 // indirect
144+
golang.org/x/time v0.11.0 // indirect
145+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
147146
google.golang.org/grpc v1.72.1
148147
gopkg.in/ini.v1 v1.67.0 // indirect
149148
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)