*: revert "internal/auth" change
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>release-3.4
parent
0850ccbf45
commit
bb95d190c1
|
@ -20,8 +20,8 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
jwtPubKey = "../../integration/fixtures/server.crt"
|
jwtPubKey = "../integration/fixtures/server.crt"
|
||||||
jwtPrivKey = "../../integration/fixtures/server.key.insecure"
|
jwtPrivKey = "../integration/fixtures/server.key.insecure"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestJWTInfo(t *testing.T) {
|
func TestJWTInfo(t *testing.T) {
|
|
@ -15,7 +15,7 @@
|
||||||
package auth
|
package auth
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/coreos/etcd/internal/auth/authpb"
|
"github.com/coreos/etcd/auth/authpb"
|
||||||
"github.com/coreos/etcd/internal/mvcc/backend"
|
"github.com/coreos/etcd/internal/mvcc/backend"
|
||||||
"github.com/coreos/etcd/pkg/adt"
|
"github.com/coreos/etcd/pkg/adt"
|
||||||
)
|
)
|
|
@ -17,7 +17,7 @@ package auth
|
||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/internal/auth/authpb"
|
"github.com/coreos/etcd/auth/authpb"
|
||||||
"github.com/coreos/etcd/pkg/adt"
|
"github.com/coreos/etcd/pkg/adt"
|
||||||
)
|
)
|
||||||
|
|
|
@ -24,8 +24,8 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth/authpb"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/internal/auth/authpb"
|
|
||||||
"github.com/coreos/etcd/internal/mvcc/backend"
|
"github.com/coreos/etcd/internal/mvcc/backend"
|
||||||
|
|
||||||
"github.com/coreos/pkg/capnslog"
|
"github.com/coreos/pkg/capnslog"
|
|
@ -24,8 +24,8 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth/authpb"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/internal/auth/authpb"
|
|
||||||
"github.com/coreos/etcd/internal/mvcc/backend"
|
"github.com/coreos/etcd/internal/mvcc/backend"
|
||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
|
@ -19,8 +19,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth/authpb"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/internal/auth/authpb"
|
|
||||||
|
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,9 +22,10 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
"github.com/coreos/etcd/integration"
|
"github.com/coreos/etcd/integration"
|
||||||
"github.com/coreos/etcd/internal/auth"
|
|
||||||
"github.com/coreos/etcd/pkg/testutil"
|
"github.com/coreos/etcd/pkg/testutil"
|
||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/coreos/etcd/internal/auth"
|
"github.com/coreos/etcd/auth"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error.
|
// TestStartEtcdWrongToken ensures that StartEtcd with wrong configs returns with error.
|
||||||
|
|
|
@ -19,10 +19,10 @@ import (
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"github.com/coreos/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
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"
|
||||||
"github.com/coreos/etcd/internal/mvcc/backend"
|
"github.com/coreos/etcd/internal/mvcc/backend"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"github.com/coreos/etcd/pkg/types"
|
||||||
|
|
|
@ -18,10 +18,10 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"github.com/coreos/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
"github.com/coreos/etcd/etcdserver/membership"
|
"github.com/coreos/etcd/etcdserver/membership"
|
||||||
"github.com/coreos/etcd/internal/auth"
|
|
||||||
"github.com/coreos/etcd/internal/lease"
|
"github.com/coreos/etcd/internal/lease"
|
||||||
"github.com/coreos/etcd/internal/mvcc"
|
"github.com/coreos/etcd/internal/mvcc"
|
||||||
|
|
||||||
|
|
|
@ -21,10 +21,10 @@ import (
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
"github.com/coreos/etcd/etcdserver"
|
"github.com/coreos/etcd/etcdserver"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
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"
|
||||||
"github.com/coreos/etcd/internal/mvcc/mvccpb"
|
"github.com/coreos/etcd/internal/mvcc/mvccpb"
|
||||||
)
|
)
|
||||||
|
|
|
@ -20,8 +20,8 @@ import (
|
||||||
"sort"
|
"sort"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/internal/auth"
|
|
||||||
"github.com/coreos/etcd/internal/lease"
|
"github.com/coreos/etcd/internal/lease"
|
||||||
"github.com/coreos/etcd/internal/mvcc"
|
"github.com/coreos/etcd/internal/mvcc"
|
||||||
"github.com/coreos/etcd/internal/mvcc/mvccpb"
|
"github.com/coreos/etcd/internal/mvcc/mvccpb"
|
||||||
|
|
|
@ -17,8 +17,8 @@ package etcdserver
|
||||||
import (
|
import (
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/internal/auth"
|
|
||||||
"github.com/coreos/etcd/internal/lease"
|
"github.com/coreos/etcd/internal/lease"
|
||||||
"github.com/coreos/etcd/internal/mvcc"
|
"github.com/coreos/etcd/internal/mvcc"
|
||||||
)
|
)
|
||||||
|
|
|
@ -30,6 +30,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/alarm"
|
"github.com/coreos/etcd/alarm"
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
"github.com/coreos/etcd/compactor"
|
"github.com/coreos/etcd/compactor"
|
||||||
"github.com/coreos/etcd/discovery"
|
"github.com/coreos/etcd/discovery"
|
||||||
"github.com/coreos/etcd/etcdserver/api"
|
"github.com/coreos/etcd/etcdserver/api"
|
||||||
|
@ -37,7 +38,6 @@ import (
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/etcdserver/membership"
|
"github.com/coreos/etcd/etcdserver/membership"
|
||||||
"github.com/coreos/etcd/etcdserver/stats"
|
"github.com/coreos/etcd/etcdserver/stats"
|
||||||
"github.com/coreos/etcd/internal/auth"
|
|
||||||
"github.com/coreos/etcd/internal/lease"
|
"github.com/coreos/etcd/internal/lease"
|
||||||
"github.com/coreos/etcd/internal/lease/leasehttp"
|
"github.com/coreos/etcd/internal/lease/leasehttp"
|
||||||
"github.com/coreos/etcd/internal/mvcc"
|
"github.com/coreos/etcd/internal/mvcc"
|
||||||
|
|
|
@ -20,9 +20,9 @@ import (
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/etcdserver/membership"
|
"github.com/coreos/etcd/etcdserver/membership"
|
||||||
"github.com/coreos/etcd/internal/auth"
|
|
||||||
"github.com/coreos/etcd/internal/lease"
|
"github.com/coreos/etcd/internal/lease"
|
||||||
"github.com/coreos/etcd/internal/lease/leasehttp"
|
"github.com/coreos/etcd/internal/lease/leasehttp"
|
||||||
"github.com/coreos/etcd/internal/mvcc"
|
"github.com/coreos/etcd/internal/mvcc"
|
||||||
|
|
|
@ -21,10 +21,10 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/auth/authpb"
|
||||||
"github.com/coreos/etcd/clientv3"
|
"github.com/coreos/etcd/clientv3"
|
||||||
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
"github.com/coreos/etcd/internal/auth/authpb"
|
|
||||||
"github.com/coreos/etcd/pkg/testutil"
|
"github.com/coreos/etcd/pkg/testutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue