post-process tarball

Author: chrischdi

test/e2e/shared/common.go

@@ -21,6 +21,7 @@ package shared
 
 import (
 	"context"
+	"encoding/base64"
 	"fmt"
 	"os"
 	"path"
@@ -204,12 +205,27 @@ func DumpMachine(ctx context.Context, e2eCtx *E2EContext, machine infrav1.AWSMac
 				cmd:   "journalctl --no-pager -u containerd.service",
 			},
 			{
-				title:  "pod-logs",
-				cmd:    "sudo tar -czf - -C /var/log pods | base64 -w0",
-				suffix: ".tar.gz",
+				title: "pod-logs",
+				cmd:   "sudo tar -czf - -C /var/log pods | base64",
 			},
 		},
 	)
+
+	// post-process pod-logs to have a tar.gz file instead of a base64 txt.
+	sourcePodLogsFile := path.Join(filepath.Dir(f.Name()), "pod-logs.txt")
+	targetPodLogsFile := path.Join(filepath.Dir(f.Name()), "pod-logs.tar.gz")
+	inputData, err := os.ReadFile(sourcePodLogsFile)
+	if err != nil {
+		fmt.Fprintf(GinkgoWriter, "Couldn't read pod-logs command output: path=%q, err=%s\n", sourcePodLogsFile, err)
+		return
+	}
+	outputData := []byte{}
+	if _, err := base64.RawStdEncoding.Decode(outputData, inputData); err != nil {
+		fmt.Fprintf(GinkgoWriter, "Couldn't base64 decode pod-logs: path=%q, err=%s\n", sourcePodLogsFile, err)
+		return
+	}
+	os.WriteFile(targetPodLogsFile, outputData, 0600)
+	os.Remove(sourcePodLogsFile)
 }
 
 func DumpSpecResources(ctx context.Context, e2eCtx *E2EContext, namespace *corev1.Namespace) {

test/e2e/shared/exec.go

@@ -75,9 +75,8 @@ func allMachines(ctx context.Context, e2eCtx *E2EContext) ([]instance, error) {
 }
 
 type command struct {
-	title  string
-	suffix string
-	cmd    string
+	title string
+	cmd   string
 }
 
 // commandsForMachine opens a terminal connection using AWS SSM Session Manager
@@ -114,11 +113,7 @@ func commandsForMachine(ctx context.Context, e2eCtx *E2EContext, f *os.File, ins
 		return
 	}
 	for _, c := range commands {
-		suffix := ".log"
-		if c.suffix != "" {
-			suffix = c.suffix
-		}
-		logFile := path.Join(filepath.Dir(f.Name()), c.title+suffix)
+		logFile := path.Join(filepath.Dir(f.Name()), c.title+".log")
 		if err := e.Send("sudo " + c.cmd + "\n"); err != nil {
 			fmt.Fprintf(f, "unable to send command: err=%s", err)
 			return