Bit of refactoring.

pkg/vault-handler/handler.go

@@ -38,15 +38,16 @@ func (h *Handler) Upload(manifest *Manifest) error {
 	uploadPerPath := make(map[string]map[string]interface{})
 	logger := h.logger.WithField("action", "upload")
 
-	if err = h.loop(logger, manifest, func(logger *log.Entry, group, vaultPath string, data SecretData) error {
+	fn := func(logger *log.Entry, group, vaultPath string, data SecretData) error {
+		var err error
+
 		logger.Info("Handling file")
 		file := NewFile(group, &data, []byte{})
 
 		if err = file.Read(h.config.InputDir); err != nil {
 			logger.Error("error on reading file", err)
 			return err
 		}
-
 		if data.Zip {
 			if err = file.Zip(); err != nil {
 				logger.Error("error on zipping payload", err)
@@ -62,7 +63,9 @@ func (h *Handler) Upload(manifest *Manifest) error {
 		uploadPerPath[vaultPath][data.Name] = string(file.Payload())
 
 		return nil
-	}); err != nil {
+	}
+
+	if err = h.loop(logger, manifest, fn); err != nil {
 		return err
 	}
 
@@ -78,12 +81,11 @@ func (h *Handler) Upload(manifest *Manifest) error {
 
 // Download files from vault based on manifest.
 func (h *Handler) Download(manifest *Manifest) error {
-	var err error
-
 	logger := h.logger.WithField("action", "download")
 
-	return h.loop(logger, manifest, func(logger *log.Entry, group, vaultPath string, data SecretData) error {
+	fn := func(logger *log.Entry, group, vaultPath string, data SecretData) error {
 		var payload []byte
+		var err error
 
 		vaultPath = h.composeVaultPath(data, vaultPath)
 		logger = logger.WithField("vaultPath", vaultPath)
@@ -104,7 +106,9 @@ func (h *Handler) Download(manifest *Manifest) error {
 
 		logger.Info("Persisting in file-system")
 		return h.persist(file)
-	})
+	}
+
+	return h.loop(logger, manifest, fn)
 }
 
 // loop execute the primary manifest item loop, yielding informed method.