From 0850ccbf45c62debf646240ff0156ce09ddcdefa Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 26 Feb 2018 10:36:33 -0800 Subject: [PATCH] *: revert "internal/version" change Signed-off-by: Gyuho Lee --- client/client.go | 2 +- client/client_test.go | 2 +- e2e/ctl_v3_test.go | 2 +- e2e/etcd_release_upgrade_test.go | 2 +- e2e/metrics_test.go | 2 +- etcdctl/ctlv2/ctl.go | 2 +- etcdctl/ctlv3/command/version_command.go | 2 +- etcdctl/ctlv3/help.go | 2 +- etcdmain/config.go | 2 +- etcdmain/etcd.go | 2 +- etcdserver/api/capability.go | 2 +- etcdserver/api/etcdhttp/base.go | 2 +- etcdserver/api/etcdhttp/version_test.go | 2 +- etcdserver/api/v3rpc/maintenance.go | 2 +- etcdserver/cluster_util.go | 2 +- etcdserver/cluster_util_test.go | 2 +- etcdserver/membership/cluster.go | 2 +- etcdserver/metrics.go | 2 +- etcdserver/server.go | 2 +- rafthttp/http.go | 3 +-- rafthttp/http_test.go | 2 +- rafthttp/pipeline_test.go | 2 +- rafthttp/stream.go | 2 +- rafthttp/stream_test.go | 2 +- rafthttp/util.go | 2 +- rafthttp/util_test.go | 2 +- tools/functional-tester/etcd-runner/command/help.go | 2 +- {internal/version => version}/version.go | 0 28 files changed, 27 insertions(+), 28 deletions(-) rename {internal/version => version}/version.go (100%) diff --git a/client/client.go b/client/client.go index ec7327230..e68745056 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index 20bcf2d86..592987113 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/testutil" + "github.com/coreos/etcd/version" ) type actionAssertingHTTPClient struct { diff --git a/e2e/ctl_v3_test.go b/e2e/ctl_v3_test.go index 64d105789..82bcfdac0 100644 --- a/e2e/ctl_v3_test.go +++ b/e2e/ctl_v3_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/flags" "github.com/coreos/etcd/pkg/testutil" + "github.com/coreos/etcd/version" ) func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) } diff --git a/e2e/etcd_release_upgrade_test.go b/e2e/etcd_release_upgrade_test.go index 434f2cbc4..6b1d42323 100644 --- a/e2e/etcd_release_upgrade_test.go +++ b/e2e/etcd_release_upgrade_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/testutil" + "github.com/coreos/etcd/version" ) // TestReleaseUpgrade ensures that changes to master branch does not affect diff --git a/e2e/metrics_test.go b/e2e/metrics_test.go index 1984b448d..8c548c920 100644 --- a/e2e/metrics_test.go +++ b/e2e/metrics_test.go @@ -18,7 +18,7 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/etcdctl/ctlv2/ctl.go b/etcdctl/ctlv2/ctl.go index 781574814..87e7840bb 100644 --- a/etcdctl/ctlv2/ctl.go +++ b/etcdctl/ctlv2/ctl.go @@ -21,7 +21,7 @@ import ( "time" "github.com/coreos/etcd/etcdctl/ctlv2/command" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" "github.com/urfave/cli" ) diff --git a/etcdctl/ctlv3/command/version_command.go b/etcdctl/ctlv3/command/version_command.go index e5f31843d..89d82a39b 100644 --- a/etcdctl/ctlv3/command/version_command.go +++ b/etcdctl/ctlv3/command/version_command.go @@ -17,7 +17,7 @@ package command import ( "fmt" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" "github.com/spf13/cobra" ) diff --git a/etcdctl/ctlv3/help.go b/etcdctl/ctlv3/help.go index 3d25bfade..c91fd71de 100644 --- a/etcdctl/ctlv3/help.go +++ b/etcdctl/ctlv3/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/etcdmain/config.go b/etcdmain/config.go index 471c73480..86fff2695 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -26,9 +26,9 @@ import ( "strings" "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/flags" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/etcd/version" "github.com/ghodss/yaml" ) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 409844923..87e9b25bb 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -30,7 +30,6 @@ import ( "github.com/coreos/etcd/embed" "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/cors" "github.com/coreos/etcd/pkg/fileutil" pkgioutil "github.com/coreos/etcd/pkg/ioutil" @@ -38,6 +37,7 @@ import ( "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/proxy/httpproxy" + "github.com/coreos/etcd/version" "github.com/coreos/pkg/capnslog" "google.golang.org/grpc" diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go index 9b73a3d42..c06c67038 100644 --- a/etcdserver/api/capability.go +++ b/etcdserver/api/capability.go @@ -17,7 +17,7 @@ package api import ( "sync" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" "github.com/coreos/pkg/capnslog" diff --git a/etcdserver/api/etcdhttp/base.go b/etcdserver/api/etcdhttp/base.go index e17029f41..6360ebd14 100644 --- a/etcdserver/api/etcdhttp/base.go +++ b/etcdserver/api/etcdhttp/base.go @@ -25,8 +25,8 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/api" "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/logutil" + "github.com/coreos/etcd/version" "github.com/coreos/pkg/capnslog" ) diff --git a/etcdserver/api/etcdhttp/version_test.go b/etcdserver/api/etcdhttp/version_test.go index 057dc7abe..fea165950 100644 --- a/etcdserver/api/etcdhttp/version_test.go +++ b/etcdserver/api/etcdhttp/version_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" ) func TestServeVersion(t *testing.T) { diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go index 5e804ef1b..5d724c3f6 100644 --- a/etcdserver/api/v3rpc/maintenance.go +++ b/etcdserver/api/v3rpc/maintenance.go @@ -25,9 +25,9 @@ import ( "github.com/coreos/etcd/internal/auth" "github.com/coreos/etcd/internal/mvcc" "github.com/coreos/etcd/internal/mvcc/backend" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" + "github.com/coreos/etcd/version" ) type KVGetter interface { diff --git a/etcdserver/cluster_util.go b/etcdserver/cluster_util.go index bcb9f4260..07ad7287b 100644 --- a/etcdserver/cluster_util.go +++ b/etcdserver/cluster_util.go @@ -23,8 +23,8 @@ import ( "time" "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/cluster_util_test.go b/etcdserver/cluster_util_test.go index 58c039616..62e7d91c6 100644 --- a/etcdserver/cluster_util_test.go +++ b/etcdserver/cluster_util_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/membership/cluster.go b/etcdserver/membership/cluster.go index 48e4d4764..84a8ffe79 100644 --- a/etcdserver/membership/cluster.go +++ b/etcdserver/membership/cluster.go @@ -29,11 +29,11 @@ import ( "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/store" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/netutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index c86d27a81..94d12e8df 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -17,8 +17,8 @@ package etcdserver import ( "time" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/runtime" + "github.com/coreos/etcd/version" "github.com/prometheus/client_golang/prometheus" ) diff --git a/etcdserver/server.go b/etcdserver/server.go index 25e929445..6a4bcf9ca 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -44,7 +44,6 @@ import ( "github.com/coreos/etcd/internal/mvcc/backend" "github.com/coreos/etcd/internal/raftsnap" "github.com/coreos/etcd/internal/store" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/pbutil" @@ -55,6 +54,7 @@ import ( "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" "github.com/coreos/etcd/rafthttp" + "github.com/coreos/etcd/version" "github.com/coreos/etcd/wal" "github.com/coreos/go-semver/semver" diff --git a/rafthttp/http.go b/rafthttp/http.go index 53bfbbdc2..c3c095f7c 100644 --- a/rafthttp/http.go +++ b/rafthttp/http.go @@ -24,11 +24,10 @@ import ( "strings" "github.com/coreos/etcd/internal/raftsnap" - "github.com/coreos/etcd/internal/version" pioutil "github.com/coreos/etcd/pkg/ioutil" "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" ) const ( diff --git a/rafthttp/http_test.go b/rafthttp/http_test.go index ebf1dcf31..44622c814 100644 --- a/rafthttp/http_test.go +++ b/rafthttp/http_test.go @@ -27,10 +27,10 @@ import ( "time" "github.com/coreos/etcd/internal/raftsnap" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" ) func TestServeRaftPrefix(t *testing.T) { diff --git a/rafthttp/pipeline_test.go b/rafthttp/pipeline_test.go index 5881d82fa..bdcdbc870 100644 --- a/rafthttp/pipeline_test.go +++ b/rafthttp/pipeline_test.go @@ -25,10 +25,10 @@ import ( "time" "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" ) // TestPipelineSend tests that pipeline could send data using roundtripper diff --git a/rafthttp/stream.go b/rafthttp/stream.go index 0bccccc06..92ad5f7af 100644 --- a/rafthttp/stream.go +++ b/rafthttp/stream.go @@ -28,11 +28,11 @@ import ( "golang.org/x/time/rate" "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/httputil" "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/rafthttp/stream_test.go b/rafthttp/stream_test.go index e850ca528..29ceaaafd 100644 --- a/rafthttp/stream_test.go +++ b/rafthttp/stream_test.go @@ -27,10 +27,10 @@ import ( "time" "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" "golang.org/x/time/rate" diff --git a/rafthttp/util.go b/rafthttp/util.go index 6eeeef464..3e3226357 100644 --- a/rafthttp/util.go +++ b/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/types" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/rafthttp/util_test.go b/rafthttp/util_test.go index 354e48fd3..cc05630c2 100644 --- a/rafthttp/util_test.go +++ b/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/internal/version" "github.com/coreos/etcd/raft/raftpb" + "github.com/coreos/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/tools/functional-tester/etcd-runner/command/help.go b/tools/functional-tester/etcd-runner/command/help.go index 276fd334a..3767b0e10 100644 --- a/tools/functional-tester/etcd-runner/command/help.go +++ b/tools/functional-tester/etcd-runner/command/help.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "text/template" - "github.com/coreos/etcd/internal/version" + "github.com/coreos/etcd/version" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/internal/version/version.go b/version/version.go similarity index 100% rename from internal/version/version.go rename to version/version.go