pkg: Rename imports after making 'pkg' a module

find -name '*.go' | xargs sed --follow-symlinks -i 's|go.etcd.io/etcd/v3/pkg/|go.etcd.io/etcd/pkg/v3/|g'
go fmt ./...

pkg/adt/README.md

@@ -16,7 +16,7 @@ For example,
 import (
     "fmt"
 
-    "go.etcd.io/etcd/v3/pkg/adt"
+    "go.etcd.io/etcd/pkg/v3/adt"
 )
 
 func main() {

pkg/adt/example_test.go

@@ -17,7 +17,7 @@ package adt_test
 import (
 	"fmt"
 
-	"go.etcd.io/etcd/v3/pkg/adt"
+	"go.etcd.io/etcd/pkg/v3/adt"
 )
 
 func Example() {

pkg/flags/unique_urls.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 // UniqueURLs contains unique URLs

pkg/flags/urls.go

@@ -20,7 +20,7 @@ import (
 	"net/url"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 // URLsValue wraps "types.URLs".

pkg/ioutil/util.go

@@ -18,7 +18,7 @@ import (
 	"io"
 	"os"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
 )
 
 // WriteAndSyncFile behaves just like ioutil.WriteFile in the standard library,

pkg/logutil/logger_test.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/logutil"
+	"go.etcd.io/etcd/pkg/v3/logutil"
 
 	"google.golang.org/grpc/grpclog"
 )

pkg/logutil/zap_journal.go

@@ -24,7 +24,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.etcd.io/etcd/v3/pkg/systemd"
+	"go.etcd.io/etcd/pkg/v3/systemd"
 
 	"github.com/coreos/go-systemd/v22/journal"
 	"go.uber.org/zap/zapcore"

pkg/netutil/netutil.go

@@ -23,7 +23,7 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 
 	"go.uber.org/zap"
 )

pkg/netutil/routes_linux.go

@@ -24,7 +24,7 @@ import (
 	"sort"
 	"syscall"
 
-	"go.etcd.io/etcd/v3/pkg/cpuutil"
+	"go.etcd.io/etcd/pkg/v3/cpuutil"
 )
 
 var errNoDefaultRoute = fmt.Errorf("could not find default route")

pkg/proxy/server.go

@@ -26,7 +26,7 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/v3/transport"
 
 	humanize "github.com/dustin/go-humanize"
 	"go.uber.org/zap"

pkg/proxy/server_test.go

@@ -29,7 +29,7 @@ import (
 	"testing"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/transport"
+	"go.etcd.io/etcd/pkg/v3/transport"
 
 	"go.uber.org/zap"
 )

pkg/srv/srv.go

@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"strings"
 
-	"go.etcd.io/etcd/v3/pkg/types"
+	"go.etcd.io/etcd/pkg/v3/types"
 )
 
 var (

pkg/srv/srv_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func TestSRVGetCluster(t *testing.T) {

pkg/testutil/leak.go

@@ -21,7 +21,7 @@ CheckLeakedGoroutine verifies tests do not leave any leaky
 goroutines. It returns true when there are goroutines still
 running(leaking) after all tests.
 
-	import "go.etcd.io/etcd/v3/pkg/testutil"
+	import "go.etcd.io/etcd/pkg/v3/testutil"
 
 	func TestMain(m *testing.M) {
 		testutil.MustTestMainWithLeakDetection(m)
@@ -116,8 +116,8 @@ func interestingGoroutines() (gs []string) {
 			strings.Contains(stack, "created by testing.runTests") ||
 			strings.Contains(stack, "testing.Main(") ||
 			strings.Contains(stack, "runtime.goexit") ||
-			strings.Contains(stack, "go.etcd.io/etcd/v3/pkg/testutil.interestingGoroutines") ||
-			strings.Contains(stack, "go.etcd.io/etcd/v3/pkg/logutil.(*MergeLogger).outputLoop") ||
+			strings.Contains(stack, "go.etcd.io/etcd/pkg/v3/testutil.interestingGoroutines") ||
+			strings.Contains(stack, "go.etcd.io/etcd/pkg/v3/logutil.(*MergeLogger).outputLoop") ||
 			strings.Contains(stack, "github.com/golang/glog.(*loggingT).flushDaemon") ||
 			strings.Contains(stack, "created by runtime.gc") ||
 			strings.Contains(stack, "created by text/template/parse.lex") ||

pkg/transport/listener.go

@@ -31,8 +31,8 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/v3/pkg/fileutil"
-	"go.etcd.io/etcd/v3/pkg/tlsutil"
+	"go.etcd.io/etcd/pkg/v3/fileutil"
+	"go.etcd.io/etcd/pkg/v3/tlsutil"
 
 	"go.uber.org/zap"
 )

pkg/types/urls_test.go

@@ -18,7 +18,7 @@ import (
 	"reflect"
 	"testing"
 
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 )
 
 func TestNewURLs(t *testing.T) {

pkg/types/urlsmap_test.go

@@ -15,7 +15,7 @@
 package types
 
 import (
-	"go.etcd.io/etcd/v3/pkg/testutil"
+	"go.etcd.io/etcd/pkg/v3/testutil"
 	"reflect"
 	"testing"
 )