From f6cc55c42cb03b707917385680f4045a86485455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 27 Feb 2026 10:14:16 +0800 Subject: [PATCH 1/5] Initial native Debian packaging --- debian/.gitignore | 8 ++++ debian/changelog | 5 +++ debian/control | 35 +++++++++++++++++ debian/copyright | 90 ++++++++++++++++++++++++++++++++++++++++++++ debian/gbp.conf | 3 ++ debian/gitlab-ci.yml | 16 ++++++++ debian/rules | 30 +++++++++++++++ debian/source/format | 1 + 8 files changed, 188 insertions(+) create mode 100644 debian/.gitignore create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/gitlab-ci.yml create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000000..9dc0d835a3 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,8 @@ +*.debhelper +*.log +*.substvars +/.debhelper/ +/.build/ +/debhelper-build-stamp +/files +/golang-github-pingcap-kvproto-dev/ diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000000..520991d007 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +golang-github-pingcap-kvproto (7.6.0~alpha) unstable; urgency=medium + + * Initial release of native packaging at upstream + + -- Otto Kekäläinen Fri, 27 Feb 2026 13:13:13 +0000 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000000..f2b5028bdd --- /dev/null +++ b/debian/control @@ -0,0 +1,35 @@ +Source: golang-github-pingcap-kvproto +Section: golang +Maintainer: Otto Kekäläinen +Build-Depends: + debhelper-compat (= 13), + dh-sequence-golang, + golang-any, + golang-github-golang-protobuf-1-5-dev, + golang-github-grpc-ecosystem-grpc-gateway-dev, + golang-gogoprotobuf-dev, + golang-google-genproto-dev, + golang-google-grpc-dev, + protobuf-compiler, +Testsuite: autopkgtest-pkg-go +Standards-Version: 4.7.3 +Vcs-Browser: https://github.com/pingcap/kvproto +Vcs-Git: https://github.com/pingcap/kvproto.git +Homepage: https://github.com/pingcap/kvproto +XS-Go-Import-Path: github.com/pingcap/kvproto + +Package: golang-github-pingcap-kvproto-dev +Architecture: all +Multi-Arch: foreign +Depends: + golang-github-golang-protobuf-1-5-dev, + golang-github-grpc-ecosystem-grpc-gateway-dev, + golang-gogoprotobuf-dev, + golang-google-genproto-dev, + golang-google-grpc-dev, + ${misc:Depends}, +Description: Protocol buffer definitions for the TiKV project + TiKV is a distributed, transactional key-value database. This package + contains the Go source code generated from the protocol buffer + definitions that are used for communication between TiKV servers and + clients. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000000..432023f651 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,90 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/pingcap/kvproto +Upstream-Name: kvproto +Upstream-Contact: PingCAP, Inc. + +Files: + * +Copyright: + 2016-2026 PingCAP, Inc. +License: Apache-2.0 + +Files: + debian/* +Copyright: + 2025-2026 Otto Kekäläinen +License: Apache-2.0 +Comment: Debian packaging is licensed under the same terms as upstream + +Files: + include/gogoproto/gogo.proto +Copyright: + 2013, The GoGo Authors +License: BSD-2-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: + include/google/protobuf/*.proto +Copyright: + 2008 Google Inc. +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: + pkg/**/*.pb.go +Copyright: + 2016-2026 PingCAP, Inc. +License: Apache-2.0 +Comment: + These files are programmatically generated by protoc-gen-gogo from + the .proto files. The copyright of the original .proto files is + held by PingCAP, Inc. + +License: Apache-2.0 + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000000..e930cb1f16 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +# This is native package and there are no debian/* or upstream/* branches +ignore-branch = True diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml new file mode 100644 index 0000000000..8fdcb8c083 --- /dev/null +++ b/debian/gitlab-ci.yml @@ -0,0 +1,16 @@ +# This is a template from +# https://salsa.debian.org/salsa-ci-team/pipeline/-/raw/master/recipes/salsa-ci.yml +# +# If this pipeline is not running at after committing and pushing this file, +# ensure that https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in +# field "CI/CD configuration file" filename "debian/salsa-ci.yml", the filename +# is the same as of this file, and duplicate files with similar contents but +# different filenames have been cleaned away. +# +# Feel free disable and enable tests to find a good balance between extensive +# coverage and having a consistently green pipeline where failures are rare +# enough that they are always investigated and addressed. For documentation +# please read https://salsa.debian.org/salsa-ci-team/pipeline +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000000..b7b65468a9 --- /dev/null +++ b/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +export GOPATH ?= $(CURDIR)/debian/go +export PATH := $(GOPATH)/bin:$(PATH) + +override_dh_auto_build: + # The grpc-gateway definitions have been removed from the proto files + # to fix the build with grpc-gateway v2. + # Remove the stale generated gateway file. + rm -f pkg/configpb/configpb.pb.gw.go + # Regenerate the main pb.go file from the patched proto file. + # The paths=source_relative option with protoc is tricky. We generate + # the file in a temporary location and move it. + # Remove rust-specific lines that break gogo + sed -i '/rustproto/d' proto/configpb.proto + # But we still need to generate rustproto itself, because other protos may depend on it. + # Use a temp dir and move to avoid creating nested directories on re-runs. + mkdir -p debian/.build/proto-gen + protoc -I. -Iinclude --gogo_out=paths=source_relative,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:debian/.build/proto-gen include/rustproto.proto + rm -f pkg/rustproto/rustproto.pb.go + mkdir -p pkg/rustproto + mv debian/.build/proto-gen/include/rustproto.pb.go pkg/rustproto/ + mkdir -p debian/.build/proto-gen + protoc -I. -Iinclude --gogo_out=plugins=grpc,paths=source_relative:debian/.build/proto-gen proto/configpb.proto + mkdir -p pkg/configpb + mv debian/.build/proto-gen/proto/configpb.pb.go pkg/configpb/ + dh_auto_build + +%: + dh $@ --builddirectory=debian/.build/upstream --buildsystem=golang diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000000..89ae9db8f8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) From 8f9c37090c4b87ad2845b1b71cb40464993c7d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 27 Feb 2026 05:19:32 +0000 Subject: [PATCH 2/5] Fix build with older protobuffer Patch grpc-gateway dependency in Debian to fix build failure: # github.com/pingcap/kvproto/pkg/configpb src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:45:44: cannot use &protoReq (value of type *GetRequest) as "google.golang.org/protobuf/proto".Message value in argument to runtime.PopulateQueryParameters: *GetRequest does not implement protoreflect.ProtoMessage (missing method ProtoReflect) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:58:44: cannot use &protoReq (value of type *GetRequest) as "google.golang.org/protobuf/proto".Message value in argument to runtime.PopulateQueryParameters: *GetRequest does not implement protoreflect.ProtoMessage (missing method ProtoReflect) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:112:44: cannot use &protoReq (value of type *DeleteRequest) as "google.golang.org/protobuf/proto".Message value in argument to runtime.PopulateQueryParameters: *DeleteRequest does not implement protoreflect.ProtoMessage (missing method ProtoReflect) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:125:44: cannot use &protoReq (value of type *DeleteRequest) as "google.golang.org/protobuf/proto".Message value in argument to runtime.PopulateQueryParameters: *DeleteRequest does not implement protoreflect.ProtoMessage (missing method ProtoReflect) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:304:107: too many arguments in call to runtime.NewPattern have (number, []int, []string, string, unknown type) want (int, []int, []string, string) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:304:115: undefined: runtime.AssumeColonVerbOpt src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:306:110: too many arguments in call to runtime.NewPattern have (number, []int, []string, string, unknown type) want (int, []int, []string, string) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:306:118: undefined: runtime.AssumeColonVerbOpt src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:308:110: too many arguments in call to runtime.NewPattern have (number, []int, []string, string, unknown type) want (int, []int, []string, string) src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:308:118: undefined: runtime.AssumeColonVerbOpt src/github.com/pingcap/kvproto/pkg/configpb/configpb.pb.gw.go:125:44: too m This can be dropped once Debian has upgraded to newer protobuffer libraries. --- include/rustproto.proto | 6 + pkg/configpb/configpb.pb.go | 161 ++++++++-------- pkg/configpb/configpb.pb.gw.go | 335 --------------------------------- proto/configpb.proto | 29 +-- 4 files changed, 92 insertions(+), 439 deletions(-) delete mode 100644 pkg/configpb/configpb.pb.gw.go diff --git a/include/rustproto.proto b/include/rustproto.proto index 1bc5334511..5db595da8d 100644 --- a/include/rustproto.proto +++ b/include/rustproto.proto @@ -7,6 +7,8 @@ package rustproto; import "google/protobuf/descriptor.proto"; +option go_package = "github.com/pingcap/kvproto/pkg/rustproto"; + extend google.protobuf.FileOptions { // When true, oneof field is generated public optional bool expose_oneof_all = 17001; @@ -45,3 +47,7 @@ extend google.protobuf.FieldOptions { // Use `bytes::Bytes` for `string` fields optional bool carllerche_bytes_for_string_field = 17012; } + +// Dummy message to force file generation. +message RustProtoDummy { +} diff --git a/pkg/configpb/configpb.pb.go b/pkg/configpb/configpb.pb.go index 4f4d03f36e..3bc6afe809 100644 --- a/pkg/configpb/configpb.pb.go +++ b/pkg/configpb/configpb.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: configpb.proto +// source: proto/configpb.proto package configpb @@ -11,8 +11,7 @@ import ( math_bits "math/bits" _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/golang/protobuf/proto" - _ "google.golang.org/genproto/googleapis/api/annotations" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -27,7 +26,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type StatusCode int32 @@ -63,7 +62,7 @@ func (x StatusCode) String() string { } func (StatusCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{0} + return fileDescriptor_f711cc98cf4fb76b, []int{0} } type Status struct { @@ -75,7 +74,7 @@ func (m *Status) Reset() { *m = Status{} } func (m *Status) String() string { return proto.CompactTextString(m) } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{0} + return fileDescriptor_f711cc98cf4fb76b, []int{0} } func (m *Status) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -133,7 +132,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{1} + return fileDescriptor_f711cc98cf4fb76b, []int{1} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -184,7 +183,7 @@ func (m *Local) Reset() { *m = Local{} } func (m *Local) String() string { return proto.CompactTextString(m) } func (*Local) ProtoMessage() {} func (*Local) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{2} + return fileDescriptor_f711cc98cf4fb76b, []int{2} } func (m *Local) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -228,7 +227,7 @@ func (m *Global) Reset() { *m = Global{} } func (m *Global) String() string { return proto.CompactTextString(m) } func (*Global) ProtoMessage() {} func (*Global) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{3} + return fileDescriptor_f711cc98cf4fb76b, []int{3} } func (m *Global) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -275,7 +274,7 @@ func (m *ConfigKind) Reset() { *m = ConfigKind{} } func (m *ConfigKind) String() string { return proto.CompactTextString(m) } func (*ConfigKind) ProtoMessage() {} func (*ConfigKind) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{4} + return fileDescriptor_f711cc98cf4fb76b, []int{4} } func (m *ConfigKind) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -358,7 +357,7 @@ func (m *ConfigEntry) Reset() { *m = ConfigEntry{} } func (m *ConfigEntry) String() string { return proto.CompactTextString(m) } func (*ConfigEntry) ProtoMessage() {} func (*ConfigEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{5} + return fileDescriptor_f711cc98cf4fb76b, []int{5} } func (m *ConfigEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -412,7 +411,7 @@ func (m *LocalConfig) Reset() { *m = LocalConfig{} } func (m *LocalConfig) String() string { return proto.CompactTextString(m) } func (*LocalConfig) ProtoMessage() {} func (*LocalConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{6} + return fileDescriptor_f711cc98cf4fb76b, []int{6} } func (m *LocalConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -477,7 +476,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{7} + return fileDescriptor_f711cc98cf4fb76b, []int{7} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -525,7 +524,7 @@ func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) String() string { return proto.CompactTextString(m) } func (*CreateRequest) ProtoMessage() {} func (*CreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{8} + return fileDescriptor_f711cc98cf4fb76b, []int{8} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -600,7 +599,7 @@ func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{9} + return fileDescriptor_f711cc98cf4fb76b, []int{9} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -665,7 +664,7 @@ func (m *GetAllRequest) Reset() { *m = GetAllRequest{} } func (m *GetAllRequest) String() string { return proto.CompactTextString(m) } func (*GetAllRequest) ProtoMessage() {} func (*GetAllRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{10} + return fileDescriptor_f711cc98cf4fb76b, []int{10} } func (m *GetAllRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -711,7 +710,7 @@ func (m *GetAllResponse) Reset() { *m = GetAllResponse{} } func (m *GetAllResponse) String() string { return proto.CompactTextString(m) } func (*GetAllResponse) ProtoMessage() {} func (*GetAllResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{11} + return fileDescriptor_f711cc98cf4fb76b, []int{11} } func (m *GetAllResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -772,7 +771,7 @@ func (m *GetRequest) Reset() { *m = GetRequest{} } func (m *GetRequest) String() string { return proto.CompactTextString(m) } func (*GetRequest) ProtoMessage() {} func (*GetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{12} + return fileDescriptor_f711cc98cf4fb76b, []int{12} } func (m *GetRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -840,7 +839,7 @@ func (m *GetResponse) Reset() { *m = GetResponse{} } func (m *GetResponse) String() string { return proto.CompactTextString(m) } func (*GetResponse) ProtoMessage() {} func (*GetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{13} + return fileDescriptor_f711cc98cf4fb76b, []int{13} } func (m *GetResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -908,7 +907,7 @@ func (m *UpdateRequest) Reset() { *m = UpdateRequest{} } func (m *UpdateRequest) String() string { return proto.CompactTextString(m) } func (*UpdateRequest) ProtoMessage() {} func (*UpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{14} + return fileDescriptor_f711cc98cf4fb76b, []int{14} } func (m *UpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -976,7 +975,7 @@ func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } func (m *UpdateResponse) String() string { return proto.CompactTextString(m) } func (*UpdateResponse) ProtoMessage() {} func (*UpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{15} + return fileDescriptor_f711cc98cf4fb76b, []int{15} } func (m *UpdateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1043,7 +1042,7 @@ func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{16} + return fileDescriptor_f711cc98cf4fb76b, []int{16} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1103,7 +1102,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a04502e9e0ee6409, []int{17} + return fileDescriptor_f711cc98cf4fb76b, []int{17} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1154,7 +1153,6 @@ func (m *DeleteResponse) GetVersion() *Version { } func init() { - proto.RegisterEnum("configpb.StatusCode", StatusCode_name, StatusCode_value) proto.RegisterType((*Status)(nil), "configpb.Status") proto.RegisterType((*Version)(nil), "configpb.Version") proto.RegisterType((*Local)(nil), "configpb.Local") @@ -1175,63 +1173,60 @@ func init() { proto.RegisterType((*DeleteResponse)(nil), "configpb.DeleteResponse") } -func init() { proto.RegisterFile("configpb.proto", fileDescriptor_a04502e9e0ee6409) } - -var fileDescriptor_a04502e9e0ee6409 = []byte{ - // 843 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0xf7, 0x24, 0x8e, 0xd3, 0x3c, 0x6f, 0xb2, 0xe9, 0x90, 0x6d, 0xa3, 0xa8, 0x44, 0x61, 0x0e, - 0x34, 0x0a, 0x52, 0x23, 0x85, 0x43, 0x45, 0x25, 0x0e, 0x6d, 0x36, 0x4d, 0xa2, 0x2d, 0x36, 0x9a, - 0x76, 0xdb, 0x63, 0xe4, 0x8d, 0x87, 0x60, 0xe1, 0xf5, 0x04, 0xdb, 0xa9, 0xd4, 0x2b, 0x9f, 0xa0, - 0xa8, 0x17, 0x8e, 0x1c, 0x10, 0x82, 0x4f, 0x81, 0xb8, 0x71, 0xac, 0xc4, 0xa5, 0x47, 0xb4, 0xe1, - 0x1b, 0xf0, 0x05, 0x50, 0x66, 0xec, 0xf5, 0x38, 0x11, 0x54, 0x7b, 0x58, 0x29, 0x37, 0xbf, 0x79, - 0x7f, 0xe6, 0xf7, 0xfb, 0xf9, 0xbd, 0x67, 0x43, 0x6d, 0xce, 0x83, 0xaf, 0xbc, 0xc5, 0xf2, 0xec, - 0xde, 0x32, 0xe4, 0x31, 0xc7, 0x37, 0x52, 0xbb, 0xd5, 0x58, 0xf0, 0x05, 0x17, 0x87, 0xfd, 0xcd, - 0x93, 0xf4, 0xb7, 0xee, 0x2c, 0x38, 0x5f, 0xf8, 0xac, 0xef, 0x2c, 0xbd, 0xbe, 0x13, 0x04, 0x3c, - 0x76, 0x62, 0x8f, 0x07, 0x51, 0xe2, 0x3d, 0x0c, 0x57, 0x51, 0x2c, 0x1e, 0xe5, 0x01, 0x79, 0x02, - 0xc6, 0xd3, 0xd8, 0x89, 0x57, 0x11, 0xee, 0x82, 0x3e, 0xe7, 0x2e, 0x6b, 0xa2, 0x0e, 0xea, 0xd6, - 0x06, 0x8d, 0x7b, 0x97, 0xf7, 0x4a, 0xff, 0x90, 0xbb, 0x8c, 0x8a, 0x08, 0xdc, 0x84, 0xf2, 0x39, - 0x8b, 0x22, 0x67, 0xc1, 0x9a, 0x85, 0x0e, 0xea, 0x56, 0x68, 0x6a, 0x92, 0xfb, 0x50, 0x7e, 0xce, - 0xc2, 0xc8, 0xe3, 0x01, 0x6e, 0x40, 0xc9, 0xe7, 0x73, 0xc7, 0x17, 0xf5, 0x74, 0x2a, 0x0d, 0x7c, - 0x0b, 0x8c, 0x85, 0xcf, 0xcf, 0x1c, 0x5f, 0x64, 0xea, 0x34, 0xb1, 0x48, 0x0f, 0x4a, 0x4f, 0x44, - 0xc0, 0x47, 0x70, 0x30, 0xe7, 0xe7, 0x4b, 0x1e, 0xb0, 0x20, 0x9e, 0x79, 0xae, 0xc8, 0xae, 0x50, - 0xf3, 0xf2, 0x6c, 0xea, 0x92, 0x8f, 0xc1, 0x18, 0x8b, 0x2c, 0x7c, 0x07, 0x2a, 0x97, 0x8e, 0x24, - 0x32, 0x3b, 0x20, 0x1e, 0xc0, 0x50, 0x70, 0x38, 0xf1, 0x02, 0x17, 0xdf, 0x55, 0xf1, 0x98, 0x83, - 0xc3, 0x8c, 0x9f, 0xb8, 0x78, 0xa2, 0xa5, 0x10, 0x7b, 0x39, 0x88, 0xe6, 0xa0, 0x9e, 0x45, 0xca, - 0x6b, 0x27, 0x5a, 0x0a, 0xfb, 0x91, 0x01, 0xfa, 0x37, 0x5e, 0xe0, 0x92, 0xfb, 0x60, 0xca, 0xab, - 0x46, 0x41, 0x1c, 0xbe, 0xc2, 0x18, 0xf4, 0xc0, 0x39, 0x67, 0x09, 0x24, 0xf1, 0xbc, 0xd1, 0xe3, - 0xa5, 0xe3, 0xaf, 0x52, 0xc9, 0xa4, 0x41, 0xde, 0x20, 0x30, 0xc5, 0xfd, 0x32, 0x1d, 0x7f, 0x02, - 0xe5, 0x97, 0x52, 0xc0, 0x04, 0xe7, 0xcd, 0xec, 0xf6, 0x44, 0x59, 0x9a, 0x46, 0xe4, 0xe9, 0x17, - 0xb6, 0xe8, 0xef, 0x28, 0x59, 0xdc, 0x51, 0x72, 0xf3, 0x36, 0x64, 0xf5, 0xa6, 0x2e, 0x9c, 0x89, - 0x45, 0xee, 0x82, 0x31, 0x61, 0x8e, 0xcb, 0x42, 0xfc, 0x21, 0xc0, 0xdc, 0x5f, 0x45, 0x31, 0x0b, - 0xd3, 0x97, 0xa1, 0xd3, 0x4a, 0x72, 0x32, 0x75, 0xc9, 0x6f, 0x08, 0xaa, 0xc3, 0x90, 0x39, 0x31, - 0xa3, 0xec, 0xdb, 0x15, 0x8b, 0x62, 0xdc, 0x05, 0xe3, 0x6b, 0x91, 0x9a, 0xe0, 0x57, 0xd4, 0x93, - 0x25, 0x69, 0xe2, 0x57, 0xa9, 0x16, 0xae, 0x46, 0xb5, 0xf8, 0x3e, 0xaa, 0xfa, 0xff, 0x51, 0x2d, - 0xe5, 0xa8, 0xfe, 0x8a, 0xa0, 0x96, 0x32, 0x88, 0x96, 0x3c, 0x88, 0xd8, 0x15, 0x28, 0x74, 0xc1, - 0x88, 0xc4, 0x70, 0xec, 0xb6, 0x8a, 0x1c, 0x1a, 0x9a, 0xf8, 0x55, 0xb2, 0xc5, 0xf7, 0x92, 0xfd, - 0xaf, 0xd7, 0xf2, 0x19, 0x54, 0xc7, 0x2c, 0x7e, 0xe8, 0xfb, 0x57, 0x16, 0x9b, 0xfc, 0x88, 0xa0, - 0x96, 0xe6, 0x5e, 0x23, 0xcd, 0x07, 0x50, 0x15, 0x43, 0x34, 0x93, 0x01, 0x51, 0xb3, 0xd8, 0x29, - 0x76, 0xcd, 0xc1, 0xd1, 0xd6, 0xb0, 0xc9, 0x66, 0xa7, 0x07, 0x7e, 0x66, 0x44, 0xe4, 0x27, 0x04, - 0x30, 0x66, 0xf1, 0x9e, 0x37, 0x12, 0xf9, 0x19, 0x81, 0x29, 0x60, 0xee, 0x7b, 0xb7, 0xfc, 0x8e, - 0xa0, 0x7a, 0xba, 0x74, 0xaf, 0x7f, 0x36, 0xbb, 0x72, 0x09, 0x26, 0x50, 0x95, 0x0f, 0x47, 0xb6, - 0x7d, 0xa9, 0x88, 0xc0, 0x7d, 0x28, 0xb3, 0x20, 0x0e, 0x3d, 0x16, 0x35, 0xf5, 0xed, 0xc6, 0x50, - 0xf6, 0x27, 0x4d, 0xa3, 0xc4, 0x74, 0xa6, 0x1c, 0xf6, 0x5d, 0xef, 0xd7, 0x08, 0xaa, 0xc7, 0xcc, - 0x67, 0xfb, 0xa3, 0x37, 0xf9, 0x1e, 0x41, 0x2d, 0x85, 0xb4, 0x27, 0xf2, 0xf5, 0x5e, 0x01, 0x64, - 0x3f, 0x14, 0xd8, 0x84, 0xf2, 0xa9, 0x75, 0x62, 0xd9, 0x2f, 0xac, 0xba, 0x86, 0x0d, 0x28, 0xd8, - 0x27, 0x75, 0x84, 0x6f, 0x42, 0xf5, 0x05, 0xb5, 0xad, 0xf1, 0xec, 0xf9, 0x88, 0x3e, 0x9d, 0xda, - 0x56, 0xbd, 0x80, 0x6b, 0x00, 0x96, 0xfd, 0x6c, 0x36, 0x9c, 0x3c, 0xb4, 0xc6, 0xa3, 0x7a, 0x11, - 0xdf, 0x86, 0x0f, 0x86, 0xf6, 0x17, 0x5f, 0xda, 0xd6, 0xc8, 0x7a, 0x36, 0xdb, 0x78, 0x1e, 0xdb, - 0xa7, 0xd6, 0x71, 0x5d, 0xc7, 0x2d, 0xb8, 0x95, 0x39, 0xa6, 0xc7, 0x8a, 0xaf, 0x34, 0xf8, 0xa7, - 0x00, 0x46, 0xf2, 0x9d, 0xfd, 0x1c, 0x0c, 0xb9, 0xf5, 0xf1, 0x6d, 0x45, 0x3f, 0xf5, 0x4b, 0xd6, - 0x6a, 0xee, 0x3a, 0xa4, 0x86, 0x44, 0xdb, 0xa4, 0xcb, 0x6d, 0xaa, 0xa6, 0xe7, 0x76, 0xb3, 0x9a, - 0x9e, 0x5f, 0xbc, 0x44, 0xc3, 0x8f, 0xa1, 0x38, 0x66, 0x31, 0x6e, 0xe4, 0x42, 0xd2, 0xc4, 0xa3, - 0xad, 0xd3, 0x24, 0x0b, 0x7f, 0xf7, 0xe7, 0xdf, 0x6f, 0x0a, 0x07, 0x18, 0xfa, 0xd9, 0xba, 0xa2, - 0x60, 0xc8, 0xe9, 0x50, 0x61, 0xe4, 0x66, 0x5e, 0x85, 0x91, 0x1f, 0x24, 0x72, 0x24, 0x0a, 0x1e, - 0x12, 0xa5, 0xe0, 0x03, 0xd4, 0xc3, 0x36, 0x18, 0xb2, 0x65, 0xd4, 0x9a, 0xb9, 0xbe, 0x56, 0x6b, - 0xe6, 0xbb, 0x2b, 0x05, 0xd9, 0x53, 0x6a, 0x3e, 0xea, 0xbc, 0xfb, 0xe5, 0x06, 0xfa, 0xe3, 0xa2, - 0x8d, 0xde, 0x5e, 0xb4, 0xd1, 0x5f, 0x17, 0x6d, 0xf4, 0x7a, 0xdd, 0xd6, 0x7e, 0x58, 0xb7, 0xb5, - 0xb7, 0xeb, 0xb6, 0xf6, 0x6e, 0xdd, 0xd6, 0xce, 0x0c, 0xf1, 0x2b, 0xfa, 0xe9, 0xbf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xb9, 0xe7, 0x47, 0xdd, 0xeb, 0x0a, 0x00, 0x00, +func init() { proto.RegisterFile("proto/configpb.proto", fileDescriptor_f711cc98cf4fb76b) } + +var fileDescriptor_f711cc98cf4fb76b = []byte{ + // 792 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0xd6, 0x4a, 0x14, 0x55, 0x0d, 0x2d, 0x55, 0xde, 0xca, 0xb6, 0x60, 0xb4, 0x86, 0xbb, 0x87, + 0x5a, 0x70, 0x01, 0x0b, 0x50, 0x5b, 0x18, 0x2d, 0xd0, 0x83, 0x2d, 0xab, 0x92, 0x60, 0x97, 0x0c, + 0xe8, 0x3f, 0x20, 0x17, 0x81, 0x12, 0x37, 0x34, 0x61, 0x8a, 0x64, 0x44, 0xca, 0x80, 0xdf, 0x22, + 0x41, 0x5e, 0x20, 0x87, 0x20, 0x40, 0x5e, 0x21, 0x97, 0x20, 0xb7, 0x1c, 0xf3, 0x08, 0x81, 0x9f, + 0x24, 0xd0, 0x2e, 0x29, 0x2e, 0x25, 0x24, 0x86, 0x0f, 0x06, 0x74, 0xe3, 0xec, 0xcc, 0xb7, 0x33, + 0xdf, 0xc7, 0x99, 0x21, 0xa1, 0xea, 0x8f, 0xbd, 0xd0, 0x6b, 0x0c, 0x3d, 0xf7, 0x99, 0x6d, 0xf9, + 0x83, 0x3d, 0x66, 0xe2, 0x1f, 0x62, 0x7b, 0xb3, 0x6a, 0x79, 0x96, 0xc7, 0x63, 0xa6, 0x4f, 0xdc, + 0x4f, 0x4e, 0x40, 0x3e, 0x0d, 0x8d, 0x70, 0x12, 0xe0, 0x3a, 0x48, 0x43, 0xcf, 0xa4, 0x35, 0xb4, + 0x8d, 0xea, 0xe5, 0x66, 0x75, 0x6f, 0x76, 0x11, 0xf7, 0xb7, 0x3c, 0x93, 0xea, 0x2c, 0x02, 0xd7, + 0xa0, 0x30, 0xa2, 0x41, 0x60, 0x58, 0xb4, 0x96, 0xdd, 0x46, 0xf5, 0xa2, 0x1e, 0x9b, 0x64, 0x1f, + 0x0a, 0x17, 0x74, 0x1c, 0xd8, 0x9e, 0x8b, 0xab, 0x90, 0x77, 0xbc, 0xa1, 0xe1, 0xb0, 0xfb, 0x24, + 0x9d, 0x1b, 0x78, 0x1d, 0x64, 0xcb, 0xf1, 0x06, 0x86, 0xc3, 0x90, 0x92, 0x1e, 0x59, 0x64, 0x17, + 0xf2, 0x27, 0x2c, 0xe0, 0x57, 0x58, 0x19, 0x7a, 0x23, 0xdf, 0x73, 0xa9, 0x1b, 0xf6, 0x6d, 0x93, + 0xa1, 0x8b, 0xba, 0x32, 0x3b, 0xeb, 0x99, 0xe4, 0x37, 0x90, 0x3b, 0x0c, 0x85, 0x7f, 0x86, 0xe2, + 0xcc, 0x11, 0x45, 0x26, 0x07, 0xc4, 0x06, 0x68, 0x31, 0x0e, 0xc7, 0xb6, 0x6b, 0xe2, 0x1d, 0xb1, + 0x1e, 0xa5, 0xf9, 0x63, 0xc2, 0x8f, 0x25, 0xee, 0x66, 0xe2, 0x12, 0x77, 0x53, 0x25, 0x2a, 0xcd, + 0x4a, 0x12, 0xc9, 0xd3, 0x76, 0x33, 0x71, 0xd9, 0x87, 0x32, 0x48, 0xd7, 0xb6, 0x6b, 0x92, 0x7d, + 0x50, 0x78, 0xaa, 0xb6, 0x1b, 0x8e, 0x6f, 0x31, 0x06, 0xc9, 0x35, 0x46, 0x34, 0x2a, 0x89, 0x3d, + 0x4f, 0xf5, 0xb8, 0x31, 0x9c, 0x49, 0x2c, 0x19, 0x37, 0xc8, 0x2b, 0x04, 0x0a, 0xcb, 0xcf, 0xe1, + 0xf8, 0x77, 0x28, 0xdc, 0x70, 0x01, 0xa3, 0x3a, 0x57, 0x93, 0xec, 0x91, 0xb2, 0x7a, 0x1c, 0x91, + 0xa6, 0x9f, 0x9d, 0xa3, 0xbf, 0xa0, 0x64, 0x6e, 0x41, 0xc9, 0xe9, 0xdb, 0xe0, 0xb7, 0xd7, 0x24, + 0xe6, 0x8c, 0x2c, 0xb2, 0x03, 0x72, 0x97, 0x1a, 0x26, 0x1d, 0xe3, 0x5f, 0x00, 0x86, 0xce, 0x24, + 0x08, 0xe9, 0x38, 0x7e, 0x19, 0x92, 0x5e, 0x8c, 0x4e, 0x7a, 0x26, 0xf9, 0x80, 0xa0, 0xd4, 0x1a, + 0x53, 0x23, 0xa4, 0x3a, 0x7d, 0x3e, 0xa1, 0x41, 0x88, 0xeb, 0x20, 0x5f, 0x31, 0x68, 0x54, 0xbf, + 0xa0, 0x1e, 0xbf, 0x52, 0x8f, 0xfc, 0x22, 0xd5, 0xec, 0xc3, 0xa8, 0xe6, 0xee, 0xa3, 0x2a, 0xfd, + 0x8f, 0x6a, 0x3e, 0x45, 0xf5, 0x1d, 0x82, 0x72, 0xcc, 0x20, 0xf0, 0x3d, 0x37, 0xa0, 0x0f, 0xa0, + 0x50, 0x07, 0x39, 0x60, 0xc3, 0xb1, 0xd8, 0x2a, 0x7c, 0x68, 0xf4, 0xc8, 0x2f, 0x92, 0xcd, 0xdd, + 0x4b, 0xf6, 0x5b, 0xaf, 0xe5, 0x6f, 0x28, 0x75, 0x68, 0x78, 0xe0, 0x38, 0x0f, 0x16, 0x9b, 0xbc, + 0x46, 0x50, 0x8e, 0xb1, 0x8f, 0x48, 0xf3, 0x1f, 0x28, 0xb1, 0x21, 0xea, 0xf3, 0x80, 0xa0, 0x96, + 0xdb, 0xce, 0xd5, 0x95, 0xe6, 0xda, 0xdc, 0xb0, 0xf1, 0x66, 0xd7, 0x57, 0x9c, 0xc4, 0x08, 0xc8, + 0x1b, 0x04, 0xd0, 0xa1, 0xe1, 0x92, 0x37, 0x12, 0x79, 0x8b, 0x40, 0x61, 0x65, 0x2e, 0x7b, 0xb7, + 0x7c, 0x44, 0x50, 0x3a, 0xf7, 0xcd, 0xc7, 0x9f, 0xcd, 0x3a, 0x5f, 0x82, 0x51, 0xa9, 0xc2, 0x87, + 0x23, 0xd9, 0xbe, 0x3a, 0x8b, 0xc0, 0x0d, 0x28, 0x50, 0x37, 0x1c, 0xdb, 0x34, 0xa8, 0x49, 0xf3, + 0x8d, 0x21, 0xec, 0x4f, 0x3d, 0x8e, 0x62, 0xd3, 0x19, 0x73, 0x58, 0x76, 0xbd, 0x5f, 0x20, 0x28, + 0x1d, 0x51, 0x87, 0x2e, 0x8f, 0xde, 0xe4, 0x25, 0x82, 0x72, 0x5c, 0xd2, 0x92, 0xc8, 0xb7, 0x7b, + 0x0b, 0x90, 0xfc, 0x50, 0x60, 0x05, 0x0a, 0xe7, 0xea, 0xb1, 0xaa, 0x5d, 0xaa, 0x95, 0x0c, 0x96, + 0x21, 0xab, 0x1d, 0x57, 0x10, 0x5e, 0x85, 0xd2, 0xa5, 0xae, 0xa9, 0x9d, 0xfe, 0x45, 0x5b, 0x3f, + 0xed, 0x69, 0x6a, 0x25, 0x8b, 0xcb, 0x00, 0xaa, 0x76, 0xd6, 0x6f, 0x75, 0x0f, 0xd4, 0x4e, 0xbb, + 0x92, 0xc3, 0x1b, 0xf0, 0x53, 0x4b, 0xfb, 0xff, 0x89, 0xa6, 0xb6, 0xd5, 0xb3, 0xfe, 0xd4, 0xf3, + 0x9f, 0x76, 0xae, 0x1e, 0x55, 0x24, 0xbc, 0x09, 0xeb, 0x89, 0xa3, 0x77, 0x24, 0xf8, 0xf2, 0xcd, + 0xf7, 0x59, 0x90, 0xa3, 0xef, 0xec, 0xbf, 0x20, 0xf3, 0xad, 0x8f, 0x37, 0x04, 0xfd, 0xc4, 0x2f, + 0xd9, 0x66, 0x6d, 0xd1, 0xc1, 0x35, 0x24, 0x99, 0x29, 0x9c, 0x6f, 0x53, 0x11, 0x9e, 0xda, 0xcd, + 0x22, 0x3c, 0xbd, 0x78, 0x49, 0x06, 0xff, 0x09, 0xb9, 0x0e, 0x0d, 0x71, 0x35, 0x15, 0x12, 0x03, + 0xd7, 0xe6, 0x4e, 0xc5, 0xa4, 0x7c, 0x16, 0xc4, 0xa4, 0xa9, 0x09, 0x17, 0x93, 0xa6, 0xc7, 0x86, + 0xc3, 0x79, 0x2f, 0x88, 0xf0, 0x54, 0xc3, 0x8a, 0xf0, 0x74, 0xdb, 0x90, 0xcc, 0xe1, 0x5f, 0x9f, + 0xee, 0xb6, 0xd0, 0xe7, 0xbb, 0x2d, 0xf4, 0xe5, 0x6e, 0x0b, 0x3d, 0xdd, 0xb1, 0xec, 0xf0, 0x6a, + 0x32, 0xd8, 0x1b, 0x7a, 0xa3, 0x86, 0x6f, 0xbb, 0xd6, 0xd0, 0xf0, 0x1b, 0xd7, 0x37, 0xfc, 0xef, + 0xd2, 0xbf, 0xb6, 0x66, 0x7f, 0xa1, 0x03, 0x99, 0x9d, 0xfd, 0xf1, 0x35, 0x00, 0x00, 0xff, 0xff, + 0xba, 0xe3, 0xa9, 0x62, 0x9e, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1455,7 +1450,7 @@ var _Config_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "configpb.proto", + Metadata: "proto/configpb.proto", } func (m *Status) Marshal() (dAtA []byte, err error) { @@ -5370,7 +5365,7 @@ func skipConfigpb(dAtA []byte) (n int, err error) { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } diff --git a/pkg/configpb/configpb.pb.gw.go b/pkg/configpb/configpb.pb.gw.go deleted file mode 100644 index 9b4675b325..0000000000 --- a/pkg/configpb/configpb.pb.gw.go +++ /dev/null @@ -1,335 +0,0 @@ -// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: configpb.proto - -/* -Package configpb is a reverse proxy. - -It translates gRPC into RESTful JSON APIs. -*/ -package configpb - -import ( - "context" - "io" - "net/http" - - "github.com/golang/protobuf/descriptor" - "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/metadata" - "google.golang.org/grpc/status" -) - -// Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = descriptor.ForMessage -var _ = metadata.Join - -var ( - filter_Config_Get_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Config_Get_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Config_Get_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.Get(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Config_Get_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Config_Get_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.Get(ctx, &protoReq) - return msg, metadata, err - -} - -func request_Config_Update_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq UpdateRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.Update(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Config_Update_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq UpdateRequest - var metadata runtime.ServerMetadata - - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.Update(ctx, &protoReq) - return msg, metadata, err - -} - -var ( - filter_Config_Delete_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Config_Delete_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq DeleteRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Config_Delete_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.Delete(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Config_Delete_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq DeleteRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Config_Delete_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.Delete(ctx, &protoReq) - return msg, metadata, err - -} - -// RegisterConfigHandlerServer registers the http handlers for service Config to "mux". -// UnaryRPC :call ConfigServer directly. -// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. -// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterConfigHandlerFromEndpoint instead. -func RegisterConfigHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ConfigServer) error { - - mux.Handle("GET", pattern_Config_Get_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Config_Get_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Config_Get_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("POST", pattern_Config_Update_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Config_Update_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Config_Update_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("DELETE", pattern_Config_Delete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - var stream runtime.ServerTransportStream - ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := local_request_Config_Delete_0(rctx, inboundMarshaler, server, req, pathParams) - md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Config_Delete_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -// RegisterConfigHandlerFromEndpoint is same as RegisterConfigHandler but -// automatically dials to "endpoint" and closes the connection when "ctx" gets done. -func RegisterConfigHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) - if err != nil { - return err - } - defer func() { - if err != nil { - if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) - } - return - } - go func() { - <-ctx.Done() - if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) - } - }() - }() - - return RegisterConfigHandler(ctx, mux, conn) -} - -// RegisterConfigHandler registers the http handlers for service Config to "mux". -// The handlers forward requests to the grpc endpoint over "conn". -func RegisterConfigHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { - return RegisterConfigHandlerClient(ctx, mux, NewConfigClient(conn)) -} - -// RegisterConfigHandlerClient registers the http handlers for service Config -// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ConfigClient". -// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ConfigClient" -// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in -// "ConfigClient" to call the correct interceptors. -func RegisterConfigHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ConfigClient) error { - - mux.Handle("GET", pattern_Config_Get_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Config_Get_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Config_Get_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("POST", pattern_Config_Update_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Config_Update_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Config_Update_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - mux.Handle("DELETE", pattern_Config_Delete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { - ctx, cancel := context.WithCancel(req.Context()) - defer cancel() - inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - rctx, err := runtime.AnnotateContext(ctx, mux, req) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - resp, md, err := request_Config_Delete_0(rctx, inboundMarshaler, client, req, pathParams) - ctx = runtime.NewServerMetadataContext(ctx, md) - if err != nil { - runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) - return - } - - forward_Config_Delete_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) - - }) - - return nil -} - -var ( - pattern_Config_Get_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"component"}, "", runtime.AssumeColonVerbOpt(true))) - - pattern_Config_Update_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"component"}, "", runtime.AssumeColonVerbOpt(true))) - - pattern_Config_Delete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"component"}, "", runtime.AssumeColonVerbOpt(true))) -) - -var ( - forward_Config_Get_0 = runtime.ForwardResponseMessage - - forward_Config_Update_0 = runtime.ForwardResponseMessage - - forward_Config_Delete_0 = runtime.ForwardResponseMessage -) diff --git a/proto/configpb.proto b/proto/configpb.proto index 951d7e9825..2e3ce6281e 100644 --- a/proto/configpb.proto +++ b/proto/configpb.proto @@ -2,32 +2,19 @@ syntax = "proto3"; package configpb; import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; -import "rustproto.proto"; -option (gogoproto.goproto_sizecache_all) = false; -option (gogoproto.goproto_unkeyed_all) = false; -option (gogoproto.goproto_unrecognized_all) = false; -option (gogoproto.marshaler_all) = true; +option go_package = "github.com/pingcap/kvproto/pkg/configpb"; + option (gogoproto.sizer_all) = true; +option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; -option (rustproto.lite_runtime_all) = true; service Config { - rpc Create(CreateRequest) returns (CreateResponse) {} - rpc GetAll(GetAllRequest) returns (GetAllResponse) {} - rpc Get(GetRequest) returns (GetResponse) { - option (google.api.http) = {get: "/component"}; - } - rpc Update(UpdateRequest) returns (UpdateResponse) { - option (google.api.http) = { - post: "/component" - body: "*" - }; - } - rpc Delete(DeleteRequest) returns (DeleteResponse) { - option (google.api.http) = {delete: "/component"}; - } + rpc Create(CreateRequest) returns (CreateResponse) {} + rpc GetAll(GetAllRequest) returns (GetAllResponse) {} + rpc Get(GetRequest) returns (GetResponse) {} + rpc Update(UpdateRequest) returns (UpdateResponse) {} + rpc Delete(DeleteRequest) returns (DeleteResponse) {} } enum StatusCode { From d579ec2b98363b43ecc5524ccaa376fe4c72b3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sat, 28 Feb 2026 15:45:05 +0800 Subject: [PATCH 3/5] WIP: Dummy changelog --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 520991d007..9890474d73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -golang-github-pingcap-kvproto (7.6.0~alpha) unstable; urgency=medium +golang-github-pingcap-kvproto (0.0.0) UNRELEASED; urgency=medium - * Initial release of native packaging at upstream + * Dummy changelog entry and version, which should be replaced by build + automation at build-time. - -- Otto Kekäläinen Fri, 27 Feb 2026 13:13:13 +0000 + -- Nobody Fri, 27 Feb 2026 13:13:13 +0000 From 4e634d4290cf92e4b016a250b69fb74006b5a17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Fri, 27 Feb 2026 16:56:32 +0100 Subject: [PATCH 4/5] Add workflow to run deb package build --- .github/workflows/debpkg.yaml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/debpkg.yaml diff --git a/.github/workflows/debpkg.yaml b/.github/workflows/debpkg.yaml new file mode 100644 index 0000000000..d22034506d --- /dev/null +++ b/.github/workflows/debpkg.yaml @@ -0,0 +1,32 @@ +name: build-deb +on: [pull_request, workflow_dispatch, push] + +jobs: + build-deb: + name: Build Debian Package + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v6 + with: + path: builddir + - name: Install build tools + run: | + sudo apt update && sudo apt install -y \ + build-essential \ + dh-sequence-golang \ + dpkg-dev \ + golang-any \ + golang-github-golang-protobuf-1-5-dev \ + golang-github-grpc-ecosystem-grpc-gateway-dev \ + golang-gogoprotobuf-dev golang-google-genproto-dev \ + golang-google-grpc-dev protobuf-compiler + - name: Run build + run: | + cd builddir + dpkg-buildpackage -b + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: kvproto-deb-artifacts.zip + path: golang-github-pingcap-kvproto* From 4b0463b7c6cbb446529f0afd987820135acee5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 1 Mar 2026 13:36:30 +0800 Subject: [PATCH 5/5] WIP: Simplified CI for Ubuntu --- .github/workflows/debpkg.yaml | 40 +++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/debpkg.yaml b/.github/workflows/debpkg.yaml index d22034506d..739757476d 100644 --- a/.github/workflows/debpkg.yaml +++ b/.github/workflows/debpkg.yaml @@ -2,31 +2,43 @@ name: build-deb on: [pull_request, workflow_dispatch, push] jobs: - build-deb: - name: Build Debian Package + build-deb-ubuntu-latest: + name: Build Debian Package on GitHub's ubuntu-latest runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v6 with: path: builddir - - name: Install build tools + - name: Install build dependencies run: | - sudo apt update && sudo apt install -y \ - build-essential \ - dh-sequence-golang \ - dpkg-dev \ - golang-any \ - golang-github-golang-protobuf-1-5-dev \ - golang-github-grpc-ecosystem-grpc-gateway-dev \ - golang-gogoprotobuf-dev golang-google-genproto-dev \ - golang-google-grpc-dev protobuf-compiler + set -euo pipefail + cd builddir + sudo apt-get update --quiet + sudo apt-get build-dep --yes --quiet . - name: Run build run: | + set -euo pipefail cd builddir - dpkg-buildpackage -b + PACKAGE="$(grep --only-matching --perl-regex "Source: \K.*" debian/control)" + VERSION="$(dpkg-parsechangelog -S Version)" + COMMIT_ID=$(git rev-parse --short HEAD) + RELEASE="${VERSION}+${COMMIT_ID}" + MSG="$(git log -1 --format='%h %s')" + FULLNAME=$(git show -s --format="%cn") + EMAIL=$(git show -s --format="%ce") + DATE=$(date -R) + cat > debian/changelog < ${DATE} + EOF + dpkg-buildpackage --build=binary - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: kvproto-deb-artifacts.zip + name: kvproto-deb-ubuntu-latest path: golang-github-pingcap-kvproto*