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/equinix/cli/BUILD.bazel b/cloud/equinix/cli/BUILD.bazel
index da94d95..d10fdeb 100644
--- a/cloud/equinix/cli/BUILD.bazel
+++ b/cloud/equinix/cli/BUILD.bazel
@@ -13,7 +13,6 @@
visibility = ["//visibility:private"],
deps = [
"//cloud/equinix/wrapngo",
- "//metropolis/cli/pkg/context",
"@com_github_packethost_packngo//:packngo",
"@com_github_spf13_cobra//:cobra",
"@io_k8s_klog_v2//:klog",
diff --git a/cloud/equinix/cli/cmd_delete.go b/cloud/equinix/cli/cmd_delete.go
index 056956e..97eb26f 100644
--- a/cloud/equinix/cli/cmd_delete.go
+++ b/cloud/equinix/cli/cmd_delete.go
@@ -2,6 +2,8 @@
import (
"context"
+ "os"
+ "os/signal"
"time"
"github.com/packethost/packngo"
@@ -9,7 +11,6 @@
"k8s.io/klog/v2"
"source.monogon.dev/cloud/equinix/wrapngo"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
var deleteCmd = &cobra.Command{
@@ -24,7 +25,7 @@
}
func doDelete(cmd *cobra.Command, args []string) {
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
api := wrapngo.New(&c)
klog.Infof("Listing devices for %q", args[0])
diff --git a/cloud/equinix/cli/cmd_move.go b/cloud/equinix/cli/cmd_move.go
index 770e480..ec32071 100644
--- a/cloud/equinix/cli/cmd_move.go
+++ b/cloud/equinix/cli/cmd_move.go
@@ -2,12 +2,13 @@
import (
"context"
+ "os"
+ "os/signal"
"github.com/spf13/cobra"
"k8s.io/klog/v2"
"source.monogon.dev/cloud/equinix/wrapngo"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
var moveCmd = &cobra.Command{
@@ -22,7 +23,7 @@
}
func doMove(cmd *cobra.Command, args []string) {
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
api := wrapngo.New(&c)
klog.Infof("Listing reservations for %q", args[0])
diff --git a/cloud/equinix/cli/cmd_reboot.go b/cloud/equinix/cli/cmd_reboot.go
index 7fcd35c..e788f01 100644
--- a/cloud/equinix/cli/cmd_reboot.go
+++ b/cloud/equinix/cli/cmd_reboot.go
@@ -2,12 +2,13 @@
import (
"context"
+ "os"
+ "os/signal"
"github.com/spf13/cobra"
"k8s.io/klog/v2"
"source.monogon.dev/cloud/equinix/wrapngo"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
var rebootCmd = &cobra.Command{
@@ -22,7 +23,7 @@
}
func doReboot(cmd *cobra.Command, args []string) {
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
api := wrapngo.New(&c)
klog.Infof("Requesting device list...")
diff --git a/cloud/equinix/cli/cmd_yoink.go b/cloud/equinix/cli/cmd_yoink.go
index bda9e82..c351d47 100644
--- a/cloud/equinix/cli/cmd_yoink.go
+++ b/cloud/equinix/cli/cmd_yoink.go
@@ -4,6 +4,7 @@
"bufio"
"context"
"os"
+ "os/signal"
"sort"
"strconv"
"strings"
@@ -13,7 +14,6 @@
"k8s.io/klog/v2"
"source.monogon.dev/cloud/equinix/wrapngo"
- clicontext "source.monogon.dev/metropolis/cli/pkg/context"
)
var yoinkCmd = &cobra.Command{
@@ -73,7 +73,7 @@
klog.Exitf("missing metro flag")
}
- ctx := clicontext.WithInterrupt(context.Background())
+ ctx, _ := signal.NotifyContext(context.Background(), os.Interrupt)
api := wrapngo.New(&c)
klog.Infof("Listing reservations for %q", srcProject)