metropolis/cli/pkg/context: replace with signal.NotifyContext
Change-Id: I457ccb83c7e25988755bb9463a8c83fc328a722b
Reviewed-on: https://review.monogon.dev/c/monogon/+/3081
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/cloud/bmaas/scruffy/cmd/BUILD.bazel b/cloud/bmaas/scruffy/cmd/BUILD.bazel
index 1a372e7..1d919b4 100644
--- a/cloud/bmaas/scruffy/cmd/BUILD.bazel
+++ b/cloud/bmaas/scruffy/cmd/BUILD.bazel
@@ -5,10 +5,7 @@
srcs = ["main.go"],
importpath = "source.monogon.dev/cloud/bmaas/scruffy/cmd",
visibility = ["//visibility:private"],
- deps = [
- "//cloud/bmaas/scruffy",
- "//metropolis/cli/pkg/context",
- ],
+ deps = ["//cloud/bmaas/scruffy"],
)
go_binary(
diff --git a/cloud/bmaas/scruffy/cmd/main.go b/cloud/bmaas/scruffy/cmd/main.go
index e838834..b675fda 100644
--- a/cloud/bmaas/scruffy/cmd/main.go
+++ b/cloud/bmaas/scruffy/cmd/main.go
@@ -3,9 +3,10 @@
import (
"context"
"flag"
+ "os"
+ "os/signal"
"source.monogon.dev/cloud/bmaas/scruffy"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
func main() {
@@ -13,7 +14,7 @@
s.Config.RegisterFlags()
flag.Parse()
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
s.Start(ctx)
<-ctx.Done()
}
diff --git a/cloud/bmaas/server/cmd/BUILD.bazel b/cloud/bmaas/server/cmd/BUILD.bazel
index 958f2c4..9f3ce58 100644
--- a/cloud/bmaas/server/cmd/BUILD.bazel
+++ b/cloud/bmaas/server/cmd/BUILD.bazel
@@ -8,7 +8,6 @@
visibility = ["//visibility:private"],
deps = [
"//cloud/bmaas/server",
- "//metropolis/cli/pkg/context",
"@io_k8s_klog_v2//:klog",
],
)
diff --git a/cloud/bmaas/server/cmd/main.go b/cloud/bmaas/server/cmd/main.go
index dd99205..8dbb7f8 100644
--- a/cloud/bmaas/server/cmd/main.go
+++ b/cloud/bmaas/server/cmd/main.go
@@ -3,11 +3,12 @@
import (
"context"
"flag"
+ "os"
+ "os/signal"
"k8s.io/klog/v2"
"source.monogon.dev/cloud/bmaas/server"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
func main() {
@@ -18,7 +19,7 @@
klog.Exitf("unexpected positional arguments: %v", flag.Args())
}
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
s.Start(ctx)
select {}
}