Skip to content

Commit e270279

Browse files
authored
feat: check migration status in readiness probes (#1643)
1 parent f7cb9da commit e270279

File tree

8 files changed

+127
-220
lines changed

8 files changed

+127
-220
lines changed

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
steps:
7070
- run: |
7171
docker create --name cockroach -p 26257:26257 \
72-
cockroachdb/cockroach:v20.2.5 start-single-node --insecure
72+
cockroachdb/cockroach:latest-v23.2 start-single-node --insecure
7373
docker start cockroach
7474
name: Start CockroachDB
7575
- uses: ory/ci/checkout@master

go.mod

+32-30
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ module github.com/ory/keto
66

77
replace github.com/ory/keto/proto => ./proto
88

9+
replace github.com/gobuffalo/pop/v6 => github.com/ory/pop/v6 v6.2.1-0.20241121111754-e5dfc0f3344b
10+
911
require (
1012
github.com/cenkalti/backoff/v3 v3.2.2
1113
github.com/dgraph-io/ristretto v1.0.0
@@ -22,7 +24,7 @@ require (
2224
github.com/ory/herodot v0.10.3-0.20230626083119-d7e5192f0d88
2325
github.com/ory/jsonschema/v3 v3.0.8
2426
github.com/ory/keto/proto v0.13.0-alpha.0
25-
github.com/ory/x v0.0.665
27+
github.com/ory/x v0.0.675
2628
github.com/pelletier/go-toml v1.9.5
2729
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
2830
github.com/pkg/errors v0.9.1
@@ -39,13 +41,13 @@ require (
3941
github.com/tidwall/sjson v1.2.5
4042
github.com/urfave/negroni v1.0.0
4143
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0
42-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0
43-
go.opentelemetry.io/otel v1.31.0
44-
go.opentelemetry.io/otel/sdk v1.31.0
45-
go.opentelemetry.io/otel/trace v1.31.0
44+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
45+
go.opentelemetry.io/otel v1.32.0
46+
go.opentelemetry.io/otel/sdk v1.32.0
47+
go.opentelemetry.io/otel/trace v1.32.0
4648
go.uber.org/goleak v1.3.0
4749
golang.org/x/oauth2 v0.23.0
48-
golang.org/x/sync v0.8.0
50+
golang.org/x/sync v0.9.0
4951
google.golang.org/grpc v1.67.1
5052
google.golang.org/protobuf v1.35.1
5153
)
@@ -75,7 +77,7 @@ require (
7577
github.com/docker/go-units v0.5.0 // indirect
7678
github.com/dustin/go-humanize v1.0.1 // indirect
7779
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
78-
github.com/fatih/color v1.16.0 // indirect
80+
github.com/fatih/color v1.17.0 // indirect
7981
github.com/fatih/structs v1.1.0 // indirect
8082
github.com/felixge/fgprof v0.9.3 // indirect
8183
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -90,7 +92,7 @@ require (
9092
github.com/gobuffalo/github_flavored_markdown v1.1.4 // indirect
9193
github.com/gobuffalo/helpers v0.6.7 // indirect
9294
github.com/gobuffalo/nulls v0.4.2 // indirect
93-
github.com/gobuffalo/plush/v4 v4.1.19 // indirect
95+
github.com/gobuffalo/plush/v4 v4.1.21 // indirect
9496
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
9597
github.com/gobuffalo/validate/v3 v3.3.3 // indirect
9698
github.com/gobwas/glob v0.2.3 // indirect
@@ -101,10 +103,10 @@ require (
101103
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
102104
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
103105
github.com/google/uuid v1.6.0 // indirect
104-
github.com/gorilla/css v1.0.0 // indirect
106+
github.com/gorilla/css v1.0.1 // indirect
105107
github.com/gorilla/websocket v1.5.0 // indirect
106108
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
107-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
109+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
108110
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
109111
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
110112
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -115,11 +117,11 @@ require (
115117
github.com/jackc/pgio v1.0.0 // indirect
116118
github.com/jackc/pgpassfile v1.0.0 // indirect
117119
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
118-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
119-
github.com/jackc/pgtype v1.14.0 // indirect
120-
github.com/jackc/pgx/v4 v4.18.2 // indirect
120+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
121+
github.com/jackc/pgx/v5 v5.6.0 // indirect
122+
github.com/jackc/puddle/v2 v2.2.1 // indirect
121123
github.com/jandelgado/gcov2lcov v1.0.6 // indirect
122-
github.com/jmoiron/sqlx v1.3.5 // indirect
124+
github.com/jmoiron/sqlx v1.4.0 // indirect
123125
github.com/joho/godotenv v1.5.1 // indirect
124126
github.com/josharian/intern v1.0.0 // indirect
125127
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
@@ -135,7 +137,7 @@ require (
135137
github.com/mailru/easyjson v0.7.7 // indirect
136138
github.com/mattn/go-colorable v0.1.13 // indirect
137139
github.com/mattn/go-isatty v0.0.20 // indirect
138-
github.com/mattn/go-sqlite3 v1.14.17 // indirect
140+
github.com/mattn/go-sqlite3 v1.14.22 // indirect
139141
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
140142
github.com/mitchellh/copystructure v1.2.0 // indirect
141143
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -147,15 +149,15 @@ require (
147149
github.com/opencontainers/go-digest v1.0.0 // indirect
148150
github.com/opencontainers/image-spec v1.1.0 // indirect
149151
github.com/opencontainers/runc v1.1.14 // indirect
150-
github.com/openzipkin/zipkin-go v0.4.2 // indirect
152+
github.com/openzipkin/zipkin-go v0.4.3 // indirect
151153
github.com/ory/dockertest/v3 v3.11.0 // indirect
152154
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe // indirect
153155
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
154156
github.com/pkg/profile v1.7.0 // indirect
155157
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
156158
github.com/prometheus/client_golang v1.20.4 // indirect
157159
github.com/prometheus/procfs v0.15.1 // indirect
158-
github.com/rogpeppe/go-internal v1.11.0 // indirect
160+
github.com/rogpeppe/go-internal v1.13.1 // indirect
159161
github.com/sagikazarmark/locafero v0.3.0 // indirect
160162
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
161163
github.com/seatgeek/logrus-gelf-formatter v0.0.0-20210414080842-5b05eb8ff761 // indirect
@@ -174,27 +176,27 @@ require (
174176
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
175177
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
176178
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
177-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
178-
go.opentelemetry.io/contrib/propagators/b3 v1.21.0 // indirect
179-
go.opentelemetry.io/contrib/propagators/jaeger v1.21.1 // indirect
180-
go.opentelemetry.io/contrib/samplers/jaegerremote v0.15.1 // indirect
179+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.57.0 // indirect
180+
go.opentelemetry.io/contrib/propagators/b3 v1.32.0 // indirect
181+
go.opentelemetry.io/contrib/propagators/jaeger v1.32.0 // indirect
182+
go.opentelemetry.io/contrib/samplers/jaegerremote v0.26.0 // indirect
181183
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
182-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
183-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
184-
go.opentelemetry.io/otel/exporters/zipkin v1.21.0 // indirect
185-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
186-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
184+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
185+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
186+
go.opentelemetry.io/otel/exporters/zipkin v1.32.0 // indirect
187+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
188+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
187189
go.uber.org/multierr v1.11.0 // indirect
188190
golang.org/x/crypto v0.28.0 // indirect
189191
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
190192
golang.org/x/mod v0.19.0 // indirect
191193
golang.org/x/net v0.30.0 // indirect
192-
golang.org/x/sys v0.26.0 // indirect
193-
golang.org/x/text v0.19.0 // indirect
194+
golang.org/x/sys v0.27.0 // indirect
195+
golang.org/x/text v0.20.0 // indirect
194196
golang.org/x/tools v0.23.0 // indirect
195197
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
196-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
197-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
198+
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
199+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
198200
gopkg.in/ini.v1 v1.67.0 // indirect
199201
gopkg.in/yaml.v2 v2.4.0 // indirect
200202
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)