*: move "auth" to "internal/auth"

etcd-io · Jan 29, 2018 · 83f93a1 · 83f93a1
1 parent ce0ad37
commit 83f93a1
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 16 deletions.
diff --git a/clientv3/auth.go b/clientv3/auth.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/etcd/auth/authpb"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth/authpb"
 
 	"google.golang.org/grpc"
 )

diff --git a/clientv3/main_test.go b/clientv3/main_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/integration"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/pkg/testutil"
 	"golang.org/x/crypto/bcrypt"
 )

diff --git a/embed/serve_test.go b/embed/serve_test.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/coreos/etcd/auth"
+	"github.com/coreos/etcd/internal/auth"
 )
 
 // TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error.

diff --git a/etcdserver/api/v3rpc/maintenance.go b/etcdserver/api/v3rpc/maintenance.go
@@ -19,10 +19,10 @@ import (
 	"crypto/sha256"
 	"io"
 
-	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/mvcc"
 	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/pkg/types"

diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"strings"
 
-	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	"github.com/coreos/etcd/etcdserver/membership"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/lease"
 	"github.com/coreos/etcd/internal/mvcc"
 

diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
@@ -20,10 +20,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/mvcc"
 	"github.com/coreos/etcd/internal/mvcc/mvccpb"
 )

diff --git a/etcdserver/apply.go b/etcdserver/apply.go
@@ -20,8 +20,8 @@ import (
 	"sort"
 	"time"
 
-	"github.com/coreos/etcd/auth"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/lease"
 	"github.com/coreos/etcd/internal/mvcc"
 	"github.com/coreos/etcd/internal/mvcc/mvccpb"

diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go
@@ -17,8 +17,8 @@ package etcdserver
 import (
 	"sync"
 
-	"github.com/coreos/etcd/auth"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/lease"
 	"github.com/coreos/etcd/internal/mvcc"
 )

diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go
diff --git a/etcdserver/server.go b/etcdserver/server.go
@@ -29,13 +29,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coreos/etcd/auth"
 	"github.com/coreos/etcd/etcdserver/api"
 	"github.com/coreos/etcd/etcdserver/api/v2http/httptypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
 	"github.com/coreos/etcd/etcdserver/stats"
 	"github.com/coreos/etcd/internal/alarm"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/compactor"
 	"github.com/coreos/etcd/internal/discovery"
 	"github.com/coreos/etcd/internal/lease"

diff --git a/etcdserver/v3_server.go b/etcdserver/v3_server.go
@@ -20,9 +20,9 @@ import (
 	"encoding/binary"
 	"time"
 
-	"github.com/coreos/etcd/auth"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/etcdserver/membership"
+	"github.com/coreos/etcd/internal/auth"
 	"github.com/coreos/etcd/internal/lease"
 	"github.com/coreos/etcd/internal/lease/leasehttp"
 	"github.com/coreos/etcd/internal/mvcc"

diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go
@@ -21,10 +21,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/auth/authpb"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth/authpb"
 	"github.com/coreos/etcd/pkg/testutil"
 )
 

diff --git a/auth/authpb/auth.pb.go → internal/auth/authpb/auth.pb.go b/auth/authpb/auth.pb.go → internal/auth/authpb/auth.pb.go
diff --git a/auth/authpb/auth.proto → internal/auth/authpb/auth.proto b/auth/authpb/auth.proto → internal/auth/authpb/auth.proto
diff --git a/auth/doc.go → internal/auth/doc.go b/auth/doc.go → internal/auth/doc.go
diff --git a/auth/jwt.go → internal/auth/jwt.go b/auth/jwt.go → internal/auth/jwt.go
diff --git a/auth/jwt_test.go → internal/auth/jwt_test.go b/auth/jwt_test.go → internal/auth/jwt_test.go
diff --git a/auth/range_perm_cache.go → internal/auth/range_perm_cache.go b/auth/range_perm_cache.go → internal/auth/range_perm_cache.go
@@ -15,7 +15,7 @@
 package auth
 
 import (
-	"github.com/coreos/etcd/auth/authpb"
+	"github.com/coreos/etcd/internal/auth/authpb"
 	"github.com/coreos/etcd/internal/mvcc/backend"
 	"github.com/coreos/etcd/pkg/adt"
 )

diff --git a/auth/range_perm_cache_test.go → internal/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go → internal/auth/range_perm_cache_test.go
@@ -17,7 +17,7 @@ package auth
 import (
 	"testing"
 
-	"github.com/coreos/etcd/auth/authpb"
+	"github.com/coreos/etcd/internal/auth/authpb"
 	"github.com/coreos/etcd/pkg/adt"
 )
 

diff --git a/auth/simple_token.go → internal/auth/simple_token.go b/auth/simple_token.go → internal/auth/simple_token.go
diff --git a/auth/simple_token_test.go → internal/auth/simple_token_test.go b/auth/simple_token_test.go → internal/auth/simple_token_test.go
diff --git a/auth/store.go → internal/auth/store.go b/auth/store.go → internal/auth/store.go
@@ -24,8 +24,8 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/coreos/etcd/auth/authpb"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth/authpb"
 	"github.com/coreos/etcd/internal/mvcc/backend"
 
 	"github.com/coreos/pkg/capnslog"

diff --git a/auth/store_test.go → internal/auth/store_test.go b/auth/store_test.go → internal/auth/store_test.go
@@ -24,8 +24,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/auth/authpb"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
+	"github.com/coreos/etcd/internal/auth/authpb"
 	"github.com/coreos/etcd/internal/mvcc/backend"
 
 	"golang.org/x/crypto/bcrypt"