Add support for volumes blacklisting (fixes camptocamp#21)

mcanevet · May 3, 2016 · 70ee905 · 70ee905
1 parent c35a7d0
commit 70ee905
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/conplicity.go b/conplicity.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"sort"
 	"unicode/utf8"
 
 	log "github.com/Sirupsen/logrus"
@@ -42,6 +43,13 @@ func backupVolume(c *handler.Conplicity, vol *docker.Volume) (err error) {
 		return
 	}
 
+	list := c.VolumesBlacklist
+	i := sort.SearchStrings(list, vol.Name)
+	if i < len(list) && list[i] == vol.Name {
+		log.Infof("Ignoring blacklisted volume " + vol.Name)
+		return
+	}
+
 	if getVolumeLabel(vol, ".ignore") == "true" {
 		log.Infof("Ignoring blacklisted volume " + vol.Name)
 		return

diff --git a/handler/handler.go b/handler/handler.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"os"
+	"sort"
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
@@ -12,17 +13,18 @@ import (
 )
 
 type environment struct {
-	Image              string `env:"DUPLICITY_DOCKER_IMAGE" envDefault:"camptocamp/duplicity:latest"`
-	DuplicityTargetURL string `env:"DUPLICITY_TARGET_URL"`
-	AWSAccessKeyID     string `env:"AWS_ACCESS_KEY_ID"`
-	AWSSecretAccessKey string `env:"AWS_SECRET_ACCESS_KEY"`
-	SwiftUsername      string `env:"SWIFT_USERNAME"`
-	SwiftPassword      string `env:"SWIFT_PASSWORD"`
-	SwiftAuthURL       string `env:"SWIFT_AUTHURL"`
-	SwiftTenantName    string `env:"SWIFT_TENANTNAME"`
-	SwiftRegionName    string `env:"SWIFT_REGIONNAME"`
-	FullIfOlderThan    string `env:"FULL_IF_OLDER_THAN" envDefault:"15D"`
-	RemoveOlderThan    string `env:"REMOVE_OLDER_THAN" envDefault:"30D"`
+	Image              string   `env:"DUPLICITY_DOCKER_IMAGE" envDefault:"camptocamp/duplicity:latest"`
+	DuplicityTargetURL string   `env:"DUPLICITY_TARGET_URL"`
+	AWSAccessKeyID     string   `env:"AWS_ACCESS_KEY_ID"`
+	AWSSecretAccessKey string   `env:"AWS_SECRET_ACCESS_KEY"`
+	SwiftUsername      string   `env:"SWIFT_USERNAME"`
+	SwiftPassword      string   `env:"SWIFT_PASSWORD"`
+	SwiftAuthURL       string   `env:"SWIFT_AUTHURL"`
+	SwiftTenantName    string   `env:"SWIFT_TENANTNAME"`
+	SwiftRegionName    string   `env:"SWIFT_REGIONNAME"`
+	FullIfOlderThan    string   `env:"FULL_IF_OLDER_THAN" envDefault:"15D"`
+	RemoveOlderThan    string   `env:"REMOVE_OLDER_THAN" envDefault:"30D"`
+	VolumesBlacklist   []string `env:"CONPLICITY_VOLUMES_BLACKLIST"`
 }
 
 // Conplicity is the main handler struct
@@ -53,7 +55,7 @@ func (c *Conplicity) Setup() (err error) {
 func (c *Conplicity) getEnv() (err error) {
 	c.environment = &environment{}
 	env.Parse(c.environment)
-
+	sort.Strings(c.VolumesBlacklist)
 	return
 }