Revert "Confirm cancelling when user cancels (Ctrl+C) CLI execution (#…

…5207)" (#5724)

This reverts commit 045372f.

cmd/eksctl-anywhere/cmd/root.go

@@ -3,19 +3,15 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"io"
 	"log"
 	"os"
 	"path/filepath"
-	"syscall"
 	"time"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/aws/eks-anywhere/pkg/console"
 	"github.com/aws/eks-anywhere/pkg/logger"
-	"github.com/aws/eks-anywhere/pkg/signals"
 )
 
 var rootCmd = &cobra.Command{
@@ -42,55 +38,24 @@ func init() {
 }
 
 func rootPersistentPreRun(cmd *cobra.Command, args []string) {
-	stdout := logger.NewPausableWriter(os.Stdout)
-
-	if err := initLogger(stdout); err != nil {
+	if err := initLogger(); err != nil {
 		log.Fatal(err)
 	}
-
-	signals.On(func() {
-		resume := stdout.Pause()
-
-		logger.Info("Warning: Terminating this operation may leave the cluster in an irrecoverable state.")
-		if console.Confirm("Are you sure you want to exit?", os.Stdout, os.Stdin) {
-			os.Exit(-1)
-		}
-
-		if err := resume(); err != nil {
-			// Logging the error may not alert the user because the logger may be borked.
-			// We can't terminate the program so instead we're writing to Stdout so the user is
-			// aware an issue has happened.
-			//
-			// We still log the error as other log sinks may be working.
-			logger.Error(err, "Resuming stdout logging")
-			fmt.Fprintf(os.Stderr, "Failed to resume stdout logging: %s", err)
-		}
-	}, syscall.SIGINT)
-
-	// We've historically performed a forceful process termination on SIGTERM. We should be able to
-	// improve this and trigger a graceful shutdown instead.
-	signals.On(func() {
-		logger.Info("Warning: Terminating may have left your cluster in an irrecoverable state.")
-		os.Exit(-1)
-	}, syscall.SIGTERM)
 }
 
-func initLogger(consoleWriter io.Writer) error {
+func initLogger() error {
 	logsFolder := filepath.Join(".", "eksa-cli-logs")
 	err := os.MkdirAll(logsFolder, 0o750)
 	if err != nil {
 		return fmt.Errorf("failed to create logs folder: %v", err)
 	}
-	filename := fmt.Sprintf("%s.log", time.Now().Format("2006-01-02T15_04_05"))
-	logFilePath := filepath.Join(".", "eksa-cli-logs", filename)
 
-	err = logger.Init(logger.Options{
+	outputFilePath := filepath.Join(".", "eksa-cli-logs", fmt.Sprintf("%s.log", time.Now().Format("2006-01-02T15_04_05")))
+	if err = logger.Init(logger.Options{
 		Level:          viper.GetInt("verbosity"),
-		OutputFilePath: logFilePath,
-		Console:        consoleWriter,
-	})
-	if err != nil {
-		return fmt.Errorf("root cmd: init zap: %v", err)
+		OutputFilePath: outputFilePath,
+	}); err != nil {
+		return fmt.Errorf("root cmd: %v", err)
 	}
 
 	return nil

cmd/eksctl-anywhere/main.go

@@ -3,12 +3,22 @@ package main
 import (
 	"fmt"
 	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/aws/eks-anywhere/cmd/eksctl-anywhere/cmd"
 	"github.com/aws/eks-anywhere/pkg/eksctl"
+	"github.com/aws/eks-anywhere/pkg/logger"
 )
 
 func main() {
+	sigChannel := make(chan os.Signal, 1)
+	signal.Notify(sigChannel, syscall.SIGINT, syscall.SIGTERM)
+	go func() {
+		<-sigChannel
+		logger.Info("Warning: Terminating this operation may leave the cluster in an irrecoverable state")
+		os.Exit(-1)
+	}()
 	if eksctl.Enabled() {
 		err := eksctl.ValidateVersion()
 		if err != nil {

pkg/logger/init.go

@@ -2,7 +2,6 @@ package logger
 
 import (
 	"fmt"
-	"io"
 	"os"
 	"time"
 
@@ -44,16 +43,12 @@ func Init(opts Options) error {
 		return err
 	}
 
-	// Default to os.Stdout if no writer is provided.
-	if opts.Console == nil {
-		opts.Console = os.Stdout
-	}
-
 	// Build the encoders and logger.
+
 	fileEncoder := zapcore.NewJSONEncoder(encoderCfg)
 	consoleEncoder := zapcore.NewConsoleEncoder(encoderCfg)
 	core := zapcore.NewTee(
-		zapcore.NewCore(consoleEncoder, zapcore.AddSync(opts.Console), logrAtomicLevel(opts.Level)),
+		zapcore.NewCore(consoleEncoder, zapcore.AddSync(os.Stdout), logrAtomicLevel(opts.Level)),
 		zapcore.NewCore(fileEncoder, logFile, logrAtomicLevel(MaxLogLevel)),
 	)
 	logger := zap.New(core)
@@ -74,9 +69,6 @@ type Options struct {
 	// OutputFilePath is an absolute file path. The file will be created if it doesn't exist.
 	// All logs available at level 9 will be written to the file.
 	OutputFilePath string
-
-	// Console is a Writer that represents the console. It defaults to os.Stdout.
-	Console io.Writer
 }
 
 // logrAtomicLevel creates a zapcore.AtomicLevel compatible with go-logr.