Merge pull request openshift#22931 from deads2k/move-08-oauthserver-s…

…tart start oauth-server
vrushalid · Jun 1, 2019 · 00564cb · 00564cb
2 parents 2819895 + f6543d1
commit 00564cb
Show file tree

Hide file tree

Showing 91 changed files with 701 additions and 595 deletions.
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -412,19 +412,17 @@
       "vendor/github.com/gorilla/sessions",
       "vendor/github.com/gophercloud/gophercloud",
       "vendor/gopkg.in/ldap.v2",
-      "vendor/github.com/prometheus/client_golang/prometheus",
       "vendor/github.com/openshift/api",
       "vendor/github.com/openshift/client-go",
       "vendor/github.com/openshift/library-go",
+      "vendor/github.com/openshift/oauth-server",
 
       "github.com/openshift/origin/pkg/oauthserver"
     ],
     "allowedImportPackages": [
       "vendor/k8s.io/klog",
       "vendor/github.com/davecgh/go-spew/spew",
-      "github.com/openshift/origin/pkg/authorization/authorizer/scope",
-      "github.com/openshift/origin/pkg/oauth/apis/oauth/validation",
-      "github.com/openshift/origin/pkg/oauth/scope",
+      "github.com/openshift/origin/pkg/authorization/authorizer/scopelibrary",
       "github.com/openshift/origin/pkg/cmd/server/apis/config",
       "github.com/openshift/origin/pkg/cmd/server/apis/config/install",
       "github.com/openshift/origin/pkg/cmd/server/apis/config/latest",

diff --git a/hack/verify-imports.sh b/hack/verify-imports.sh
@@ -75,6 +75,7 @@ function print_forbidden_imports () {
 
 # for some reason, if you specify nothing, then you never get an error.  Specify something, even if it never shows up
 RC=0
+print_forbidden_imports oauth-server k8s.io/kubernetes/pkg/apis || RC=1
 print_forbidden_imports oc k8s.io/kubernetes/pkg || RC=1
 print_forbidden_imports openshift-apiserver k8s.io/kubernetes/pkg/apis || RC=1
 print_forbidden_imports template-service-broker k8s.io/kubernetes/pkg/apis k8s.io/kubernetes/pkg/api k8s.io/kubernetes/pkg/kubectl k8s.io/kubernetes/pkg/controller || RC=1

diff --git a/pkg/authorization/apis/authorization/types.go b/pkg/authorization/apis/authorization/types.go
@@ -24,20 +24,18 @@ const (
 	VerbAll        = "*"
 	NonResourceAll = "*"
 
-	ScopesKey           = "scopes.authorization.openshift.io"
-	ScopesAllNamespaces = "*"
+	ScopesKey = "scopes.authorization.openshift.io"
 
 	UserKind           = "User"
 	GroupKind          = "Group"
 	ServiceAccountKind = "ServiceAccount"
 	SystemUserKind     = "SystemUser"
 	SystemGroupKind    = "SystemGroup"
 
-	UserResource           = "users"
-	GroupResource          = "groups"
-	ServiceAccountResource = "serviceaccounts"
-	SystemUserResource     = "systemusers"
-	SystemGroupResource    = "systemgroups"
+	UserResource        = "users"
+	GroupResource       = "groups"
+	SystemUserResource  = "systemusers"
+	SystemGroupResource = "systemgroups"
 )
 
 // DiscoveryRule is a rule that allows a client to discover the API resources available on this server