Fix creating sync subscription for the same method and path (#476)

serverless · Jul 11, 2018 · 9c6a87d · 9c6a87d
1 parent 5f94b72
commit 9c6a87d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/libkv/subscription.go b/libkv/subscription.go
@@ -265,7 +265,13 @@ func isPathInConflict(existing, new string) bool {
 }
 
 func newSubscriptionID(sub *subscription.Subscription) subscription.ID {
-	raw := string(sub.Type) + "," + string(sub.EventType) + "," + string(sub.FunctionID) + "," + url.PathEscape(sub.Path) + "," + sub.Method
+	var raw string
+	if sub.Type == subscription.TypeAsync {
+		raw = string(sub.Type) + "," + string(sub.EventType) + "," + string(sub.FunctionID) + "," + url.PathEscape(sub.Path) + "," + sub.Method
+	} else {
+		raw = string(sub.Type) + "," + string(sub.EventType) + "," + url.PathEscape(sub.Path) + "," + sub.Method
+	}
+
 	return subscription.ID(base64.RawURLEncoding.EncodeToString([]byte(raw)))
 }
 

diff --git a/libkv/subscription_test.go b/libkv/subscription_test.go
@@ -28,9 +28,9 @@ func TestCreateSubscription(t *testing.T) {
 		Type: subscription.TypeAsync, EventType: "user.created", FunctionID: "func", Path: "/", Method: "GET"}
 	asyncEventPayload := []byte(`{"space":"default","name":"user.created"}`)
 
-	syncKey := "default/c3luYyxodHRwLnJlcXVlc3QsZnVuYywlMkYsUE9TVA"
+	syncKey := "default/c3luYyxodHRwLnJlcXVlc3QsJTJGLFBPU1Q"
 	syncValue := []byte(
-		`{"space":"default","subscriptionId":"c3luYyxodHRwLnJlcXVlc3QsZnVuYywlMkYsUE9TVA",` +
+		`{"space":"default","subscriptionId":"c3luYyxodHRwLnJlcXVlc3QsJTJGLFBPU1Q",` +
 			`"type":"sync","eventType":"http.request","functionId":"func","path":"/","method":"POST"}`)
 	syncSub := &subscription.Subscription{
 		Type: subscription.TypeSync, EventType: "http.request", FunctionID: "func", Path: "/", Method: "POST"}