Enable pipefail and update restore yamls (#750)

stashed · Apr 19, 2019 · b40b5d7 · b40b5d7
1 parent ba94ee7
commit b40b5d7
Show file tree

Hide file tree

Showing 38 changed files with 104 additions and 3,171 deletions.
diff --git a/docs/examples/mongo/restore.yaml b/docs/examples/mongo/restore.yaml
@@ -17,5 +17,4 @@ spec:
       kind: AppBinding
       name: mgo-quickstart
   rules:
-  - hosts:
-    - host-0
+  - snapshots: [latest]
diff --git a/docs/examples/mysql/restore.yaml b/docs/examples/mysql/restore.yaml
@@ -17,5 +17,4 @@ spec:
       kind: AppBinding
       name: mysql-quickstart
   rules:
-  - hosts:
-    - host-0
+  - snapshots: [latest]
diff --git a/docs/examples/pg/restore.yaml b/docs/examples/pg/restore.yaml
@@ -17,5 +17,4 @@ spec:
       kind: AppBinding
       name: quick-postgres
   rules:
-  - hosts:
-    - host-0
+  - snapshots: [latest]
diff --git a/docs/examples/pvc/restore.yaml b/docs/examples/pvc/restore.yaml
@@ -18,8 +18,7 @@ spec:
       name: test-pvc-dest
     mountPath: /etc/target
   rules:
-  - hosts:
-    - host-0
+  - snapshots: [latest]
     paths:
     - /etc/target/dir-01
     - /etc/target/dir-02
diff --git a/docs/examples/pvc/restore_error.yaml b/docs/examples/pvc/restore_error.yaml
@@ -18,7 +18,6 @@ spec:
       name: test-pvc-dest
     mountPath: /etc/target
   rules:
-  - hosts:
-    - host-0
+  - snapshots: [latest]
     paths:
     - /etc/target/unknown-path
diff --git a/docs/examples/rest/restore.yaml b/docs/examples/rest/restore.yaml
@@ -20,8 +20,7 @@ spec:
     - name: mount-01
       mountPath: /etc/target
   rules:
-  - hosts:
-    - host-0
+  - snapshots: [latest]
     paths:
     - /etc/target/dir-01
     - /etc/target/dir-02
diff --git a/glide.lock b/glide.lock
diff --git a/pkg/restic/commands.go b/pkg/restic/commands.go
@@ -205,7 +205,7 @@ func (w *ResticWrapper) restore(path, host, snapshotID, destination string) ([]b
 func (w *ResticWrapper) dump(dumpOptions DumpOptions) ([]byte, error) {
 	log.Infoln("Dumping backed up data")
 
-	args := []interface{}{"dump"}
+	args := []interface{}{"dump", "--quiet"}
 	if dumpOptions.Snapshot != "" {
 		args = append(args, dumpOptions.Snapshot)
 	} else {

diff --git a/pkg/restic/config.go b/pkg/restic/config.go
@@ -77,6 +77,8 @@ func NewResticWrapper(options SetupOptions) (*ResticWrapper, error) {
 	}
 	wrapper.sh.SetDir(wrapper.config.ScratchDir)
 	wrapper.sh.ShowCMD = true
+	wrapper.sh.PipeFail = true
+	wrapper.sh.PipeStdErrors = true
 
 	// Setup restic environments
 	err := wrapper.setupEnv()

diff --git a/vendor/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE