fix listing all subscriptions (#366)

serverless · Feb 15, 2018 · 0bf2d7f · 0bf2d7f
1 parent d70a637
commit 0bf2d7f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/libkv/space.go b/libkv/space.go
@@ -9,9 +9,6 @@ import (
 const defaultSpace = "default"
 
 func spacePath(space string) string {
-	if space == "" {
-		return ""
-	}
 	return space + "/"
 }
 

diff --git a/libkv/subscription.go b/libkv/subscription.go
@@ -96,7 +96,7 @@ func (service Service) DeleteSubscription(space string, id subscription.ID) erro
 func (service Service) GetSubscriptions(space string) (subscription.Subscriptions, error) {
 	subs := []*subscription.Subscription{}
 
-	kvs, err := service.SubscriptionStore.List("", &store.ReadOptions{Consistent: true})
+	kvs, err := service.SubscriptionStore.List(spacePath(space), &store.ReadOptions{Consistent: true})
 	if err != nil && err.Error() != errKeyNotFound {
 		return nil, err
 	}

diff --git a/libkv/subscription_test.go b/libkv/subscription_test.go
@@ -245,35 +245,35 @@ func TestDeleteSubscription_DeleteEndpointError(t *testing.T) {
 	assert.EqualError(t, err, "KV Delete err")
 }
 
-func TestGetAllSubscriptions_OK(t *testing.T) {
+func TestGetSubscriptions_OK(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
 	kvs := []*store.KVPair{
-		{Value: []byte(`{"subscriptionId":"s1","event":"test","functionId":"f1"}`)},
-		{Value: []byte(`{"subscriptionId":"s2","event":"test","functionId":"f2"}`)},
+		{Value: []byte(`{"subscriptionId":"s1","space":"default","event":"test","functionId":"f1"}`)},
+		{Value: []byte(`{"subscriptionId":"s2","space":"default","event":"test","functionId":"f2"}`)},
 	}
 	subscriptionsDB := mock.NewMockStore(ctrl)
-	subscriptionsDB.EXPECT().List("", &store.ReadOptions{Consistent: true}).Return(kvs, nil)
+	subscriptionsDB.EXPECT().List("default/", &store.ReadOptions{Consistent: true}).Return(kvs, nil)
 	subs := &Service{SubscriptionStore: subscriptionsDB, Log: zap.NewNop()}
 
-	list, _ := subs.GetSubscriptions("")
+	list, _ := subs.GetSubscriptions("default")
 
 	assert.Equal(t, subscription.Subscriptions{
-		{ID: subscription.ID("s1"), Event: "test", FunctionID: function.ID("f1")},
-		{ID: subscription.ID("s2"), Event: "test", FunctionID: function.ID("f2")},
+		{ID: subscription.ID("s1"), Space: "default", Event: "test", FunctionID: function.ID("f1")},
+		{ID: subscription.ID("s2"), Space: "default", Event: "test", FunctionID: function.ID("f2")},
 	}, list)
 }
 
-func TestGetAllSubscriptions_ListError(t *testing.T) {
+func TestGetSubscriptions_ListError(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
 	subscriptionsDB := mock.NewMockStore(ctrl)
-	subscriptionsDB.EXPECT().List("", gomock.Any()).Return(nil, errors.New("KV error"))
+	subscriptionsDB.EXPECT().List("default/", gomock.Any()).Return(nil, errors.New("KV error"))
 	subs := &Service{SubscriptionStore: subscriptionsDB, Log: zap.NewNop()}
 
-	_, err := subs.GetSubscriptions("")
+	_, err := subs.GetSubscriptions("default")
 	assert.EqualError(t, err, "KV error")
 }