From 389642dd169b8865a9798dbeb043a2afcbd0ad31 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Mon, 5 Oct 2020 14:20:14 +0200 Subject: [PATCH] client: Move client specific code (protos, version) to api/ client: Move client specific code (protos, version) to the api/ directory. Thanks to this change /client directory will not need to depend on the server code. In next commits we make "/api" a module on its own. Mechanical consequences of execution: % git mv version/version.go api/version % git mv etcdserver/api/v3rpc/rpctypes api/v3rpc % git mv mvcc/mvccpb api/ % git mv etcdserver/etcdserverpb api/ % git mv auth/authpb api/ % git mv etcdserver/api/membership/membershippb api/ --- {auth => api}/authpb/auth.pb.go | 0 {auth => api}/authpb/auth.proto | 0 {etcdserver => api}/etcdserverpb/etcdserver.pb.go | 0 {etcdserver => api}/etcdserverpb/etcdserver.proto | 0 {etcdserver => api}/etcdserverpb/gw/rpc.pb.gw.go | 0 {etcdserver => api}/etcdserverpb/raft_internal.pb.go | 0 {etcdserver => api}/etcdserverpb/raft_internal.proto | 0 {etcdserver => api}/etcdserverpb/raft_internal_stringer.go | 0 {etcdserver => api}/etcdserverpb/raft_internal_stringer_test.go | 0 {etcdserver => api}/etcdserverpb/rpc.pb.go | 0 {etcdserver => api}/etcdserverpb/rpc.proto | 0 {etcdserver/api/membership => api}/membershippb/membership.pb.go | 0 {etcdserver/api/membership => api}/membershippb/membership.proto | 0 {mvcc => api}/mvccpb/kv.pb.go | 0 {mvcc => api}/mvccpb/kv.proto | 0 {etcdserver/api => api}/v3rpc/rpctypes/doc.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/error.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/error_test.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/md.go | 0 {etcdserver/api => api}/v3rpc/rpctypes/metadatafields.go | 0 {version => api/version}/version.go | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename {auth => api}/authpb/auth.pb.go (100%) rename {auth => api}/authpb/auth.proto (100%) rename {etcdserver => api}/etcdserverpb/etcdserver.pb.go (100%) rename {etcdserver => api}/etcdserverpb/etcdserver.proto (100%) rename {etcdserver => api}/etcdserverpb/gw/rpc.pb.gw.go (100%) rename {etcdserver => api}/etcdserverpb/raft_internal.pb.go (100%) rename {etcdserver => api}/etcdserverpb/raft_internal.proto (100%) rename {etcdserver => api}/etcdserverpb/raft_internal_stringer.go (100%) rename {etcdserver => api}/etcdserverpb/raft_internal_stringer_test.go (100%) rename {etcdserver => api}/etcdserverpb/rpc.pb.go (100%) rename {etcdserver => api}/etcdserverpb/rpc.proto (100%) rename {etcdserver/api/membership => api}/membershippb/membership.pb.go (100%) rename {etcdserver/api/membership => api}/membershippb/membership.proto (100%) rename {mvcc => api}/mvccpb/kv.pb.go (100%) rename {mvcc => api}/mvccpb/kv.proto (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/doc.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/error.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/error_test.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/md.go (100%) rename {etcdserver/api => api}/v3rpc/rpctypes/metadatafields.go (100%) rename {version => api/version}/version.go (100%) diff --git a/auth/authpb/auth.pb.go b/api/authpb/auth.pb.go similarity index 100% rename from auth/authpb/auth.pb.go rename to api/authpb/auth.pb.go diff --git a/auth/authpb/auth.proto b/api/authpb/auth.proto similarity index 100% rename from auth/authpb/auth.proto rename to api/authpb/auth.proto diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/api/etcdserverpb/etcdserver.pb.go similarity index 100% rename from etcdserver/etcdserverpb/etcdserver.pb.go rename to api/etcdserverpb/etcdserver.pb.go diff --git a/etcdserver/etcdserverpb/etcdserver.proto b/api/etcdserverpb/etcdserver.proto similarity index 100% rename from etcdserver/etcdserverpb/etcdserver.proto rename to api/etcdserverpb/etcdserver.proto diff --git a/etcdserver/etcdserverpb/gw/rpc.pb.gw.go b/api/etcdserverpb/gw/rpc.pb.gw.go similarity index 100% rename from etcdserver/etcdserverpb/gw/rpc.pb.gw.go rename to api/etcdserverpb/gw/rpc.pb.gw.go diff --git a/etcdserver/etcdserverpb/raft_internal.pb.go b/api/etcdserverpb/raft_internal.pb.go similarity index 100% rename from etcdserver/etcdserverpb/raft_internal.pb.go rename to api/etcdserverpb/raft_internal.pb.go diff --git a/etcdserver/etcdserverpb/raft_internal.proto b/api/etcdserverpb/raft_internal.proto similarity index 100% rename from etcdserver/etcdserverpb/raft_internal.proto rename to api/etcdserverpb/raft_internal.proto diff --git a/etcdserver/etcdserverpb/raft_internal_stringer.go b/api/etcdserverpb/raft_internal_stringer.go similarity index 100% rename from etcdserver/etcdserverpb/raft_internal_stringer.go rename to api/etcdserverpb/raft_internal_stringer.go diff --git a/etcdserver/etcdserverpb/raft_internal_stringer_test.go b/api/etcdserverpb/raft_internal_stringer_test.go similarity index 100% rename from etcdserver/etcdserverpb/raft_internal_stringer_test.go rename to api/etcdserverpb/raft_internal_stringer_test.go diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/api/etcdserverpb/rpc.pb.go similarity index 100% rename from etcdserver/etcdserverpb/rpc.pb.go rename to api/etcdserverpb/rpc.pb.go diff --git a/etcdserver/etcdserverpb/rpc.proto b/api/etcdserverpb/rpc.proto similarity index 100% rename from etcdserver/etcdserverpb/rpc.proto rename to api/etcdserverpb/rpc.proto diff --git a/etcdserver/api/membership/membershippb/membership.pb.go b/api/membershippb/membership.pb.go similarity index 100% rename from etcdserver/api/membership/membershippb/membership.pb.go rename to api/membershippb/membership.pb.go diff --git a/etcdserver/api/membership/membershippb/membership.proto b/api/membershippb/membership.proto similarity index 100% rename from etcdserver/api/membership/membershippb/membership.proto rename to api/membershippb/membership.proto diff --git a/mvcc/mvccpb/kv.pb.go b/api/mvccpb/kv.pb.go similarity index 100% rename from mvcc/mvccpb/kv.pb.go rename to api/mvccpb/kv.pb.go diff --git a/mvcc/mvccpb/kv.proto b/api/mvccpb/kv.proto similarity index 100% rename from mvcc/mvccpb/kv.proto rename to api/mvccpb/kv.proto diff --git a/etcdserver/api/v3rpc/rpctypes/doc.go b/api/v3rpc/rpctypes/doc.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/doc.go rename to api/v3rpc/rpctypes/doc.go diff --git a/etcdserver/api/v3rpc/rpctypes/error.go b/api/v3rpc/rpctypes/error.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/error.go rename to api/v3rpc/rpctypes/error.go diff --git a/etcdserver/api/v3rpc/rpctypes/error_test.go b/api/v3rpc/rpctypes/error_test.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/error_test.go rename to api/v3rpc/rpctypes/error_test.go diff --git a/etcdserver/api/v3rpc/rpctypes/md.go b/api/v3rpc/rpctypes/md.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/md.go rename to api/v3rpc/rpctypes/md.go diff --git a/etcdserver/api/v3rpc/rpctypes/metadatafields.go b/api/v3rpc/rpctypes/metadatafields.go similarity index 100% rename from etcdserver/api/v3rpc/rpctypes/metadatafields.go rename to api/v3rpc/rpctypes/metadatafields.go diff --git a/version/version.go b/api/version/version.go similarity index 100% rename from version/version.go rename to api/version/version.go