Merge pull request #1 from MaxxtonGroup/bug-fixes

Bug fixes

Author: steven166

pkg/backup/elasticsearch-backup-provider.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"log"
 	"sort"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/MaxxtonGroup/backup-validator/pkg/runtime"
+	"github.com/dustin/go-humanize"
 )
 
 type ElasticsearchBackupProvider struct {
@@ -91,12 +91,12 @@ func (p ElasticsearchBackupProvider) Restore(testName string, dir string, snapsh
 		done := true
 		for _, restore := range esRestores {
 			if restore.Repository == "backup" && restore.Snapshot == snapshot.Name {
-				bTotal, err := strconv.ParseInt(restore.BytesTotal, 10, 64)
+				bTotal, err := humanize.ParseBytes(restore.BytesTotal)
 				if err != nil {
 					return err
 				}
 				bytesTotal += float64(bTotal)
-				bRecovered, err := strconv.ParseInt(restore.BytesRecovered, 10, 64)
+				bRecovered, err := humanize.ParseBytes(restore.BytesRecovered)
 				if err != nil {
 					return err
 				}

pkg/backup/restic-backup-provider.go

@@ -1,6 +1,7 @@
 package backup
 
 import (
+	"bytes"
 	"encoding/json"
 	"io/ioutil"
 	"log"
@@ -79,14 +80,19 @@ func (p ResticBackupProvider) ListSnapshots(testName string, dir string) ([]*Sna
 	}
 	cmd.Env = env
 
-	output, err := cmd.Output()
+	// Set output to Byte Buffers
+	var outb, errb bytes.Buffer
+	cmd.Stdout = &outb
+	cmd.Stderr = &errb
+	err := cmd.Run()
 	if err != nil {
+		log.Printf("[%s] Restic: %s", testName, errb.String())
 		return nil, err
 	}
 
 	// parse output
 	resticSnapshots := make([]*ResticSnapshot, 0)
-	err = json.Unmarshal(output, &resticSnapshots)
+	err = json.Unmarshal(outb.Bytes(), &resticSnapshots)
 	if err != nil {
 		return nil, err
 	}

pkg/format/postgresql-format-provider.go

@@ -32,7 +32,11 @@ func (p PostgresqlFormatProvider) Destroy(testName string, dir string) error {
 
 func (p PostgresqlFormatProvider) ImportData(testName string, dir string, options []string) error {
 	_, err := p.runtimeProvider.Exec(testName, "pg_restore", options...)
-	log.Printf("[%s] Import complete\n", testName)
+	if err != nil {
+		log.Printf("[%s] Import Failed: %s", testName, err.Error())
+	} else {
+		log.Printf("[%s] Import complete", testName)
+	}
 	return err
 }
 

pkg/runtime/docker-runtime-provider.go

@@ -118,11 +118,14 @@ func (p DockerRuntimeProvider) Destroy(testName string, dir string) error {
 			log.Printf("[%s] Dump docker container logs:%s", testName, *p.runtime.containerID)
 			logCmd := exec.Command("docker", "logs", *p.runtime.containerID)
 
-			logs, err := logCmd.Output()
+			logs, err := logCmd.CombinedOutput()
 			if err != nil {
 				log.Printf("Failed to get logs: %s", err)
-			} else {
 				println("output: " + string(logs))
+			} else {
+				for _, line := range strings.Split(string(logs), "\n") {
+					log.Printf("[%s] logs: %s", testName, line)
+				}
 			}
 		}
 
@@ -166,17 +169,20 @@ func (p DockerRuntimeProvider) Exec(testName string, command string, args ...str
 	if err != nil {
 		return nil, err
 	}
+	stdErrSlurp, _ := ioutil.ReadAll(stderr)
+	if err != nil {
+		return nil, err
+	}
 
 	if err := cmd.Wait(); err != nil {
 		output := strings.TrimSpace(string(stdOutSlurp))
 		if len(output) > 0 {
-			log.Printf("[%s] %s", testName, output)
+			log.Printf("[%s] exec: %s", testName, output)
 		}
 
-		stdErrSlurp, _ := ioutil.ReadAll(stderr)
 		errOutput := strings.TrimSpace(string(stdErrSlurp))
 		if len(errOutput) > 0 {
-			log.Printf("[%s] %s", testName, errOutput)
+			log.Printf("[%s] exec: %s", testName, errOutput)
 		}
 		return nil, fmt.Errorf("command [%s %s] failed: %s", "docker", strings.Join(append(cmdArgs, args...), " "), err)
 	}