fix: delete event wrong revision (#18)

pkg/backends/btree/btree.go

@@ -258,7 +258,10 @@ func (b *btreeCache) Delete(ctx context.Context, key string, atRev int64) (int64
 	if err := b.index.Tombstone([]byte(key), rev); err != nil {
 		return b.currentRevision, nil, false, err
 	}
-	b.makeEvent(nil, kv, true)
+	b.makeEvent(&server.KeyValue{
+		Key:         key,
+		ModRevision: b.currentRevision,
+	}, kv, true)
 
 	return b.currentRevision, kv, true, nil
 }
@@ -353,7 +356,7 @@ func (b *btreeCache) makeEvent(kv, prevKV *server.KeyValue, deleteEvent bool) {
 			Delete: true,
 			// Kine uses KV field to get the mod revision, so even for delete event,
 			// add the kv field.
-			KV:     prevKV,
+			KV:     kv,
 			PrevKV: prevKV,
 		}
 	} else {

pkg/etcdserver/kv.go

@@ -2,6 +2,7 @@ package etcdserver
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/api7/gopkg/pkg/log"
@@ -80,3 +81,19 @@ func (k *EtcdServer) Put(ctx context.Context, r *etcdserverpb.PutRequest) (*etcd
 		},
 	}, err
 }
+
+// Only one deletion is supported, and range deletion is not supported.
+// TODO: support delete range
+func (k *EtcdServer) DeleteRange(ctx context.Context, r *etcdserverpb.DeleteRangeRequest) (*etcdserverpb.DeleteRangeResponse, error) {
+	if r.RangeEnd != nil {
+		return nil, fmt.Errorf("delete range is not supported")
+	}
+	_, prevKV, _ := k.backend.Get(ctx, string(r.Key), 0)
+	rev, _, _, _ := k.backend.Delete(ctx, string(r.Key), prevKV.ModRevision)
+	return &etcdserverpb.DeleteRangeResponse{
+		Header: &etcdserverpb.ResponseHeader{
+			Revision: rev,
+		},
+		Deleted: 1,
+	}, nil
+}

test/e2e/apisix/access_test.go

@@ -33,7 +33,7 @@ var _ = Describe("APISIX", func() {
     "upstream": {
         "type": "roundrobin",
         "nodes": {
-            "postman-echo.com:80": 1
+            "httpbin:80": 1
         }
     }
 }`
@@ -43,13 +43,14 @@ var _ = Describe("APISIX", func() {
     "upstream": {
         "type": "roundrobin",
         "nodes": {
-            "postman-echo.com:80": 1
+            "httpbin:80": 1
         }
     }
 }`
 	)
 
 	It("create route for the apisix, and access it", func() {
+		// create route
 		admin.PUT("/apisix/admin/routes/1").
 			WithHeader("X-API-KEY", "edd1c9f034335f136f87ad84b625c8f1").
 			WithBytes([]byte(createRoute1)).
@@ -82,4 +83,25 @@ var _ = Describe("APISIX", func() {
 		e.GET("/headers").Expect().Status(404)
 		e.GET("/get").Expect().Status(200)
 	})
+
+	It("delete route for the apisix, and access it", func() {
+		// create route
+		admin.PUT("/apisix/admin/routes/1").
+			WithHeader("X-API-KEY", "edd1c9f034335f136f87ad84b625c8f1").
+			WithBytes([]byte(createRoute1)).
+			Expect().Status(201)
+
+		time.Sleep(2 * time.Second)
+
+		e.GET("/headers").Expect().Status(200)
+
+		// delete route
+		admin.DELETE("/apisix/admin/routes/1").
+			WithHeader("X-API-KEY", "edd1c9f034335f136f87ad84b625c8f1").
+			Expect().Status(200)
+
+		time.Sleep(2 * time.Second)
+
+		e.GET("/headers").Expect().Status(404)
+	})
 })

test/testdata/apisix-adapter.docker-compose.yaml

@@ -24,6 +24,14 @@ services:
       - "12379:12379/tcp"
     networks:
       - apisix
+
+  httpbin:
+    image: kennethreitz/httpbin
+    restart: always
+    ports:
+      - "8080:80/tcp"
+    networks:
+      - apisix
 
 networks:
   apisix: