replace log. with fmt. for stderr on windows (#1906)

Author: movence

cmd/amazon-cloudwatch-agent-config-wizard/wizard.go

@@ -4,18 +4,22 @@
 package main
 
 import (
-	"log"
+	"fmt"
 	"os"
 
 	"github.com/aws/amazon-cloudwatch-agent/tool/cmdwrapper"
 	"github.com/aws/amazon-cloudwatch-agent/tool/wizard/flags"
 )
 
 func main() {
-	log.Printf("Starting config-wizard, this will map back to a call to amazon-cloudwatch-agent")
+	fmt.Println("Starting config-wizard, this will map back to a call to amazon-cloudwatch-agent")
 
 	fs, wizardFlags := cmdwrapper.CreateFlagSet(flags.Command, flags.WizardFlags)
 	fs.Parse(os.Args[1:]) // Skip program name only
 
-	_ = cmdwrapper.ExecuteSubcommand(flags.Command, wizardFlags)
+	err := cmdwrapper.ExecuteSubcommand(flags.Command, wizardFlags)
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
 }

cmd/config-downloader/downloader.go

@@ -3,18 +3,22 @@
 package main
 
 import (
-	"log"
+	"fmt"
 	"os"
 
 	"github.com/aws/amazon-cloudwatch-agent/tool/cmdwrapper"
 	"github.com/aws/amazon-cloudwatch-agent/tool/downloader/flags"
 )
 
 func main() {
-	log.Printf("Starting config-downloader, this will map back to a call to amazon-cloudwatch-agent")
+	fmt.Println("Starting config-downloader, this will map back to a call to amazon-cloudwatch-agent")
 
 	fs, downloaderFlags := cmdwrapper.CreateFlagSet(flags.Command, flags.DownloaderFlags)
 	fs.Parse(os.Args[1:]) // Skip program name only
 
-	_ = cmdwrapper.ExecuteSubcommand(flags.Command, downloaderFlags)
+	err := cmdwrapper.ExecuteSubcommand(flags.Command, downloaderFlags)
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
 }

cmd/config-translator/translator.go

@@ -4,21 +4,22 @@
 package main
 
 import (
-	"log"
+	"fmt"
 	"os"
 
 	"github.com/aws/amazon-cloudwatch-agent/tool/cmdwrapper"
 	"github.com/aws/amazon-cloudwatch-agent/translator/flags"
 )
 
 func main() {
-	log.Printf("Starting config-translator, this will map back to a call to amazon-cloudwatch-agent")
+	fmt.Println("Starting config-translator, this will map back to a call to amazon-cloudwatch-agent")
 
 	fs, translatorFlags := cmdwrapper.CreateFlagSet(flags.TranslatorCommand, flags.TranslatorFlags)
 	fs.Parse(os.Args[1:]) // Skip program name only
 
 	err := cmdwrapper.ExecuteSubcommand(flags.TranslatorCommand, translatorFlags)
 	if err != nil {
+		fmt.Println(err.Error())
 		os.Exit(1)
 	}
 }

tool/cmdwrapper/cmdwrapper.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -85,7 +84,7 @@ func ExecuteSubcommand(command string, flags map[string]*string) error {
 		// Handle error appropriately
 		return err
 	}
-	log.Printf("Executing %s with arguments: %v", paths.AgentBinaryPath, args)
+	fmt.Printf("Executing %s with arguments: %v", paths.AgentBinaryPath, args)
 	// Use execCommand instead of exec.Command directly
 	cmd := execCommand(agentPath, args...)
 	cmd.Stdout = os.Stdout
@@ -95,9 +94,9 @@ func ExecuteSubcommand(command string, flags map[string]*string) error {
 	if err := cmd.Run(); err != nil {
 		var exitErr *exec.ExitError
 		if errors.As(err, &exitErr) {
-			log.Fatalf("E! %s process exited with non-zero status: %d", command, exitErr.ExitCode())
+			return fmt.Errorf("E! %s process exited with non-zero status: %d", command, exitErr.ExitCode())
 		}
-		log.Fatalf("E! %s failed. Error: %v", command, err)
+		return fmt.Errorf("E! %s failed. Error: %v", command, err)
 	}
 
 	return nil