alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix datastore Put and added tests (#402)

Browse Source
This commit is contained in:
Pedro Nasser
2016-12-07 14:59:54 -02:00
committed by Travis Reeder
parent 0baf03841f
commit 9382f0b133
6 changed files with 132 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/datastore/bolt/bolt.go
View File

@@ -505,6 +505,10 @@ func (ds *BoltDatastore) GetRoutes(ctx context.Context, filter *models.RouteFilt
}
func (ds *BoltDatastore) Put(ctx context.Context, key, value []byte) error {
if key == nil || len(key) == 0 {
return models.ErrDatastoreEmptyKey
}
ds.db.Update(func(tx *bolt.Tx) error {
b := tx.Bucket(ds.extrasBucket) // todo: maybe namespace by app?
err := b.Put(key, value)
@@ -514,6 +518,10 @@ func (ds *BoltDatastore) Put(ctx context.Context, key, value []byte) error {
}
func (ds *BoltDatastore) Get(ctx context.Context, key []byte) ([]byte, error) {
if key == nil || len(key) == 0 {
return nil, models.ErrDatastoreEmptyKey
}
var ret []byte
ds.db.View(func(tx *bolt.Tx) error {
b := tx.Bucket(ds.extrasBucket)

63
api/datastore/bolt_test.go
View File

@@ -1,27 +1,13 @@
package datastore
import (
"bytes"
"context"
"log"
"os"
"testing"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
)
func setLogBuffer() *bytes.Buffer {
var buf bytes.Buffer
buf.WriteByte('\n')
logrus.SetOutput(&buf)
gin.DefaultErrorWriter = &buf
gin.DefaultWriter = &buf
log.SetOutput(&buf)
return &buf
}
const tmpBolt = "/tmp/func_test_bolt.db"
func TestBolt(t *testing.T) {
@@ -35,16 +21,6 @@ func TestBolt(t *testing.T) {
t.Fatalf("Error when creating datastore: %v", err)
}
testApp := &models.App{
Name: "Test",
}
testRoute := &models.Route{
AppName: testApp.Name,
Path: "/test",
Image: "iron/hello",
}
// Testing insert app
_, err = ds.InsertApp(ctx, nil)
if err != models.ErrDatastoreEmptyApp {
@@ -272,4 +248,43 @@ func TestBolt(t *testing.T) {
t.Log(buf.String())
t.Fatalf("Test RemoveApp: failed to remove the route")
}
// Testing Put/Get
err = ds.Put(ctx, nil, nil)
if err != models.ErrDatastoreEmptyKey {
t.Log(buf.String())
t.Fatalf("Test Put(nil,nil): expected error `%v`, but it was `%v`", models.ErrDatastoreEmptyKey, err)
}
err = ds.Put(ctx, []byte("test"), []byte("success"))
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
val, err := ds.Get(ctx, []byte("test"))
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
if string(val) != "success" {
t.Log(buf.String())
t.Fatalf("Test Get: expected value to be `%v`, but it was `%v`", "success", string(val))
}
err = ds.Put(ctx, []byte("test"), nil)
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
val, err = ds.Get(ctx, []byte("test"))
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
if string(val) != "" {
t.Log(buf.String())
t.Fatalf("Test Get: expected value to be `%v`, but it was `%v`", "", string(val))
}
}

31
api/datastore/datastore_test.go Normal file
View File

@@ -0,0 +1,31 @@
package datastore
import (
"bytes"
"github.com/Sirupsen/logrus"
"github.com/gin-gonic/gin"
"github.com/iron-io/functions/api/models"
"log"
)
func setLogBuffer() *bytes.Buffer {
var buf bytes.Buffer
buf.WriteByte('\n')
logrus.SetOutput(&buf)
gin.DefaultErrorWriter = &buf
gin.DefaultWriter = &buf
log.SetOutput(&buf)
return &buf
}
var testApp = &models.App{
Name: "Test",
}
var testRoute = &models.Route{
AppName: testApp.Name,
Path: "/test",
Image: "iron/hello",
Type: "sync",
Format: "http",
}

10
api/datastore/postgres/postgres.go
View File

@@ -524,6 +524,10 @@ func buildFilterRouteQuery(filter *models.RouteFilter) string {
}
func (ds *PostgresDatastore) Put(ctx context.Context, key, value []byte) error {
if key == nil || len(key) == 0 {
return models.ErrDatastoreEmptyKey
}
_, err := ds.db.Exec(`
INSERT INTO extras (
key,
@@ -531,7 +535,7 @@ func (ds *PostgresDatastore) Put(ctx context.Context, key, value []byte) error {
)
VALUES ($1, $2)
ON CONFLICT (key) DO UPDATE SET
value = $1;
value = $2;
`, string(key), string(value))
if err != nil {
@@ -542,6 +546,10 @@ func (ds *PostgresDatastore) Put(ctx context.Context, key, value []byte) error {
}
func (ds *PostgresDatastore) Get(ctx context.Context, key []byte) ([]byte, error) {
if key == nil || len(key) == 0 {
return nil, models.ErrDatastoreEmptyKey
}
row := ds.db.QueryRow("SELECT value FROM extras WHERE key=$1", key)
var value string

56
api/datastore/postgres_test.go
View File

@@ -49,18 +49,6 @@ func TestPostgres(t *testing.T) {
t.Fatalf("Error when creating datastore: %v", err)
}
testApp := &models.App{
Name: "Test",
}
testRoute := &models.Route{
AppName: testApp.Name,
Path: "/test",
Image: "iron/hello",
Type: "sync",
Format: "http",
}
// Testing insert app
_, err = ds.InsertApp(ctx, nil)
if err != models.ErrDatastoreEmptyApp {
@@ -288,4 +276,48 @@ func TestPostgres(t *testing.T) {
t.Log(buf.String())
t.Fatalf("Test RemoveApp: failed to remove the route")
}
// Testing Put/Get
err = ds.Put(ctx, nil, nil)
if err != models.ErrDatastoreEmptyKey {
t.Log(buf.String())
t.Fatalf("Test Put(nil,nil): expected error `%v`, but it was `%v`", models.ErrDatastoreEmptyKey, err)
}
err = ds.Put(ctx, []byte("test"), []byte("success"))
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
val, err := ds.Get(ctx, []byte("test"))
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
if string(val) != "success" {
t.Log(buf.String())
t.Fatalf("Test Get: expected value to be `%v`, but it was `%v`", "success", string(val))
}
err = ds.Put(ctx, []byte("test"), nil)
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
val, err = ds.Get(ctx, []byte("test"))
if err != nil {
t.Log(buf.String())
t.Fatalf("Test Put: unexpected error: %v", err)
}
if string(val) != "" {
t.Log(buf.String())
t.Fatalf("Test Get: expected value to be `%v`, but it was `%v`", "", string(val))
}
}
func testPostgresInsert(t *testing.T, ctx context.Context, ds models.Datastore) {
}