Move log file and output directory creation to after verification (#92)

Author: Andrew-Lees11

cmd/mustgather/main.go

@@ -121,36 +121,19 @@ func setDefaultFlags(flags *utils.MustGatherFlags) error {
 		flags.KubeconfigPath = filepath.Join(homeDir, ".kube/config")
 	}
 
-	timestamp := utils.GetCurrentTimestamp(utils.TimestampFormat)
 	if flags.OutputDir == "" {
 		currentWorkingDir, err := os.Getwd()
 		if err != nil {
 			return fmt.Errorf("error getting user's current working directory: %v", err)
 		}
-
-		flags.OutputDir = filepath.Join(currentWorkingDir, fmt.Sprintf("Must_Gather_%v", timestamp))
-		// If OutputDir doesnot exist create the directory
-		directoryExist := utils.CheckIfDirectoryExist(flags.OutputDir)
-		if !directoryExist {
-			if err := utils.CreateDirectory(flags.OutputDir, 0775); err != nil {
-				return err
-			}
-		}
-		return nil
+		flags.OutputDir = currentWorkingDir
 	}
 
 	// create a directory inside the output directory, because we don't want to zip the entire outputDir, as it may contain other files apart from must-gather details
+	timestamp := utils.GetCurrentTimestamp(utils.TimestampFormat)
 	outputDir := filepath.Join(flags.OutputDir, fmt.Sprintf("Must_Gather_%v", timestamp))
 	flags.OutputDir = outputDir
 
-	// If OutputDir doesnot exist create the directory
-	directoryExist := utils.CheckIfDirectoryExist(flags.OutputDir)
-	if !directoryExist {
-		if err := utils.CreateDirectory(flags.OutputDir, 0775); err != nil {
-			return err
-		}
-	}
-
 	return nil
 
 }

internal/mustgather/main.go

@@ -31,20 +31,6 @@ import (
 
 func MustGather(cfg *rest.Config, flags utils.MustGatherFlags) error {
 
-	// initialize logger
-	logFile, err := utils.InitializeLogFile(flags.OutputDir, utils.MustGatherLogFileName)
-	if err != nil {
-		return err
-	}
-	defer func(f *os.File) {
-		if err := f.Close(); err != nil {
-			fmt.Printf("error closing logFile %v", err)
-		}
-	}(logFile)
-
-	handler := slog.NewTextHandler(logFile, nil)
-	logger := slog.New(handler)
-
 	// build the required clients
 	coreClient, err := kubeclient.BuildKubernetesClientFromConfig(cfg)
 	if err != nil {
@@ -83,6 +69,28 @@ func MustGather(cfg *rest.Config, flags utils.MustGatherFlags) error {
 		qmPod = pod
 	}
 
+	// If OutputDir doesnot exist create the directory
+	directoryExist := utils.CheckIfDirectoryExist(flags.OutputDir)
+	if !directoryExist {
+		if err := utils.CreateDirectory(flags.OutputDir, 0775); err != nil {
+			return err
+		}
+	}
+
+	// initialize logger
+	logFile, err := utils.InitializeLogFile(flags.OutputDir, utils.MustGatherLogFileName)
+	if err != nil {
+		return err
+	}
+	defer func(f *os.File) {
+		if err := f.Close(); err != nil {
+			fmt.Printf("error closing logFile %v", err)
+		}
+	}(logFile)
+
+	handler := slog.NewTextHandler(logFile, nil)
+	logger := slog.New(handler)
+
 	logger.Info("---- Starting Must-Gather tool ----")
 
 	mustGatherToolStartTime := time.Now()