Merge pull request #7 from tomwilkie/6-logging

Make kv.NewNotFoundError format a string.

pkg/kv/aws_kms/aws_kms_test.go

@@ -1,7 +1,6 @@
 package aws_kms
 
 import (
-	"fmt"
 	"os"
 	"testing"
 
@@ -30,7 +29,7 @@ func (f *fakeKV) Set(key string, data []byte) error {
 func (f *fakeKV) Get(key string) ([]byte, error) {
 	out, ok := f.Values[key]
 	if !ok {
-		return []byte{}, kv.NewNotFoundError(fmt.Sprintf("key '%s' not found", key))
+		return []byte{}, kv.NewNotFoundError("key '%s' not found", key)
 	}
 	return *out, nil
 }

pkg/kv/aws_ssm/aws_ssm.go

@@ -46,7 +46,7 @@ func (a *awsSSM) Get(key string) ([]byte, error) {
 	}
 
 	if len(out.Parameters) < 1 {
-		return []byte{}, kv.NewNotFoundError("key '%s' not found")
+		return []byte{}, kv.NewNotFoundError("key '%s' not found", key)
 	}
 
 	return base64.StdEncoding.DecodeString(*out.Parameters[0].Value)

pkg/kv/gcs/gcs.go

@@ -45,7 +45,7 @@ func (g *gcsStorage) Get(key string) ([]byte, error) {
 
 	if err != nil {
 		if err == storage.ErrObjectNotExist {
-			return nil, kv.NewNotFoundError(fmt.Sprintf("error getting object for key '%s': %s", n, err.Error()))
+			return nil, kv.NewNotFoundError("error getting object for key '%s': %s", n, err.Error())
 		}
 		return nil, fmt.Errorf("error getting object for key '%s': %s", n, err.Error())
 	}

pkg/kv/storage.go

@@ -1,14 +1,16 @@
 package kv
 
+import "fmt"
+
 type NotFoundError struct {
 	msg string // description of error
 }
 
 func (e *NotFoundError) Error() string { return e.msg }
 
-func NewNotFoundError(msg string) *NotFoundError {
+func NewNotFoundError(msg string, args ...interface{}) *NotFoundError {
 	return &NotFoundError{
-		msg: msg,
+		msg: fmt.Sprintf(msg, args...),
 	}
 }