From 28005dc4b750efb68a43569a416b479119d43b8f Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Tue, 7 May 2024 17:01:40 +0100 Subject: [PATCH 1/2] feat: update reverst to v0.1.5 Signed-off-by: George MacRorie --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f115164443..4f3699608b 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( go.flipt.io/flipt/errors v1.19.3 go.flipt.io/flipt/rpc/flipt v1.38.0 go.flipt.io/flipt/sdk/go v0.11.0 - go.flipt.io/reverst v0.1.4 + go.flipt.io/reverst v0.1.5 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 go.opentelemetry.io/contrib/instrumentation/runtime v0.51.0 go.opentelemetry.io/contrib/propagators/autoprop v0.50.0 diff --git a/go.sum b/go.sum index b93e48e484..96de88ad5d 100644 --- a/go.sum +++ b/go.sum @@ -742,8 +742,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= -go.flipt.io/reverst v0.1.4 h1:JC5NG5bYmWxYpunDYWTZZK6tpV+Lpi3b1/K7SmA7hBI= -go.flipt.io/reverst v0.1.4/go.mod h1:SS5IqAgnPKWqEHq67p+G9Dsdyp+bQ3teh0LhyxnjKW4= +go.flipt.io/reverst v0.1.5 h1:Riaq61rndAssPYEFUF6BnvauzDXcw+pXamHc3rrENH8= +go.flipt.io/reverst v0.1.5/go.mod h1:SS5IqAgnPKWqEHq67p+G9Dsdyp+bQ3teh0LhyxnjKW4= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= From 7cf03a4ad0c322429e16361b21cc579b78f8229d Mon Sep 17 00:00:00 2001 From: George MacRorie Date: Tue, 7 May 2024 17:05:18 +0100 Subject: [PATCH 2/2] fix(cloud): handle context canceled healthy shutdown Signed-off-by: George MacRorie --- cmd/flipt/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/flipt/main.go b/cmd/flipt/main.go index 9be588143f..e4b1ea50be 100644 --- a/cmd/flipt/main.go +++ b/cmd/flipt/main.go @@ -439,7 +439,9 @@ func run(ctx context.Context, logger *zap.Logger, cfg *config.Config) error { logger.Info("cloud tunnel established", zap.String("address", fmt.Sprintf("https://%s", tunnel))) - if err := tunnelServer.DialAndServe(ctx, addr); err != nil && !errors.Is(err, http.ErrServerClosed) { + if err := tunnelServer.DialAndServe(ctx, addr); err != nil && + !errors.Is(err, http.ErrServerClosed) && + !errors.Is(err, context.Canceled) { return fmt.Errorf("creating cloud tunnel server: %w", err) }