client/cordium - fix notify ctx for windows

Author: geokb

client/cordium/commands/terminal/cmd.go

@@ -22,7 +22,6 @@ import (
 	"io"
 	"os"
 	"os/signal"
-	"syscall"
 	"time"
 
 	pb "github.com/octelium/octelium/apis/main/cordiumv1"
@@ -80,7 +79,7 @@ func doCmd(cmd *cobra.Command, args []string) error {
 }
 
 func DoCmdTerminal(ctx context.Context, conn *grpc.ClientConn, wsName string) error {
-	ctx, cancel := signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM)
+	ctx, cancel := notifyTerminalExitContext(ctx)
 	defer cancel()
 
 	c := pb.NewWorkspaceServiceClient(conn)
@@ -118,10 +117,10 @@ func DoCmdTerminal(ctx context.Context, conn *grpc.ClientConn, wsName string) er
 	}
 
 	sigCh := make(chan os.Signal, 1)
-	signal.Notify(sigCh, syscall.SIGWINCH)
+	notifyWindowSizeChange(sigCh)
+	defer signal.Stop(sigCh)
 
 	go func(ctx context.Context) {
-
 		for {
 			select {
 			case <-ctx.Done():
@@ -144,7 +143,6 @@ func DoCmdTerminal(ctx context.Context, conn *grpc.ClientConn, wsName string) er
 				}
 			}
 		}
-
 	}(ctx)
 
 	go func(ctx context.Context) {

client/cordium/commands/terminal/signals_unix.go

@@ -0,0 +1,34 @@
+//go:build !windows
+
+/*
+ * Copyright Octelium Labs, LLC. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package terminal
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func notifyTerminalExitContext(ctx context.Context) (context.Context, context.CancelFunc) {
+	return signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM)
+}
+
+func notifyWindowSizeChange(ch chan<- os.Signal) {
+	signal.Notify(ch, syscall.SIGWINCH)
+}

client/cordium/commands/terminal/signals_windows.go

@@ -0,0 +1,32 @@
+//go:build windows
+
+/*
+ * Copyright Octelium Labs, LLC. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package terminal
+
+import (
+	"context"
+	"os"
+	"os/signal"
+)
+
+func notifyTerminalExitContext(ctx context.Context) (context.Context, context.CancelFunc) {
+	return signal.NotifyContext(ctx, os.Interrupt)
+}
+
+func notifyWindowSizeChange(ch chan<- os.Signal) {
+}