Skip to content

Commit

Permalink
segregate internal oauth server
Browse files Browse the repository at this point in the history
  • Loading branch information
@deads2k
deads2k committed Jan 26, 2018
1 parent 4f709b4 commit 610ba8d
Show file tree
Hide file tree
Showing 162 changed files with 186 additions and 186 deletions.
2 changes: 1 addition & 1 deletion pkg/authorization/registry/clusterrole/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
restclient "k8s.io/client-go/rest"
rbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion"

authclient "github.com/openshift/origin/pkg/auth/client"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
"github.com/openshift/origin/pkg/authorization/registry/util"
authclient "github.com/openshift/origin/pkg/oauthserver/client"
utilregistry "github.com/openshift/origin/pkg/util/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/authorization/registry/clusterrolebinding/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
restclient "k8s.io/client-go/rest"
rbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion"

authclient "github.com/openshift/origin/pkg/auth/client"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
"github.com/openshift/origin/pkg/authorization/registry/util"
authclient "github.com/openshift/origin/pkg/oauthserver/client"
utilregistry "github.com/openshift/origin/pkg/util/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/authorization/registry/role/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
restclient "k8s.io/client-go/rest"
rbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion"

authclient "github.com/openshift/origin/pkg/auth/client"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
"github.com/openshift/origin/pkg/authorization/registry/util"
authclient "github.com/openshift/origin/pkg/oauthserver/client"
utilregistry "github.com/openshift/origin/pkg/util/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/authorization/registry/rolebinding/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
restclient "k8s.io/client-go/rest"
rbacinternalversion "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion"

authclient "github.com/openshift/origin/pkg/auth/client"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
"github.com/openshift/origin/pkg/authorization/registry/util"
authclient "github.com/openshift/origin/pkg/oauthserver/client"
utilregistry "github.com/openshift/origin/pkg/util/registry"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/build/admission/jenkinsbootstrapper/admission.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
kadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
"k8s.io/kubernetes/pkg/kubectl/resource"

authenticationclient "github.com/openshift/origin/pkg/auth/client"
buildapi "github.com/openshift/origin/pkg/build/apis/build"
jenkinscontroller "github.com/openshift/origin/pkg/build/controller/jenkins"
oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
configapi "github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/config/cmd"
authenticationclient "github.com/openshift/origin/pkg/oauthserver/client"
templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/build/admission/secretinjector/admission.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
restclient "k8s.io/client-go/rest"
api "k8s.io/kubernetes/pkg/apis/core"

authclient "github.com/openshift/origin/pkg/auth/client"
buildapi "github.com/openshift/origin/pkg/build/apis/build"
oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
authclient "github.com/openshift/origin/pkg/oauthserver/client"
"github.com/openshift/origin/pkg/util/urlpattern"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/server/api/validation/ldap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"k8s.io/apimachinery/pkg/util/validation/field"

"github.com/openshift/origin/pkg/auth/ldaputil"
"github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/oauthserver/ldaputil"
)

func ValidateLDAPSyncConfig(config *api.LDAPSyncConfig) ValidationResults {
Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/server/api/validation/oauth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation/field"

"github.com/openshift/origin/pkg/auth/authenticator/redirector"
"github.com/openshift/origin/pkg/auth/server/errorpage"
"github.com/openshift/origin/pkg/auth/server/login"
"github.com/openshift/origin/pkg/auth/server/selectprovider"
"github.com/openshift/origin/pkg/auth/userregistry/identitymapper"
"github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/cmd/server/api/latest"
oauthvalidation "github.com/openshift/origin/pkg/oauth/apis/oauth/validation"
"github.com/openshift/origin/pkg/oauthserver/authenticator/redirector"
"github.com/openshift/origin/pkg/oauthserver/server/errorpage"
"github.com/openshift/origin/pkg/oauthserver/server/login"
"github.com/openshift/origin/pkg/oauthserver/server/selectprovider"
"github.com/openshift/origin/pkg/oauthserver/userregistry/identitymapper"
"github.com/openshift/origin/pkg/user/apis/user/validation"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/server/handlers/impersonation_scopes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

authenticationv1 "k8s.io/api/authentication/v1"

authenticationapi "github.com/openshift/origin/pkg/auth/api"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
authenticationapi "github.com/openshift/origin/pkg/oauthserver/api"
)

// TranslateLegacyScopeImpersonation is a filter that will translates user scope impersonation for openshift into the equivalent kube headers.
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/server/origin/authenticator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
sacontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
"k8s.io/kubernetes/pkg/serviceaccount"

openshiftauthenticator "github.com/openshift/origin/pkg/auth/authenticator"
"github.com/openshift/origin/pkg/auth/authenticator/request/paramtoken"
authnregistry "github.com/openshift/origin/pkg/auth/oauth/registry"
"github.com/openshift/origin/pkg/auth/userregistry/identitymapper"
configapi "github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
oauthvalidation "github.com/openshift/origin/pkg/oauth/apis/oauth/validation"
oauthclient "github.com/openshift/origin/pkg/oauth/generated/internalclientset/typed/oauth/internalversion"
oauthclientlister "github.com/openshift/origin/pkg/oauth/generated/listers/oauth/internalversion"
openshiftauthenticator "github.com/openshift/origin/pkg/oauthserver/authenticator"
"github.com/openshift/origin/pkg/oauthserver/authenticator/request/paramtoken"
authnregistry "github.com/openshift/origin/pkg/oauthserver/oauth/registry"
"github.com/openshift/origin/pkg/oauthserver/userregistry/identitymapper"
usercache "github.com/openshift/origin/pkg/user/cache"
userclient "github.com/openshift/origin/pkg/user/generated/internalclientset"
usertypedclient "github.com/openshift/origin/pkg/user/generated/internalclientset/typed/user/internalversion"
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/server/origin/oauth_apiserver_adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ import (

configapi "github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/cmd/server/crypto"
oauthapiserver "github.com/openshift/origin/pkg/oauth/apiserver"
"github.com/openshift/origin/pkg/oauthserver/oauthserver"
routeclient "github.com/openshift/origin/pkg/route/generated/internalclientset"
)

// TODO this is taking a very large config for a small piece of it. The information must be broken up at some point so that
// we can run this in a pod. This is an indication of leaky abstraction because it spent too much time in openshift start
func NewOAuthServerConfigFromMasterConfig(masterConfig *MasterConfig, listener net.Listener) (*oauthapiserver.OAuthServerConfig, error) {
func NewOAuthServerConfigFromMasterConfig(masterConfig *MasterConfig, listener net.Listener) (*oauthserver.OAuthServerConfig, error) {
options := masterConfig.Options
servingConfig := options.ServingInfo
oauthConfig := masterConfig.Options.OAuthConfig

oauthServerConfig, err := oauthapiserver.NewOAuthServerConfig(*oauthConfig, &masterConfig.PrivilegedLoopbackClientConfig)
oauthServerConfig, err := oauthserver.NewOAuthServerConfig(*oauthConfig, &masterConfig.PrivilegedLoopbackClientConfig)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/oauth/util/discovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/RangelReale/osin"
"github.com/openshift/origin/pkg/authorization/authorizer/scope"
"github.com/openshift/origin/pkg/oauth/apis/oauth/validation"
"github.com/openshift/origin/pkg/oauth/server/osinserver"
"github.com/openshift/origin/pkg/oauthserver/osinserver"
)

// OauthAuthorizationServerMetadata holds OAuth 2.0 Authorization Server Metadata used for discovery
Expand Down
4 changes: 2 additions & 2 deletions pkg/oauth/util/url.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"path"
"strings"

"github.com/openshift/origin/pkg/auth/server/tokenrequest"
"github.com/openshift/origin/pkg/oauth/server/osinserver"
"github.com/openshift/origin/pkg/oauthserver/osinserver"
"github.com/openshift/origin/pkg/oauthserver/server/tokenrequest"
)

const OpenShiftOAuthAPIPrefix = "/oauth"
Expand Down
0 pkg/auth/OWNERS → pkg/oauthserver/OWNERS
View file
File renamed without changes.
0 pkg/auth/api/types.go → pkg/oauthserver/api/types.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...sswordchallenger/password_auth_handler.go → ...sswordchallenger/password_auth_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

oauthhandlers "github.com/openshift/origin/pkg/auth/oauth/handlers"
oauthhandlers "github.com/openshift/origin/pkg/oauthserver/oauth/handlers"
)

type basicPasswordAuthHandler struct {
Expand Down
0 ...dchallenger/password_auth_handler_test.go → ...dchallenger/password_auth_handler_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...olderchallenger/placeholder_challenger.go → ...olderchallenger/placeholder_challenger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

oauthhandlers "github.com/openshift/origin/pkg/auth/oauth/handlers"
oauthhandlers "github.com/openshift/origin/pkg/oauthserver/oauth/handlers"
)

type placeholderChallenger struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/authenticator/interfaces.go → pkg/oauthserver/authenticator/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package authenticator
import (
"k8s.io/apiserver/pkg/authentication/user"

"github.com/openshift/origin/pkg/auth/api"
"github.com/openshift/origin/pkg/oauth/apis/oauth"
"github.com/openshift/origin/pkg/oauthserver/api"
userapi "github.com/openshift/origin/pkg/user/apis/user"
)

Expand Down
2 changes: 1 addition & 1 deletion ...sword/allowanypassword/anyauthpassword.go → ...sword/allowanypassword/anyauthpassword.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"

authapi "github.com/openshift/origin/pkg/auth/api"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
)

// alwaysAcceptPasswordAuthenticator approves any login attempt with non-blank username and password
Expand Down
2 changes: 1 addition & 1 deletion .../allowanypassword/anyauthpassword_test.go → .../allowanypassword/anyauthpassword_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package allowanypassword
import (
"testing"

"github.com/openshift/origin/pkg/auth/api"
"github.com/openshift/origin/pkg/oauthserver/api"
"k8s.io/apiserver/pkg/authentication/user"
)

Expand Down
2 changes: 1 addition & 1 deletion ...rd/basicauthpassword/basicauthpassword.go → ...rd/basicauthpassword/basicauthpassword.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"

authapi "github.com/openshift/origin/pkg/auth/api"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
)

// Authenticator uses basic auth to make a request to a JSON-returning URL.
Expand Down
0 ...sicauthpassword/basicauthpassword_test.go → ...sicauthpassword/basicauthpassword_test.go
View file
File renamed without changes.
0 ...ticator/password/basicauthpassword/doc.go → ...ticator/password/basicauthpassword/doc.go
View file
File renamed without changes.
0 ...tor/password/denypassword/denypassword.go → ...tor/password/denypassword/denypassword.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...thenticator/password/htpasswd/htpasswd.go → ...thenticator/password/htpasswd/htpasswd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"

authapi "github.com/openshift/origin/pkg/auth/api"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
)

// Authenticator watches a file generated by htpasswd to validate usernames and passwords
Expand Down
0 ...icator/password/htpasswd/htpasswd_test.go → ...icator/password/htpasswd/htpasswd_test.go
View file
File renamed without changes.
0 ...th/authenticator/password/htpasswd/md5.go → ...er/authenticator/password/htpasswd/md5.go
View file
File renamed without changes.
0 ...nticator/password/keystonepassword/doc.go → ...nticator/password/keystonepassword/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...word/keystonepassword/keystonepassword.go → ...word/keystonepassword/keystonepassword.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"

authapi "github.com/openshift/origin/pkg/auth/api"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
)

// keystonePasswordAuthenticator uses OpenStack keystone to authenticate a user by password
Expand Down
2 changes: 1 addition & 1 deletion ...keystonepassword/keystonepassword_test.go → ...keystonepassword/keystonepassword_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"testing"

"github.com/openshift/origin/pkg/auth/api"
"github.com/openshift/origin/pkg/oauthserver/api"
th "github.com/rackspace/gophercloud/testhelper"
"k8s.io/apiserver/pkg/authentication/user"
)
Expand Down
6 changes: 3 additions & 3 deletions ...thenticator/password/ldappassword/ldap.go → ...thenticator/password/ldappassword/ldap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/golang/glog"
"gopkg.in/ldap.v2"

authapi "github.com/openshift/origin/pkg/auth/api"
"github.com/openshift/origin/pkg/auth/ldaputil"
"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
"github.com/openshift/origin/pkg/oauthserver/ldaputil"
"github.com/openshift/origin/pkg/oauthserver/ldaputil/ldapclient"
)

// Options contains configuration for an Authenticator instance
Expand Down
2 changes: 1 addition & 1 deletion ...th/authenticator/redirector/redirector.go → ...er/authenticator/redirector/redirector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/url"
"strings"

oauthhandlers "github.com/openshift/origin/pkg/auth/oauth/handlers"
oauthhandlers "github.com/openshift/origin/pkg/oauthserver/oauth/handlers"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...tor/request/basicauthrequest/basicauth.go → ...tor/request/basicauthrequest/basicauth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/authentication/user"

"github.com/openshift/origin/pkg/auth/prometheus"
"github.com/openshift/origin/pkg/oauthserver/prometheus"
)

type basicAuthRequestHandler struct {
Expand Down
0 ...equest/basicauthrequest/basicauth_test.go → ...equest/basicauthrequest/basicauth_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...or/request/headerrequest/requestheader.go → ...or/request/headerrequest/requestheader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/glog"

authapi "github.com/openshift/origin/pkg/auth/api"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
"k8s.io/apiserver/pkg/authentication/user"
)

Expand Down
2 changes: 1 addition & 1 deletion ...quest/headerrequest/requestheader_test.go → ...quest/headerrequest/requestheader_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/openshift/origin/pkg/auth/api"
"github.com/openshift/origin/pkg/oauthserver/api"
"k8s.io/apiserver/pkg/authentication/user"
)

Expand Down
0 ...nticator/request/paramtoken/paramtoken.go → ...nticator/request/paramtoken/paramtoken.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/auth/client/impersonate.go → pkg/oauthserver/client/impersonate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"k8s.io/client-go/util/flowcontrol"
kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

authenticationapi "github.com/openshift/origin/pkg/auth/api"
authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
authenticationapi "github.com/openshift/origin/pkg/oauthserver/api"
)

type impersonatingRoundTripper struct {
Expand Down
0 pkg/auth/client/impersonate_rbac.go → pkg/oauthserver/client/impersonate_rbac.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/auth/doc.go → pkg/oauthserver/doc.go
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Package auth provides mechanisms for providing authorization and authentication to OpenShift
package auth
package oauthserver
2 changes: 1 addition & 1 deletion pkg/auth/handlers/authrequest.go → pkg/oauthserver/handlers/authrequest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/golang/glog"
"github.com/openshift/origin/pkg/auth/authenticator"
"github.com/openshift/origin/pkg/oauthserver/authenticator"
)

type RequestContext interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/ldaputil/client.go → pkg/oauthserver/ldaputil/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"k8s.io/client-go/util/cert"

"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"
"github.com/openshift/origin/pkg/oauthserver/ldaputil/ldapclient"
"gopkg.in/ldap.v2"
)

Expand Down
0 pkg/auth/ldaputil/errors.go → pkg/oauthserver/ldaputil/errors.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/auth/ldaputil/identityfactory.go → pkg/oauthserver/ldaputil/identityfactory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"k8s.io/apimachinery/pkg/util/sets"

authapi "github.com/openshift/origin/pkg/auth/api"
serverapi "github.com/openshift/origin/pkg/cmd/server/api"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
)

// LDAPUserIdentityFactory creates Identites for LDAP user entries.
Expand Down
0 pkg/auth/ldaputil/identityfactory_test.go → ...thserver/ldaputil/identityfactory_test.go
View file
File renamed without changes.
0 pkg/auth/ldaputil/ldapclient/interfaces.go → ...hserver/ldaputil/ldapclient/interfaces.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/auth/ldaputil/query.go → pkg/oauthserver/ldaputil/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/golang/glog"
"gopkg.in/ldap.v2"

"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"
"github.com/openshift/origin/pkg/cmd/server/api"
"github.com/openshift/origin/pkg/oauthserver/ldaputil/ldapclient"
)

// NewLDAPQuery converts a user-provided LDAPQuery into a version we can use
Expand Down
2 changes: 1 addition & 1 deletion pkg/auth/ldaputil/query_test.go → pkg/oauthserver/ldaputil/query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"testing"

"github.com/openshift/origin/pkg/auth/ldaputil/testclient"
"github.com/openshift/origin/pkg/oauthserver/ldaputil/testclient"
"gopkg.in/ldap.v2"
)

Expand Down
0 pkg/auth/ldaputil/syncutil.go → pkg/oauthserver/ldaputil/syncutil.go
View file
File renamed without changes.
0 pkg/auth/ldaputil/testclient/testclient.go → ...hserver/ldaputil/testclient/testclient.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...h/ldaputil/testclient/testclientconfig.go → ...r/ldaputil/testclient/testclientconfig.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testclient

import (
"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"
"github.com/openshift/origin/pkg/oauthserver/ldaputil/ldapclient"
"gopkg.in/ldap.v2"
)

Expand Down
0 pkg/auth/ldaputil/url.go → pkg/oauthserver/ldaputil/url.go
View file
File renamed without changes.
0 pkg/auth/ldaputil/url_test.go → pkg/oauthserver/ldaputil/url_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/auth/oauth/external/github/github.go → ...uthserver/oauth/external/github/github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/RangelReale/osincli"
"github.com/golang/glog"

authapi "github.com/openshift/origin/pkg/auth/api"
"github.com/openshift/origin/pkg/auth/oauth/external"
authapi "github.com/openshift/origin/pkg/oauthserver/api"
"github.com/openshift/origin/pkg/oauthserver/oauth/external"
"github.com/openshift/origin/pkg/util/http/links"
)

Expand Down
2 changes: 1 addition & 1 deletion ...auth/oauth/external/github/github_test.go → ...rver/oauth/external/github/github_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package github
import (
"testing"

"github.com/openshift/origin/pkg/auth/oauth/external"
"github.com/openshift/origin/pkg/oauthserver/oauth/external"
)

func TestGitHub(t *testing.T) {
Expand Down
Loading

0 comments on commit 610ba8d

Please sign in to comment.