B/R logs request via downloadrequest

Author: kaovilai

tests/e2e/backup_restore_suite_test.go

@@ -136,7 +136,7 @@ var _ = Describe("AWS backup restore tests", func() {
 			// wait for backup to not be running
 			Eventually(IsBackupDone(dpaCR.Client, namespace, backupName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
 			GinkgoWriter.Println(DescribeBackup(dpaCR.Client, backup))
-			Expect(GetVeleroContainerFailureLogs(dpaCR.Namespace)).To(Equal([]string{}))
+			Expect(BackupErrorLogs(dpaCR.Client,backup)).To(Equal([]string{}))
 
 			// check if backup succeeded
 			succeeded, err := IsBackupCompletedSuccessfully(dpaCR.Client, backup)
@@ -169,7 +169,7 @@ var _ = Describe("AWS backup restore tests", func() {
 				Expect(err).ToNot(HaveOccurred())
 				Eventually(IsRestoreDone(dpaCR.Client, namespace, noDcDrestoreName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
 				GinkgoWriter.Println(DescribeRestore(dpaCR.Client, restore))
-				Expect(GetVeleroContainerFailureLogs(dpaCR.Namespace)).To(Equal([]string{}))
+				Expect(RestoreErrorLogs(dpaCR.Client,restore)).To(Equal([]string{}))
 
 				// Check if restore succeeded
 				succeeded, err = IsRestoreCompletedSuccessfully(dpaCR.Client, namespace, noDcDrestoreName)
@@ -184,7 +184,7 @@ var _ = Describe("AWS backup restore tests", func() {
 				Expect(err).ToNot(HaveOccurred())
 				Eventually(IsRestoreDone(dpaCR.Client, namespace, withDcRestoreName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
 				GinkgoWriter.Println(DescribeRestore(dpaCR.Client, restore))
-				Expect(GetVeleroContainerFailureLogs(dpaCR.Namespace)).To(Equal([]string{}))
+				Expect(RestoreErrorLogs(dpaCR.Client,restore)).To(Equal([]string{}))
 
 				// Check if restore succeeded
 				succeeded, err = IsRestoreCompletedSuccessfully(dpaCR.Client, namespace, withDcRestoreName)
@@ -198,7 +198,7 @@ var _ = Describe("AWS backup restore tests", func() {
 				Expect(err).ToNot(HaveOccurred())
 				Eventually(IsRestoreDone(dpaCR.Client, namespace, restoreName), timeoutMultiplier*time.Minute*4, time.Second*10).Should(BeTrue())
 				GinkgoWriter.Println(DescribeRestore(dpaCR.Client, restore))
-				Expect(GetVeleroContainerFailureLogs(dpaCR.Namespace)).To(Equal([]string{}))
+				Expect(RestoreErrorLogs(dpaCR.Client,restore)).To(Equal([]string{}))
 
 				// Check if restore succeeded
 				succeeded, err = IsRestoreCompletedSuccessfully(dpaCR.Client, namespace, restoreName)

tests/e2e/lib/velero_helpers.go

@@ -1,15 +1,20 @@
 package lib
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"os"
+	"regexp"
+	"strings"
+	"time"
 
 	snapshotv1beta1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1beta1"
 	snapshotv1beta1client "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned"
 	velero "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	pkgbackup "github.com/vmware-tanzu/velero/pkg/backup"
 	"github.com/vmware-tanzu/velero/pkg/cmd"
+	"github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest"
 	"github.com/vmware-tanzu/velero/pkg/cmd/util/output"
 	"github.com/vmware-tanzu/velero/pkg/features"
 	veleroClientset "github.com/vmware-tanzu/velero/pkg/generated/clientset/versioned"
@@ -94,6 +99,60 @@ func DescribeRestore(ocClient client.Client, restore velero.Restore) string {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error getting PodVolumeRestores for restore %s: %v\n", restore.Name, err)
 	}
-
+	
 	return output.DescribeRestore(context.Background(), ocClient, &restore, podvolumeRestoreList.Items, details, veleroClient, insecureSkipTLSVerify, caCertFile)
 }
+
+func BackupLogs(ocClient client.Client, backup velero.Backup) string {
+	insecureSkipTLSVerify := true
+	caCertFile := ""
+	// new io.Writer that store the logs in a string
+	logs := &bytes.Buffer{}
+	// new io.Writer that store the logs in a string
+	
+	downloadrequest.Stream(context.Background(), ocClient, backup.Namespace, backup.Name, velero.DownloadTargetKindBackupLog, logs, time.Minute, insecureSkipTLSVerify, caCertFile)
+	
+	return logs.String()
+}
+
+func RestoreLogs(ocClient client.Client, restore velero.Restore) string {
+	insecureSkipTLSVerify := true
+	caCertFile := ""
+	// new io.Writer that store the logs in a string
+	logs := &bytes.Buffer{}
+	// new io.Writer that store the logs in a string
+	
+	downloadrequest.Stream(context.Background(), ocClient, restore.Namespace, restore.Name, velero.DownloadTargetKindRestoreLog, logs, time.Minute, insecureSkipTLSVerify, caCertFile)
+
+	return logs.String()
+}
+
+func BackupErrorLogs(ocClient client.Client, backup velero.Backup) []string {
+	bl := BackupLogs(ocClient, backup)
+	errorRegex, err := regexp.Compile("error|Error")
+	if err != nil {
+		return []string{"could not compile regex: ", err.Error()}
+	}
+	logLines := []string{}
+	for _, line := range strings.Split(bl, "\n") {
+		if errorRegex.MatchString(line) {
+			logLines = append(logLines, line)
+		}
+	}
+	return logLines
+}
+
+func RestoreErrorLogs(ocClient client.Client, restore velero.Restore) []string {
+	rl := RestoreLogs(ocClient, restore)
+	errorRegex, err := regexp.Compile("error|Error")
+	if err != nil {
+		return []string{"could not compile regex: ", err.Error()}
+	}
+	logLines := []string{}
+	for _, line := range strings.Split(rl, "\n") {
+		if errorRegex.MatchString(line) {
+			logLines = append(logLines, line)
+		}
+	}
+	return logLines
+}