Use aws-sdk

.travis.yml

@@ -1,8 +1,7 @@
 language: go
 go:
-  - 1.4
-  - release
-  - tip
+  - "1.9"
+  - "1.10"
 
 script:
   - go get -t ./...

README.md

@@ -26,7 +26,6 @@ import (
 	"github.com/pressly/chainstore"
 	"github.com/pressly/chainstore/boltstore"
 	"github.com/pressly/chainstore/lrumgr"
-	"github.com/pressly/chainstore/metricsmgr"
 	"github.com/pressly/chainstore/s3store"
 	"golang.org/x/net/context"
 )
@@ -47,30 +46,31 @@ func main() {
 	ctx := context.Background()
 
 	diskStore := lrumgr.New(500*1024*1024, // 500MB of working data
-		metricsmgr.New("chainstore.ex.bolt",
-			boltstore.New("/tmp/store.db", "myBucket"),
-		),
+		boltstore.New("/tmp/store.db", "myBucket"),
 	)
 
-	remoteStore := metricsmgr.New("chainstore.ex.s3",
-		// NOTE: you'll have to supply your own keys in order for this example to work properly
-		s3store.New(bucketID, accessKey, secretKey),
-	)
+	remoteStore := s3store.New(s3store.Config{
+		S3Bucket:    bucketID,
+		S3AccessKey: accessKey,
+		S3SecretKey: secretKey,
+		S3Region:    region,
+	})
 
 	dataStore := chainstore.New(diskStore, remoteStore)
 
 	// OR.. define inline. Except, I wanted to show store independence & state.
 	/*
 		dataStore := chainstore.New(
 			lrumgr.New(500*1024*1024, // 500MB of working data
-				metricsmgr.New("chainstore.ex.bolt",
-					boltstore.New("/tmp/store.db", "myBucket"),
-				),
+				boltstore.New("/tmp/store.db", "myBucket"),
 			),
-			metricsmgr.New("chainstore.ex.s3",
+			s3store.New(s3store.Config{
 				// NOTE: you'll have to supply your own keys in order for this example to work properly
-				s3store.New("myBucket", "access-key", "secret-key"),
-			),
+				S3Bucket:    bucketID,
+				S3AccessKey: accessKey,
+				S3SecretKey: secretKey,
+				S3Region:    region,
+			})
 		)
 	*/
 
@@ -81,13 +81,6 @@ func main() {
 		log.Fatalf("Open: %q", err)
 	}
 
-	// Since we've used the metricsManager above (metricsmgr), any calls to the boltstore
-	// and s3store will be measured. Next is to send metrics to librato, graphite, influxdb,
-	// whatever.. via github.com/goware/go-metrics
-	// go librato.Librato(metrics.DefaultRegistry, 10e9, ...)
-
-	//--
-
 	// Save the object in the chain. It will be Put() synchronously into diskStore,
 	// the boltdb engine, and then immediately dispatch background Put()'s to the
 	// other stores down the chain, in this case S3.

chainstore.go

@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	keyInvalidator = regexp.MustCompile(`(i?)[^a-z0-9\/_\-:\.]`)
+	keyInvalidator = regexp.MustCompile(`[^a-zA-Z0-9\/_\-:\.]`)
 )
 
 const (

chainstore_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/pressly/chainstore/logmgr"
 	"github.com/pressly/chainstore/lrumgr"
 	"github.com/pressly/chainstore/memstore"
-	"github.com/pressly/chainstore/metricsmgr"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 )
@@ -100,7 +99,7 @@ func TestAsyncChain(t *testing.T) {
 			},
 			logmgr.New(logger, "async"),
 			&testStore{},
-			metricsmgr.New("chaintest",
+			chainstore.New(
 				fs,
 				lrumgr.New(100, bs),
 			),

example/main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/pressly/chainstore"
 	"github.com/pressly/chainstore/boltstore"
 	"github.com/pressly/chainstore/lrumgr"
-	"github.com/pressly/chainstore/metricsmgr"
 	"github.com/pressly/chainstore/s3store"
 	"golang.org/x/net/context"
 )
@@ -18,42 +17,49 @@ var (
 	bucketID  string
 	accessKey string
 	secretKey string
+	region    string
 )
 
 func init() {
 	bucketID = os.Getenv("S3_BUCKET")
 	accessKey = os.Getenv("S3_ACCESS_KEY")
 	secretKey = os.Getenv("S3_SECRET_KEY")
+	region = os.Getenv("S3_REGION")
+
+	if region == "" {
+		region = "us-east-1"
+	}
 }
 
 func main() {
 	ctx := context.Background()
 
 	diskStore := lrumgr.New(500*1024*1024, // 500MB of working data
-		metricsmgr.New("chainstore.ex.bolt",
-			boltstore.New("/tmp/store.db", "myBucket"),
-		),
+		boltstore.New("/tmp/store.db", "myBucket"),
 	)
 
-	remoteStore := metricsmgr.New("chainstore.ex.s3",
-		// NOTE: you'll have to supply your own keys in order for this example to work properly
-		s3store.New(bucketID, accessKey, secretKey),
-	)
+	remoteStore := s3store.New(s3store.Config{
+		S3Bucket:    bucketID,
+		S3AccessKey: accessKey,
+		S3SecretKey: secretKey,
+		S3Region:    region,
+	})
 
 	dataStore := chainstore.New(diskStore, remoteStore)
 
 	// OR.. define inline. Except, I wanted to show store independence & state.
 	/*
 		dataStore := chainstore.New(
 			lrumgr.New(500*1024*1024, // 500MB of working data
-				metricsmgr.New("chainstore.ex.bolt",
-					boltstore.New("/tmp/store.db", "myBucket"),
-				),
+				boltstore.New("/tmp/store.db", "myBucket"),
 			),
-			metricsmgr.New("chainstore.ex.s3",
+			s3store.New(s3store.Config{
 				// NOTE: you'll have to supply your own keys in order for this example to work properly
-				s3store.New("myBucket", "access-key", "secret-key"),
-			),
+				S3Bucket:    bucketID,
+				S3AccessKey: accessKey,
+				S3SecretKey: secretKey,
+				S3Region:    region,
+			})
 		)
 	*/
 
@@ -64,13 +70,6 @@ func main() {
 		log.Fatalf("Open: %q", err)
 	}
 
-	// Since we've used the metricsManager above (metricsmgr), any calls to the boltstore
-	// and s3store will be measured. Next is to send metrics to librato, graphite, influxdb,
-	// whatever.. via github.com/goware/go-metrics
-	// go librato.Librato(metrics.DefaultRegistry, 10e9, ...)
-
-	//--
-
 	// Save the object in the chain. It will be Put() synchronously into diskStore,
 	// the boltdb engine, and then immediately dispatch background Put()'s to the
 	// other stores down the chain, in this case S3.