Skip to content

Commit d3e1c21

Browse files
authored
Merge pull request #378 from authzed/use-same-spanner-ver-as-spicedb
updates to use same Spanner SDK and emulator as SpiceDB
2 parents b2da5f5 + 329ddab commit d3e1c21

14 files changed

Lines changed: 600 additions & 554 deletions

File tree

.github/workflows/build-test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
GO_VERSION: "~1.22"
1515
jobs:
1616
paths-filter:
17-
runs-on: "ubuntu-latest"
17+
runs-on: "depot-ubuntu-24.04"
1818
outputs:
1919
codechange: "${{ steps.filter.outputs.codechange }}"
2020
graphchange: "${{ steps.graph-filter.outputs.graphchange }}"
@@ -44,7 +44,7 @@ jobs:
4444
if: |
4545
needs.paths-filter.outputs.codechange == 'true'
4646
name: "Build Binary"
47-
runs-on: "ubuntu-latest"
47+
runs-on: "depot-ubuntu-24.04"
4848
steps:
4949
- uses: "actions/checkout@v5"
5050
- uses: "authzed/actions/setup-go@main"
@@ -57,7 +57,7 @@ jobs:
5757
if: |
5858
needs.paths-filter.outputs.codechange == 'true'
5959
name: "Build Container Image"
60-
runs-on: "ubuntu-latest"
60+
runs-on: "depot-ubuntu-24.04"
6161
steps:
6262
- uses: "actions/checkout@v5"
6363
- uses: "authzed/actions/setup-go@main"
@@ -75,7 +75,7 @@ jobs:
7575
if: |
7676
needs.paths-filter.outputs.codechange == 'true'
7777
name: "Unit Tests"
78-
runs-on: "ubuntu-latest"
78+
runs-on: "depot-ubuntu-24.04"
7979
steps:
8080
- uses: "actions/checkout@v5"
8181
with:
@@ -96,7 +96,7 @@ jobs:
9696
if: |
9797
needs.paths-filter.outputs.codechange == 'true' || needs.paths-filter.outputs.graphchange == 'true'
9898
name: "E2E Tests"
99-
runs-on: "ubuntu-latest-8-cores"
99+
runs-on: "depot-ubuntu-24.04-8"
100100
steps:
101101
- uses: "actions/checkout@v5"
102102
if: |

.github/workflows/cla.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on: # yamllint disable-line rule:truthy
1515
jobs:
1616
cla:
1717
name: "Check Signature"
18-
runs-on: "ubuntu-latest"
18+
runs-on: "depot-ubuntu-24.04"
1919
steps:
2020
- uses: "authzed/actions/cla-check@main"
2121
with:

.github/workflows/lint.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
go-lint:
1717
name: "Lint Go"
18-
runs-on: "ubuntu-latest"
18+
runs-on: "depot-ubuntu-24.04"
1919
steps:
2020
- uses: "actions/checkout@v5"
2121
- uses: "authzed/actions/setup-go@main"
@@ -50,7 +50,7 @@ jobs:
5050

5151
extra-lint:
5252
name: "Lint YAML & Markdown"
53-
runs-on: "ubuntu-latest"
53+
runs-on: "depot-ubuntu-24.04"
5454
steps:
5555
- uses: "actions/checkout@v5"
5656
- uses: "authzed/actions/yaml-lint@main"
@@ -68,7 +68,7 @@ jobs:
6868
codeql:
6969
if: "${{ github.event_name == 'pull_request' }}"
7070
name: "Analyze with CodeQL"
71-
runs-on: "ubuntu-latest-8-cores"
71+
runs-on: "depot-ubuntu-24.04-8"
7272
permissions:
7373
actions: "read"
7474
contents: "read"

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
GO_VERSION: "~1.22"
1212
jobs:
1313
goreleaser:
14-
runs-on: "ubuntu-latest"
14+
runs-on: "depot-ubuntu-24.04"
1515
env:
1616
KUSTOMIZER_ARTIFACT: "oci://ghcr.io/${{github.repository_owner}}/${{github.event.repository.name}}-manifests"
1717
steps:

e2e/databases/manifests/spanner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
spec:
3636
containers:
3737
- name: spanner
38-
image: gcr.io/cloud-spanner-emulator/emulator:1.5.24
38+
image: gcr.io/cloud-spanner-emulator/emulator:1.5.41
3939
imagePullPolicy: IfNotPresent
4040
ports:
4141
- containerPort: 9010

e2e/go.mod

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
module github.com/authzed/spicedb-operator/e2e
22

3-
go 1.23.0
4-
5-
toolchain go1.23.4
3+
go 1.24.0
64

75
require (
8-
cloud.google.com/go/spanner v1.73.0
9-
github.com/authzed/controller-idioms v0.11.0
6+
cloud.google.com/go/spanner v1.85.0
7+
github.com/authzed/controller-idioms v0.13.0
108
github.com/authzed/spicedb-operator v0.0.0-00010101000000-000000000000
119
github.com/fluxcd/cli-utils v0.36.0-flux.11
1210
github.com/fluxcd/pkg/ssa v0.43.0
13-
github.com/go-logr/logr v1.4.2
11+
github.com/go-logr/logr v1.4.3
1412
github.com/go-logr/zapr v1.3.0
1513
github.com/go-sql-driver/mysql v1.8.1
1614
github.com/jackc/pgx/v5 v5.7.2
@@ -20,40 +18,39 @@ require (
2018
github.com/onsi/gomega v1.36.2
2119
github.com/spf13/afero v1.12.0
2220
go.uber.org/zap v1.27.0
23-
google.golang.org/api v0.217.0
24-
google.golang.org/genproto v0.0.0-20250115164207-1a7da9e5054f
25-
google.golang.org/grpc v1.69.4
26-
k8s.io/api v0.32.3
27-
k8s.io/apiextensions-apiserver v0.32.1
28-
k8s.io/apimachinery v0.32.3
29-
k8s.io/apiserver v0.32.3
30-
k8s.io/cli-runtime v0.32.3
31-
k8s.io/client-go v0.32.3
21+
google.golang.org/api v0.247.0
22+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822
23+
google.golang.org/grpc v1.74.2
24+
k8s.io/api v0.34.0-alpha.2
25+
k8s.io/apiextensions-apiserver v0.34.0-alpha.2
26+
k8s.io/apimachinery v0.34.0-alpha.2
27+
k8s.io/apiserver v0.34.0-alpha.2
28+
k8s.io/cli-runtime v0.34.0-alpha.2
29+
k8s.io/client-go v0.34.0-alpha.2
3230
k8s.io/klog/v2 v2.130.1
33-
k8s.io/kubectl v0.32.3
34-
k8s.io/utils v0.0.0-20241210054802-24370beab758
31+
k8s.io/kubectl v0.34.0-alpha.2
32+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
3533
sigs.k8s.io/controller-runtime v0.20.0
3634
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20250121065037-b2dbf6eaa9fa
3735
sigs.k8s.io/kind v0.27.0
38-
sigs.k8s.io/yaml v1.4.0
36+
sigs.k8s.io/yaml v1.5.0
3937
)
4038

4139
require (
4240
al.essio.dev/pkg/shellescape v1.5.1 // indirect
43-
cel.dev/expr v0.19.1 // indirect
44-
cloud.google.com/go v0.118.0 // indirect
45-
cloud.google.com/go/auth v0.14.0 // indirect
46-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
47-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
48-
cloud.google.com/go/iam v1.3.1 // indirect
49-
cloud.google.com/go/longrunning v0.6.4 // indirect
41+
cel.dev/expr v0.24.0 // indirect
42+
cloud.google.com/go v0.121.6 // indirect
43+
cloud.google.com/go/auth v0.16.4 // indirect
44+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
45+
cloud.google.com/go/compute/metadata v0.8.0 // indirect
46+
cloud.google.com/go/iam v1.5.2 // indirect
47+
cloud.google.com/go/longrunning v0.6.7 // indirect
5048
filippo.io/edwards25519 v1.1.0 // indirect
5149
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
5250
github.com/BurntSushi/toml v1.4.0 // indirect
5351
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5452
github.com/NYTimes/gziphandler v1.1.1 // indirect
5553
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
56-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5754
github.com/beorn7/perks v1.0.1 // indirect
5855
github.com/blang/semver/v4 v4.0.0 // indirect
5956
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -68,8 +65,8 @@ require (
6865
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6966
github.com/fatih/camelcase v1.0.0 // indirect
7067
github.com/felixge/httpsnoop v1.0.4 // indirect
71-
github.com/fsnotify/fsnotify v1.8.0 // indirect
72-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
68+
github.com/fsnotify/fsnotify v1.9.0 // indirect
69+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
7370
github.com/go-errors/errors v1.5.1 // indirect
7471
github.com/go-logr/stdr v1.2.2 // indirect
7572
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -79,29 +76,27 @@ require (
7976
github.com/gogo/protobuf v1.3.2 // indirect
8077
github.com/golang/protobuf v1.5.4 // indirect
8178
github.com/google/btree v1.1.3 // indirect
82-
github.com/google/cel-go v0.22.1 // indirect
79+
github.com/google/cel-go v0.25.0 // indirect
8380
github.com/google/gnostic-models v0.6.9 // indirect
84-
github.com/google/go-cmp v0.6.0 // indirect
85-
github.com/google/gofuzz v1.2.0 // indirect
81+
github.com/google/go-cmp v0.7.0 // indirect
8682
github.com/google/pprof v0.0.0-20250121033306-997b0b79cac0 // indirect
8783
github.com/google/s2a-go v0.1.9 // indirect
8884
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
8985
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9086
github.com/google/uuid v1.6.0 // indirect
91-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
92-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
93-
github.com/gorilla/websocket v1.5.3 // indirect
87+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
88+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
89+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
9490
github.com/gosimple/slug v1.15.0 // indirect
9591
github.com/gosimple/unidecode v1.0.1 // indirect
9692
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9793
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
98-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 // indirect
94+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
9995
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10096
github.com/jackc/pgpassfile v1.0.0 // indirect
10197
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
10298
github.com/josharian/intern v1.0.0 // indirect
10399
github.com/json-iterator/go v1.1.12 // indirect
104-
github.com/klauspost/compress v1.17.11 // indirect
105100
github.com/kylelemons/godebug v1.1.0 // indirect
106101
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
107102
github.com/mailru/easyjson v0.9.0 // indirect
@@ -110,15 +105,16 @@ require (
110105
github.com/moby/spdystream v0.5.0 // indirect
111106
github.com/moby/term v0.5.2 // indirect
112107
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
113-
github.com/modern-go/reflect2 v1.0.2 // indirect
108+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
114109
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
115110
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
116111
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
117112
github.com/pborman/uuid v1.2.1 // indirect
118113
github.com/pelletier/go-toml v1.9.5 // indirect
119114
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
120115
github.com/pkg/errors v0.9.1 // indirect
121-
github.com/prometheus/client_golang v1.20.5 // indirect
116+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
117+
github.com/prometheus/client_golang v1.22.0 // indirect
122118
github.com/prometheus/client_model v0.6.1 // indirect
123119
github.com/prometheus/common v0.62.0 // indirect
124120
github.com/prometheus/procfs v0.15.1 // indirect
@@ -129,46 +125,49 @@ require (
129125
github.com/stoewer/go-strcase v1.3.0 // indirect
130126
github.com/x448/float16 v0.8.4 // indirect
131127
github.com/xlab/treeprint v1.2.0 // indirect
132-
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
133-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
134-
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
128+
go.etcd.io/etcd/api/v3 v3.6.1 // indirect
129+
go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect
130+
go.etcd.io/etcd/client/v3 v3.6.1 // indirect
135131
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
136-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
137-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
138-
go.opentelemetry.io/otel v1.34.0 // indirect
132+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
133+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
134+
go.opentelemetry.io/otel v1.36.0 // indirect
139135
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
140136
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
141-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
142-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
143-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
144-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
137+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
138+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
139+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
145140
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
146141
go.uber.org/atomic v1.11.0 // indirect
147142
go.uber.org/multierr v1.11.0 // indirect
148-
golang.org/x/crypto v0.38.0 // indirect
143+
go.yaml.in/yaml/v2 v2.4.2 // indirect
144+
go.yaml.in/yaml/v3 v3.0.3 // indirect
145+
golang.org/x/crypto v0.41.0 // indirect
149146
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
150-
golang.org/x/net v0.34.0 // indirect
151-
golang.org/x/oauth2 v0.25.0 // indirect
152-
golang.org/x/sync v0.14.0 // indirect
153-
golang.org/x/sys v0.33.0 // indirect
154-
golang.org/x/term v0.32.0 // indirect
155-
golang.org/x/text v0.25.0 // indirect
156-
golang.org/x/time v0.9.0 // indirect
157-
golang.org/x/tools v0.29.0 // indirect
158-
google.golang.org/genproto/googleapis/api v0.0.0-20250122153221-138b5a5a4fd4 // indirect
159-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250122153221-138b5a5a4fd4 // indirect
160-
google.golang.org/protobuf v1.36.3 // indirect
147+
golang.org/x/net v0.43.0 // indirect
148+
golang.org/x/oauth2 v0.30.0 // indirect
149+
golang.org/x/sync v0.16.0 // indirect
150+
golang.org/x/sys v0.35.0 // indirect
151+
golang.org/x/term v0.34.0 // indirect
152+
golang.org/x/text v0.28.0 // indirect
153+
golang.org/x/time v0.12.0 // indirect
154+
golang.org/x/tools v0.35.0 // indirect
155+
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
156+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
157+
google.golang.org/protobuf v1.36.7 // indirect
161158
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
162159
gopkg.in/inf.v0 v0.9.1 // indirect
163160
gopkg.in/yaml.v3 v3.0.1 // indirect
164-
k8s.io/component-base v0.32.3 // indirect
165-
k8s.io/controller-manager v0.32.3 // indirect
166-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
167-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.1 // indirect
161+
k8s.io/component-base v0.34.0-alpha.2 // indirect
162+
k8s.io/component-helpers v0.34.0-alpha.2 // indirect
163+
k8s.io/controller-manager v0.34.0-alpha.2 // indirect
164+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
165+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
168166
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
169167
sigs.k8s.io/kustomize/api v0.19.0 // indirect
170168
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
171-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
169+
sigs.k8s.io/randfill v1.0.0 // indirect
170+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
172171
)
173172

174173
replace github.com/authzed/spicedb-operator => ../

0 commit comments

Comments
 (0)