Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: move "version" to "internal/version" #9244

Merged
merged 1 commit into from
Jan 29, 2018
Merged

*: move "version" to "internal/version" #9244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG-3.4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- Move `"github.com/coreos/etcd/mvcc"` to [`"github.com/coreos/etcd/internal/mvcc"`](https://github.com/coreos/etcd/pull/9238).
- Move `"github.com/coreos/etcd/snap"` to [`"github.com/coreos/etcd/internal/raftsnap"`](https://github.com/coreos/etcd/pull/9211).
- Move `"github.com/coreos/etcd/store"` to [`"github.com/coreos/etcd/internal/store"`](https://github.com/coreos/etcd/pull/9238).
- Move `"github.com/coreos/etcd/version"` to [`"github.com/coreos/etcd/internal/version"`](https://github.com/coreos/etcd/pull/9244).

### Added(`etcd`)

Expand Down
2 changes: 1 addition & 1 deletion client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sync"
"time"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion e2e/ctl_v3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
2 changes: 1 addition & 1 deletion e2e/etcd_release_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"testing"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"
)

func TestV3MetricsSecure(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion etcdctl/ctlv2/ctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import (
"time"

"github.com/coreos/etcd/etcdctl/ctlv2/command"
"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"

"github.com/urfave/cli"
)

Expand Down
3 changes: 2 additions & 1 deletion etcdctl/ctlv3/command/version_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package command
import (
"fmt"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"

"github.com/spf13/cobra"
)

Expand Down
3 changes: 2 additions & 1 deletion etcdctl/ctlv3/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import (
"text/tabwriter"
"text/template"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion etcdmain/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion etcdmain/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import (
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/internal/discovery"
"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"
"github.com/coreos/etcd/pkg/osutil"
"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"
Expand Down
3 changes: 2 additions & 1 deletion etcdserver/api/capability.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package api
import (
"sync"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"

"github.com/coreos/go-semver/semver"
"github.com/coreos/pkg/capnslog"
)
Expand Down
3 changes: 2 additions & 1 deletion etcdserver/api/etcdhttp/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ 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"
)

Expand Down
2 changes: 1 addition & 1 deletion etcdserver/api/etcdhttp/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"net/http/httptest"
"testing"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"
)

func TestServeVersion(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion etcdserver/api/v3rpc/maintenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion etcdserver/cluster_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ 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"
)

Expand Down
3 changes: 2 additions & 1 deletion etcdserver/cluster_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ 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"
)

Expand Down
2 changes: 1 addition & 1 deletion etcdserver/membership/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion etcdserver/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ 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"
)

Expand Down
2 changes: 1 addition & 1 deletion etcdserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ 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"
Expand All @@ -54,7 +55,6 @@ 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"
Expand Down
0 version/version.go → internal/version/version.go
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion rafthttp/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ 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 (
Expand Down
2 changes: 1 addition & 1 deletion rafthttp/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion rafthttp/pipeline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion rafthttp/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ 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"
)

Expand Down
6 changes: 3 additions & 3 deletions rafthttp/stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import (
"testing"
"time"

"golang.org/x/time/rate"

"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"
)

// TestStreamWriterAttachOutgoingConn tests that outgoingConn can be attached
Expand Down
3 changes: 2 additions & 1 deletion rafthttp/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ 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"
)

Expand Down
3 changes: 2 additions & 1 deletion rafthttp/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ 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"
)

Expand Down
3 changes: 2 additions & 1 deletion tools/functional-tester/etcd-runner/command/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import (
"text/tabwriter"
"text/template"

"github.com/coreos/etcd/version"
"github.com/coreos/etcd/internal/version"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down