hotfix: ignore print cancel GRPC msg (#399)

kubenetworks · Dec 13, 2024 · 6e594fa · 6e594fa
1 parent f046e47
commit 6e594fa
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 4 deletions.
diff --git a/cmd/kubevpn/cmds/clone.go b/cmd/kubevpn/cmds/clone.go
@@ -7,6 +7,8 @@ import (
 	pkgerr "github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	utilcomp "k8s.io/kubectl/pkg/util/completion"
 	"k8s.io/kubectl/pkg/util/i18n"
@@ -140,6 +142,9 @@ func CmdClone(f cmdutil.Factory) *cobra.Command {
 			}
 			err = util.PrintGRPCStream[rpc.CloneResponse](resp)
 			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
 				return err
 			}
 			util.Print(os.Stdout, config.Slogan)

diff --git a/cmd/kubevpn/cmds/connect.go b/cmd/kubevpn/cmds/connect.go
@@ -8,6 +8,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -107,6 +109,9 @@ func CmdConnect(f cmdutil.Factory) *cobra.Command {
 			}
 			err = util.PrintGRPCStream[rpc.ConnectResponse](resp)
 			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
 				return err
 			}
 			if !foreground {
@@ -124,6 +129,9 @@ func CmdConnect(f cmdutil.Factory) *cobra.Command {
 				}
 				err = util.PrintGRPCStream[rpc.DisconnectResponse](disconnect)
 				if err != nil {
+					if status.Code(err) == codes.Canceled {
+						return nil
+					}
 					return err
 				}
 				_, _ = fmt.Fprint(os.Stdout, "Disconnect completed")

diff --git a/cmd/kubevpn/cmds/disconnect.go b/cmd/kubevpn/cmds/disconnect.go
@@ -6,6 +6,8 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -71,6 +73,9 @@ func CmdDisconnect(f cmdutil.Factory) *cobra.Command {
 			}
 			err = util.PrintGRPCStream[rpc.DisconnectResponse](client)
 			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
 				return err
 			}
 			_, _ = fmt.Fprint(os.Stdout, "Disconnect completed")

diff --git a/cmd/kubevpn/cmds/leave.go b/cmd/kubevpn/cmds/leave.go
@@ -2,6 +2,8 @@ package cmds
 
 import (
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -39,7 +41,13 @@ func CmdLeave(f cmdutil.Factory) *cobra.Command {
 				return err
 			}
 			err = util.PrintGRPCStream[rpc.LeaveResponse](leave)
-			return err
+			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
+				return err
+			}
+			return nil
 		},
 	}
 	return leaveCmd

diff --git a/cmd/kubevpn/cmds/logs.go b/cmd/kubevpn/cmds/logs.go
@@ -2,6 +2,8 @@ package cmds
 
 import (
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -36,7 +38,13 @@ func CmdLogs(f cmdutil.Factory) *cobra.Command {
 				return err
 			}
 			err = util.PrintGRPCStream[rpc.LogResponse](client)
-			return err
+			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
+				return err
+			}
+			return nil
 		},
 	}
 	cmd.Flags().BoolVarP(&req.Follow, "follow", "f", false, "Specify if the logs should be streamed.")

diff --git a/cmd/kubevpn/cmds/proxy.go b/cmd/kubevpn/cmds/proxy.go
@@ -7,6 +7,8 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	utilcomp "k8s.io/kubectl/pkg/util/completion"
 	"k8s.io/kubectl/pkg/util/i18n"
@@ -138,6 +140,9 @@ func CmdProxy(f cmdutil.Factory) *cobra.Command {
 			}
 			err = util.PrintGRPCStream[rpc.ConnectResponse](client)
 			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
 				return err
 			}
 			util.Print(os.Stdout, config.Slogan)
@@ -154,6 +159,9 @@ func CmdProxy(f cmdutil.Factory) *cobra.Command {
 				}
 				err = util.PrintGRPCStream[rpc.LeaveResponse](stream)
 				if err != nil {
+					if status.Code(err) == codes.Canceled {
+						return nil
+					}
 					return err
 				}
 			}

diff --git a/cmd/kubevpn/cmds/quit.go b/cmd/kubevpn/cmds/quit.go
@@ -6,6 +6,8 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -48,6 +50,9 @@ func quit(ctx context.Context, isSudo bool) error {
 	}
 	err = util.PrintGRPCStream[rpc.QuitResponse](client)
 	if err != nil {
+		if status.Code(err) == codes.Canceled {
+			return nil
+		}
 		return err
 	}
 	return nil

diff --git a/cmd/kubevpn/cmds/remove.go b/cmd/kubevpn/cmds/remove.go
@@ -2,6 +2,8 @@ package cmds
 
 import (
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -37,7 +39,13 @@ func CmdRemove(f cmdutil.Factory) *cobra.Command {
 				return err
 			}
 			err = util.PrintGRPCStream[rpc.RemoveResponse](leave)
-			return err
+			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
+				return err
+			}
+			return nil
 		},
 	}
 	return cmd

diff --git a/cmd/kubevpn/cmds/reset.go b/cmd/kubevpn/cmds/reset.go
@@ -3,6 +3,8 @@ package cmds
 import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
@@ -78,7 +80,13 @@ func CmdReset(f cmdutil.Factory) *cobra.Command {
 				return err
 			}
 			err = util.PrintGRPCStream[rpc.ResetResponse](resp)
-			return err
+			if err != nil {
+				if status.Code(err) == codes.Canceled {
+					return nil
+				}
+				return err
+			}
+			return nil
 		},
 	}