upgrade kvgo v1 to v2

sysinner · May 12, 2024 · 91ee0df · 91ee0df
1 parent 6b0d737
commit 91ee0df
Show file tree

Hide file tree

Showing 62 changed files with 990 additions and 763 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,6 @@ iam
 test.go
 inagent/daemon/ssh.go
 go.sum
+todo.md
+*.pb.rs
+*.pb.thunks.cc
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PROTOC_CMD = protoc
-PROTOC_ARGS = --proto_path=./inapi --go_opt=paths=source_relative --go_out=./inapi --go-grpc_out=./inapi ./inapi/*.proto
-PROTOC_RUST_ARGS = --proto_path=./inapi --rust_out=experimental-codegen=enabled,kernel=cpp:./inapi ./inapi/*.proto
+PROTOC_ARGS = --proto_path=./api --go_opt=paths=source_relative --go_out=./inapi --go-grpc_out=./inapi ./api/*.proto
+PROTOC_RUST_ARGS = --proto_path=./api --rust_out=experimental-codegen=enabled,kernel=cpp:./inapi ./api/*.proto
 
 HTOML_TAG_FIX_CMD = htoml-tag-fix
 HTOML_TAG_FIX_ARGS = ./inapi
@@ -22,7 +22,7 @@ endif
 .PHONY: api
 api:
 	$(QUIET_BUILD)$(PROTOC_CMD) $(PROTOC_ARGS) $(CCLINK)
-	$(QUIET_BUILD)$(PROTOC_CMD) $(PROTOC_RUST_ARGS) $(CCLINK)
+	# $(QUIET_BUILD)$(PROTOC_CMD) $(PROTOC_RUST_ARGS) $(CCLINK)
 	$(QUIET_BUILD)$(HTOML_TAG_FIX_CMD) $(HTOML_TAG_FIX_ARGS) $(CCLINK)
 
 .PHONY: api-in-runc

diff --git a/inapi/app.proto → api/app.proto b/inapi/app.proto → api/app.proto
diff --git a/inapi/cluster.proto → api/cluster.proto b/inapi/cluster.proto → api/cluster.proto
diff --git a/inapi/config.proto → api/config.proto b/inapi/config.proto → api/config.proto
diff --git a/inapi/inapi.proto → api/inapi.proto b/inapi/inapi.proto → api/inapi.proto
diff --git a/inapi/mail.proto → api/mail.proto b/inapi/mail.proto → api/mail.proto
diff --git a/inapi/operator.proto → api/operator.proto b/inapi/operator.proto → api/operator.proto
diff --git a/inapi/pod.proto → api/pod.proto b/inapi/pod.proto → api/pod.proto
diff --git a/inapi/stats.proto → api/stats.proto b/inapi/stats.proto → api/stats.proto
diff --git a/config/config.go b/config/config.go
@@ -30,7 +30,8 @@ import (
 	"github.com/hooto/htoml4g/htoml"
 	iamcfg "github.com/hooto/iam/config"
 	"github.com/lessos/lessgo/crypto/idhash"
-	"github.com/lynkdb/kvgo"
+	// "github.com/lynkdb/kvgo"
+	kvclient "github.com/lynkdb/kvgo/v2/pkg/client"
 
 	"github.com/sysinner/incore/inapi"
 )
@@ -98,7 +99,11 @@ type ConfigCommon struct {
 	Zone       ZoneConfig           `json:"zone" toml:"zone"`
 	ZoneMain   *ZoneMainConfig      `json:"zone_main,omitempty" toml:"zone_main,omitempty"`
 	IamService *iamcfg.ConfigCommon `json:"iam_service,omitempty" toml:"iam_service,omitempty"`
-	ZoneData   *kvgo.Config         `json:"zone_data,omitempty" toml:"zone_data,omitempty"`
+	// ZoneData   *kvgo.Config         `json:"zone_data,omitempty" toml:"zone_data,omitempty"`
+
+	GlobDatabase *kvclient.Config `json:"glob_database,omitempty" toml:"glob_database,omitempty"`
+	ZoneDatabase *kvclient.Config `json:"zone_database,omitempty" toml:"zone_database,omitempty"`
+	PackDatabase *kvclient.Config `json:"pack_database,omitempty" toml:"pack_database,omitempty"`
 
 	/**
 	DelZoneIamAccessKey *hauth.AccessKey         `json:"zone_iam_access_key,omitempty" toml:"zone_iam_access_key,omitempty"`