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/metropolis/test/launch/cli/launch-cluster/BUILD.bazel b/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
index 974258a..2c673c5 100644
--- a/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch-cluster/BUILD.bazel
@@ -8,7 +8,6 @@
visibility = ["//visibility:private"],
deps = [
"//metropolis/cli/metroctl/core",
- "//metropolis/cli/pkg/context",
"//metropolis/test/launch/cluster",
],
)
diff --git a/metropolis/test/launch/cli/launch-cluster/main.go b/metropolis/test/launch/cli/launch-cluster/main.go
index e5959f3..c9b9dec 100644
--- a/metropolis/test/launch/cli/launch-cluster/main.go
+++ b/metropolis/test/launch/cli/launch-cluster/main.go
@@ -19,14 +19,15 @@
import (
"context"
"log"
+ "os"
+ "os/signal"
metroctl "source.monogon.dev/metropolis/cli/metroctl/core"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
"source.monogon.dev/metropolis/test/launch/cluster"
)
func main() {
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
cl, err := cluster.LaunchCluster(ctx, cluster.ClusterOptions{
NumNodes: 3,
NodeLogsToFiles: true,
diff --git a/metropolis/test/launch/cli/launch/BUILD.bazel b/metropolis/test/launch/cli/launch/BUILD.bazel
index 2e58632..cfbf93a 100644
--- a/metropolis/test/launch/cli/launch/BUILD.bazel
+++ b/metropolis/test/launch/cli/launch/BUILD.bazel
@@ -7,7 +7,6 @@
importpath = "source.monogon.dev/metropolis/test/launch/cli/launch",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/cli/pkg/context",
"//metropolis/proto/api",
"//metropolis/test/launch",
"//metropolis/test/launch/cluster",
diff --git a/metropolis/test/launch/cli/launch/main.go b/metropolis/test/launch/cli/launch/main.go
index ea856a1..53b65f9 100644
--- a/metropolis/test/launch/cli/launch/main.go
+++ b/metropolis/test/launch/cli/launch/main.go
@@ -20,8 +20,8 @@
"context"
"log"
"os"
+ "os/signal"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
apb "source.monogon.dev/metropolis/proto/api"
"source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/launch/cluster"
@@ -47,7 +47,7 @@
for _, p := range cluster.NodePorts {
ports = append(ports, uint16(p))
}
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
doneC := make(chan error)
err = cluster.LaunchNode(ctx, ld, sd, &cluster.NodeOptions{
Name: "test-node",