Spike nats embedded

.gitignore

@@ -1,3 +1,10 @@
 .idea
 
-etcd-adapter
+etcd-adapter
+
+# Ignore Go Workspace
+go.work*
+
+# Ignore Direnv
+.envrc*
+

Dockerfile

@@ -5,8 +5,7 @@ ARG ENABLE_PROXY=false
 WORKDIR /build
 COPY go.* ./
 
-RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.cn,direct ; fi \
-    && go mod download
+RUN go mod download
 
 COPY . .
 RUN make build

Makefile

@@ -13,6 +13,9 @@
 # limitations under the License.
 #
 
+run: build
+	@./etcd-adapter
+
 # contianer image registry
 REGISTRY ?="api7"
 
@@ -38,6 +41,7 @@ lint:
 .PHONY: build
 build:
 	go build \
+		-tags nats \
 		-o etcd-adapter \
 		main.go
 
@@ -47,4 +51,4 @@ build-image:
 
 .PHONY: e2e-test
 e2e-test: build build-image
-	cd test/e2e && go mod download && ginkgo -r --focus=$(E2E_FOCUS)
+	cd test/e2e && go mod download && ginkgo -r --focus=$(E2E_FOCUS)

cmd/root.go

@@ -18,6 +18,7 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"github.com/api7/etcd-adapter/pkg/backends/nats"
 	"net"
 	"os"
 	"os/signal"
@@ -71,6 +72,17 @@ var rootCmd = &cobra.Command{
 			}
 		case config.BTree:
 			backend = btree.NewBTreeCache()
+
+		case config.NATS:
+			//log.Errorw("", zap.String("", config.Config.DataSource.Type))
+			//spew.Dump(config.Config)
+			backend, err = nats.NewNATSCache(context.Background(), &nats.Options{
+				DSN: "nats://", // This is for default embedded ..
+			})
+			if err != nil {
+				dief("failed to create nats backend, err: %s", err)
+			}
+
 		default:
 			dief("does not support backends from %s", config.Config.DataSource.Type)
 		}

conf/config.yaml

@@ -1,18 +1,18 @@
 server:
   host: 0.0.0.0
-  port: 12379
+  port: 2379
 # tls:
 #   cert: /path/to/file.pem
 #   key: /path/to/file.pem
 
 log:
-  level: info
+  level: debug
 
 datasource:
-  type: btree # btree of mysql
+  type: nats # btree or mysql or nats
   # mysql:
   #   host: 127.0.0.1
   #   port: 3306
   #   username: root
   #   password:
-  #   database: apisix
+  #   database: apisix

go.mod

@@ -4,59 +4,79 @@ go 1.20
 
 require (
 	github.com/api7/gopkg v0.2.0
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/google/btree v1.1.2
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/k3s-io/kine v0.10.2
+	github.com/k3s-io/kine v0.11.2
 	github.com/soheilhy/cmux v0.1.5
-	github.com/spf13/cobra v1.7.0
-	github.com/spf13/viper v1.16.0
+	github.com/spf13/cobra v1.8.0
+	github.com/spf13/viper v1.18.2
 	github.com/stretchr/testify v1.8.4
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
-	go.etcd.io/etcd/api/v3 v3.5.9
-	go.etcd.io/etcd/client/v3 v3.5.9
-	go.uber.org/zap v1.25.0
-	golang.org/x/net v0.14.0
-	google.golang.org/grpc v1.57.0
+	go.etcd.io/etcd/api/v3 v3.5.11
+	go.etcd.io/etcd/client/v3 v3.5.11
+	go.uber.org/zap v1.26.0
+	golang.org/x/net v0.19.0
+	google.golang.org/grpc v1.60.1
 )
 
 require (
-	github.com/Rican7/retry v0.3.1 // indirect
+	github.com/Rican7/retry v0.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/minio/highwayhash v1.0.2 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
+	github.com/nats-io/jsm.go v0.0.31-0.20220317133147-fe318f464eee // indirect
+	github.com/nats-io/jwt/v2 v2.5.3 // indirect
+	github.com/nats-io/nats-server/v2 v2.10.5 // indirect
+	github.com/nats-io/nats.go v1.31.0 // indirect
+	github.com/nats-io/nkeys v0.4.6 // indirect
+	github.com/nats-io/nuid v1.0.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.11.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/shengdoushi/base58 v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
-	google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230815205213-6bfd019c3878 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
+	github.com/tidwall/btree v1.6.0 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/apimachinery v0.25.4 // indirect
+	k8s.io/client-go v0.25.4 // indirect
+	k8s.io/klog/v2 v2.70.1 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
 )