inits filter strategy; fixes stats bug; v0.3.16

Makefile

@@ -1,4 +1,4 @@
-reshifter_version := 0.3.15
+reshifter_version := 0.3.16
 git_version := `git rev-parse HEAD`
 app_name := reshifter-app
 main_dir := `pwd`

README.md

@@ -41,13 +41,13 @@ If you want to use the ReShifter app, that is the Web UI, you need to use the Do
 For example, to launch the ReShifter app locally, do:
 
 ```
-$ docker run --rm -p 8080:8080 quay.io/mhausenblas/reshifter:0.3.15
+$ docker run --rm -p 8080:8080 quay.io/mhausenblas/reshifter:0.3.16
 ```
 
 If you want to use the ReShifter API, for example as a head-less service, you can simply use the binary, no other dependencies required:
 
 ```
-$ curl -s -L https://github.com/mhausenblas/reshifter/releases/download/v0.3.15-alpha/reshifter -o reshifter
+$ curl -s -L https://github.com/mhausenblas/reshifter/releases/download/v0.3.16-alpha/reshifter -o reshifter
 $ chmod +x reshifter
 $ ./reshifter
 ```
@@ -84,7 +84,7 @@ yourself.
 ## CLI tool
 
 ReShifter also provides for a CLI tool called `rcli`.
-Get binary releases for Linux and macOS via the [GitHub release page](https://github.com/mhausenblas/reshifter/releases/tag/v0.3.15-alpha).
+Get binary releases for Linux and macOS via the [GitHub release page](https://github.com/mhausenblas/reshifter/releases/tag/v0.3.16-alpha).
 
 ```
 $ rcli -h

pkg/backup/backup.go

@@ -161,6 +161,8 @@ func pickStrategy() (string, types.Reap) {
 		return types.ReapFunctionRaw, raw
 	case "render":
 		return types.ReapFunctionRender, render
+	case "filter":
+		return types.ReapFunctionFilter, filter
 	default:
 		return types.ReapFunctionRaw, raw
 	}

pkg/backup/strategy.go

@@ -38,6 +38,22 @@ func render(path, val string, writer interface{}) error {
 	return nil
 }
 
+// filter is a reap strategy that stores val in a path in directory target,
+// if a certain condition is  met (set of white-listed paths).
+func filter(path, val string, target interface{}) error {
+	t, ok := target.(string)
+	if !ok {
+		return fmt.Errorf("Can't use target %v, it should be a string!", target)
+	}
+	if strings.Contains(path, "deployments") {
+		_, err := store(t, path, val)
+		if err != nil {
+			return fmt.Errorf("Can't store %s%s in %s: %s", t, path, val, err)
+		}
+	}
+	return nil
+}
+
 // store creates a file at based+path with val as its content.
 // based is the output directory to use and path can be
 // any valid etcd key (with ':'' characters being escaped automatically).

pkg/types/types.go

@@ -27,6 +27,8 @@ const (
 	ReapFunctionRaw = "raw"
 	// ReapFunctionRender represents the reap function that dumps the values of all keys to stdout.
 	ReapFunctionRender = "render"
+	// ReapFunctionFilter represents the reap function that dumps the values of certain keys to disk.
+	ReapFunctionFilter = "filter"
 	// NotADistro represents the fact that no Kubernetes distro-related prefixes exit in etcd
 	NotADistro KubernetesDistro = iota
 	// Vanilla represents the vanilla, upstream Kubernetes distribution.

rcli/cmd/stats.go

@@ -42,7 +42,7 @@ func docollectstats(endpoint string) {
 		log.Info("Didn't find legacy keys, trying modern keys now …")
 	}
 	vk, vs, err := discovery.CountKeysFor(endpoint, types.KubernetesPrefix, types.KubernetesPrefixLast)
-	if err != nil {
+	if err != nil && derr != nil {
 		log.Error(fmt.Sprintf("Having problems calculating stats: %s", err))
 		return
 	}