only read insecure flags when explicitly requested

cmd/logs/logreader.go

@@ -24,6 +24,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 // logReader reads (current/previous/rotated) logs from a tree in a base directory:
@@ -63,7 +64,19 @@ func (l *LogReader) WithFilter(llf logLineFilter) {
 }
 
 func (l *LogReader) FromPrevious() {
-	l.files = &[]string{previousLogFile, previousInsecureLogFile}
+	l.files = &[]string{previousLogFile}
+}
+
+func (l *LogReader) FromInsecure() {
+	// iterate selected logs and read from its insecure siblings instead
+	insecure := []string{}
+	for _, f := range *l.files {
+		nf := strings.TrimSuffix(f, ".log")
+		if f != nf {
+			insecure = append(insecure, nf+".insecure.log")
+		}
+	}
+	*l.files = insecure
 }
 
 func (l *LogReader) FromRotated() {
@@ -77,7 +90,10 @@ func (l *LogReader) Read(w io.Writer) {
 	for _, filename := range *l.files {
 		reader, err := open(l.dirname + "/" + filename)
 		if err != nil {
-			fmt.Println(err)
+			if !os.IsNotExist(err) {
+				// since we're scanning through logs dynamically don't error out if log files do not exist
+				fmt.Errorf("failed to open log file: %v", err)
+			}
 			continue
 		}
 		defer reader.Close()
@@ -117,7 +133,7 @@ func (l *LogReader) applyFilter(raw []byte) []byte {
 func open(filename string) (io.ReadCloser, error) {
 	file, err := os.Open(filename)
 	if err != nil {
-		return nil, fmt.Errorf("failed to open log file: %v", err)
+		return nil, err
 	}
 	var reader io.ReadCloser
 	reader, err = gzip.NewReader(file)

cmd/logs/logreader_test.go

@@ -56,6 +56,35 @@ func TestRotatedFiles(t *testing.T) {
 	}
 }
 
+func TestFromInsecure(t *testing.T) {
+	tests := []struct {
+		name      string
+		logReader *LogReader
+		expected  *[]string
+	}{
+		{
+			name:      "Handle insecure logs given a list of requested log files",
+			logReader: NewLogReader(""), // defaults to current.log
+			expected:  &[]string{"current.insecure.log"},
+		},
+		{
+			name:      "Handle insecure logs but only touch files suffixed .log",
+			logReader: &LogReader{"", &[]string{"current.log", "current.fakelog"}, nil},
+			expected:  &[]string{"current.insecure.log"},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			tc.logReader.FromInsecure()
+
+			if !reflect.DeepEqual(tc.logReader.files, tc.expected) {
+				t.Fatalf("Expected : %v, got: %v", tc.expected, tc.logReader.files)
+			}
+		})
+	}
+}
+
 func TestOpen(t *testing.T) {
 	tests := []struct {
 		name          string
@@ -86,7 +115,7 @@ func TestOpen(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			got, err := open(tc.fixture)
-			if err == nil && tc.expectedError {
+			if tc.expectedError && err == nil {
 				t.Errorf("Expected error, got %v", got)
 			}
 			expectedType := reflect.TypeOf(tc.expected)

cmd/logs/logs.go

@@ -66,6 +66,7 @@ var Logs = &cobra.Command{
 		containerName, _ := cmd.Flags().GetString("container")
 		previousFlag, _ := cmd.Flags().GetBool("previous")
 		rotatedFlag, _ := cmd.Flags().GetBool("rotated")
+		insecureFlag, _ := cmd.Flags().GetBool("insecure")
 		allContainersFlag, _ := cmd.Flags().GetBool("all-containers")
 		logLevels := []string{}
 		if LogLevel != "" {
@@ -85,10 +86,10 @@ var Logs = &cobra.Command{
 					fmt.Fprintln(os.Stderr, "arguments in resource/name form must have a single resource and name")
 					os.Exit(1)
 				}
-				logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels)
+				logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels, insecureFlag)
 			} else {
 				podName = s[0]
-				logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels)
+				logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels, insecureFlag)
 			}
 		}
 		if len(args) == 2 {
@@ -103,7 +104,7 @@ var Logs = &cobra.Command{
 						os.Exit(1)
 					}
 					containerName = args[1]
-					logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels)
+					logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels, insecureFlag)
 				}
 			} else {
 				if containerName != "" {
@@ -112,7 +113,7 @@ var Logs = &cobra.Command{
 				} else {
 					podName = args[0]
 					containerName = args[1]
-					logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels)
+					logsPods(vars.MustGatherRootPath, vars.Namespace, podName, containerName, previousFlag, rotatedFlag, allContainersFlag, logLevels, insecureFlag)
 				}
 			}
 		}

cmd/logs/pods.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-func logsPods(currentContextPath string, defaultConfigNamespace string, podName string, containerName string, previousFlag bool, rotatedFlag bool, allContainersFlag bool, logLevels []string) {
+func logsPods(currentContextPath string, defaultConfigNamespace string, podName string, containerName string, previousFlag bool, rotatedFlag bool, allContainersFlag bool, logLevels []string, insecureFlag bool) {
 	var logFilter logLineFilter = NewCRILogFilter(logLevels, nil)
 	var _Items v1.PodList
 	CurrentNamespacePath := currentContextPath + "/namespaces/" + defaultConfigNamespace
@@ -70,6 +70,9 @@ func logsPods(currentContextPath string, defaultConfigNamespace string, podName
 					if rotatedFlag {
 						log.FromRotated()
 					}
+					if insecureFlag {
+						log.FromInsecure()
+					}
 					log.Read(os.Stdout)
 				}
 				return
@@ -111,6 +114,9 @@ func logsPods(currentContextPath string, defaultConfigNamespace string, podName
 			if rotatedFlag {
 				log.FromRotated()
 			}
+			if insecureFlag {
+				log.FromInsecure()
+			}
 			log.Read(os.Stdout)
 		}
 	}