Skip to content

Commit ab42503

Browse files
authored
port to flaps.Wait options API (#4778)
* port to flaps.Wait options API (superfly/fly-go#210) Replace the old Wait(machine *fly.Machine, state string, timeout) signature with the new options-based API: Wait(machineID string, waitOpts ...WaitOption). All 11 call sites are updated to use WithWaitStates and WithWaitTimeout. Mocks, the in-memory test client, and the gomock-generated mock are updated to match the new interface. * upgrade fly-go to v0.4.0
1 parent 77b43da commit ab42503

18 files changed

Lines changed: 106 additions & 122 deletions

File tree

go.mod

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,40 @@ require (
7373
github.com/spf13/pflag v1.0.10
7474
github.com/spf13/viper v1.20.1
7575
github.com/stretchr/testify v1.11.1
76-
github.com/superfly/fly-go v0.3.1
76+
github.com/superfly/fly-go v0.4.0
7777
github.com/superfly/graphql v0.2.6
7878
github.com/superfly/lfsc-go v0.1.1
7979
github.com/superfly/macaroon v0.3.0
8080
github.com/superfly/tokenizer v0.0.3-0.20240826174224-a17a2e0a9dc0
81-
github.com/vektah/gqlparser/v2 v2.5.31
81+
github.com/vektah/gqlparser/v2 v2.5.32
8282
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0
8383
go.opentelemetry.io/otel v1.42.0
84-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0
85-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.42.0
84+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0
85+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0
8686
go.opentelemetry.io/otel/sdk v1.42.0
8787
go.opentelemetry.io/otel/trace v1.42.0
8888
go.uber.org/mock v0.6.0
89-
golang.org/x/crypto v0.48.0
90-
golang.org/x/mod v0.33.0
91-
golang.org/x/net v0.51.0
92-
golang.org/x/sync v0.19.0
93-
golang.org/x/sys v0.41.0
94-
golang.org/x/term v0.40.0
95-
golang.org/x/text v0.34.0
89+
golang.org/x/crypto v0.49.0
90+
golang.org/x/mod v0.34.0
91+
golang.org/x/net v0.52.0
92+
golang.org/x/sync v0.20.0
93+
golang.org/x/sys v0.42.0
94+
golang.org/x/term v0.41.0
95+
golang.org/x/text v0.35.0
9696
golang.org/x/time v0.14.0
9797
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
98-
google.golang.org/grpc v1.79.2
98+
google.golang.org/grpc v1.78.0
9999
gopkg.in/yaml.v3 v3.0.1
100100
)
101101

102102
require (
103-
cel.dev/expr v0.25.1 // indirect
103+
cel.dev/expr v0.24.0 // indirect
104104
cyphar.com/go-pathrs v0.2.1 // indirect
105105
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
106106
github.com/aws/aws-sdk-go-v2/service/signin v1.0.7 // indirect
107107
github.com/bahlo/generic-list-go v0.2.0 // indirect
108108
github.com/buger/jsonparser v1.1.1 // indirect
109-
github.com/containerd/containerd v1.7.29 // indirect
109+
github.com/containerd/containerd v1.7.27 // indirect
110110
github.com/creack/pty v1.1.24 // indirect
111111
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
112112
github.com/google/cel-go v0.26.1 // indirect
@@ -118,8 +118,8 @@ require (
118118
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
119119
go.yaml.in/yaml/v2 v2.4.3 // indirect
120120
go.yaml.in/yaml/v3 v3.0.4 // indirect
121-
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
122-
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
121+
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
122+
golang.org/x/telemetry v0.0.0-20260311193753-579e4da9a98c // indirect
123123
gopkg.in/yaml.v2 v2.4.0 // indirect
124124
gotest.tools/v3 v3.5.2 // indirect
125125
)
@@ -210,10 +210,10 @@ require (
210210
github.com/golang/protobuf v1.5.4 // indirect
211211
github.com/google/btree v1.0.1 // indirect
212212
github.com/google/go-containerregistry v0.20.6
213-
github.com/google/go-querystring v1.1.0 // indirect
213+
github.com/google/go-querystring v1.2.0 // indirect
214214
github.com/google/uuid v1.6.0 // indirect
215215
github.com/gorilla/mux v1.8.1 // indirect
216-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
216+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
217217
github.com/hashicorp/errwrap v1.1.0 // indirect
218218
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
219219
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -281,16 +281,16 @@ require (
281281
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
282282
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
283283
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
284-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect
284+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
285285
go.opentelemetry.io/otel/metric v1.42.0 // indirect
286286
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
287287
go.uber.org/multierr v1.11.0 // indirect
288288
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
289-
golang.org/x/oauth2 v0.35.0 // indirect
290-
golang.org/x/tools v0.41.0 // indirect
289+
golang.org/x/oauth2 v0.34.0 // indirect
290+
golang.org/x/tools v0.43.0 // indirect
291291
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
292-
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect
293-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
292+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
293+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
294294
google.golang.org/protobuf v1.36.11 // indirect
295295
gopkg.in/warnings.v0 v0.1.2 // indirect
296296
gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 // indirect

0 commit comments

Comments
 (0)