Skip to content

Commit bc3a0cc

Browse files
author
OpenShift Bot
authored
Merge pull request #12907 from smarterclayton/split_handlers
Merged by openshift-bot
2 parents e9c6020 + 50fa90e commit bc3a0cc

27 files changed

+853
-461
lines changed

‎api/protobuf-spec/github_com_openshift_origin_pkg_authorization_api_v1.proto

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/swagger-spec/oapi-v1.json

+42-2
Original file line numberDiff line numberDiff line change
@@ -27586,7 +27586,9 @@
2758627586
"resourceAPIGroup",
2758727587
"resourceAPIVersion",
2758827588
"resource",
27589-
"resourceName"
27589+
"resourceName",
27590+
"path",
27591+
"isNonResourceURL"
2759027592
],
2759127593
"properties": {
2759227594
"kind": {
@@ -27621,6 +27623,14 @@
2762127623
"type": "string",
2762227624
"description": "ResourceName is the name of the resource being requested for a \"get\" or deleted for a \"delete\""
2762327625
},
27626+
"path": {
27627+
"type": "string",
27628+
"description": "Path is the path of a non resource URL"
27629+
},
27630+
"isNonResourceURL": {
27631+
"type": "boolean",
27632+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)"
27633+
},
2762427634
"content": {
2762527635
"type": "string",
2762627636
"description": "Content is the actual content of the request for create and update"
@@ -27637,6 +27647,8 @@
2763727647
"resourceAPIVersion",
2763827648
"resource",
2763927649
"resourceName",
27650+
"path",
27651+
"isNonResourceURL",
2764027652
"user",
2764127653
"groups",
2764227654
"scopes"
@@ -27674,6 +27686,14 @@
2767427686
"type": "string",
2767527687
"description": "ResourceName is the name of the resource being requested for a \"get\" or deleted for a \"delete\""
2767627688
},
27689+
"path": {
27690+
"type": "string",
27691+
"description": "Path is the path of a non resource URL"
27692+
},
27693+
"isNonResourceURL": {
27694+
"type": "boolean",
27695+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)"
27696+
},
2767727697
"content": {
2767827698
"type": "string",
2767927699
"description": "Content is the actual content of the request for create and update"
@@ -28746,7 +28766,9 @@
2874628766
"resourceAPIGroup",
2874728767
"resourceAPIVersion",
2874828768
"resource",
28749-
"resourceName"
28769+
"resourceName",
28770+
"path",
28771+
"isNonResourceURL"
2875028772
],
2875128773
"properties": {
2875228774
"kind": {
@@ -28781,6 +28803,14 @@
2878128803
"type": "string",
2878228804
"description": "ResourceName is the name of the resource being requested for a \"get\" or deleted for a \"delete\""
2878328805
},
28806+
"path": {
28807+
"type": "string",
28808+
"description": "Path is the path of a non resource URL"
28809+
},
28810+
"isNonResourceURL": {
28811+
"type": "boolean",
28812+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)"
28813+
},
2878428814
"content": {
2878528815
"type": "string",
2878628816
"description": "Content is the actual content of the request for create and update"
@@ -29333,6 +29363,8 @@
2933329363
"resourceAPIVersion",
2933429364
"resource",
2933529365
"resourceName",
29366+
"path",
29367+
"isNonResourceURL",
2933629368
"user",
2933729369
"groups",
2933829370
"scopes"
@@ -29370,6 +29402,14 @@
2937029402
"type": "string",
2937129403
"description": "ResourceName is the name of the resource being requested for a \"get\" or deleted for a \"delete\""
2937229404
},
29405+
"path": {
29406+
"type": "string",
29407+
"description": "Path is the path of a non resource URL"
29408+
},
29409+
"isNonResourceURL": {
29410+
"type": "boolean",
29411+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)"
29412+
},
2937329413
"content": {
2937429414
"type": "string",
2937529415
"description": "Content is the actual content of the request for create and update"

‎api/swagger-spec/openshift-openapi-spec.json

+42-2
Original file line numberDiff line numberDiff line change
@@ -51992,7 +51992,9 @@
5199251992
"resourceAPIGroup",
5199351993
"resourceAPIVersion",
5199451994
"resource",
51995-
"resourceName"
51995+
"resourceName",
51996+
"path",
51997+
"isNonResourceURL"
5199651998
],
5199751999
"properties": {
5199852000
"apiVersion": {
@@ -52003,6 +52005,10 @@
5200352005
"description": "Content is the actual content of the request for create and update",
5200452006
"$ref": "#/definitions/runtime.RawExtension"
5200552007
},
52008+
"isNonResourceURL": {
52009+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)",
52010+
"type": "boolean"
52011+
},
5200652012
"kind": {
5200752013
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
5200852014
"type": "string"
@@ -52011,6 +52017,10 @@
5201152017
"description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces",
5201252018
"type": "string"
5201352019
},
52020+
"path": {
52021+
"description": "Path is the path of a non resource URL",
52022+
"type": "string"
52023+
},
5201452024
"resource": {
5201552025
"description": "Resource is one of the existing resource types",
5201652026
"type": "string"
@@ -52042,6 +52052,8 @@
5204252052
"resourceAPIVersion",
5204352053
"resource",
5204452054
"resourceName",
52055+
"path",
52056+
"isNonResourceURL",
5204552057
"user",
5204652058
"groups",
5204752059
"scopes"
@@ -52062,6 +52074,10 @@
5206252074
"type": "string"
5206352075
}
5206452076
},
52077+
"isNonResourceURL": {
52078+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)",
52079+
"type": "boolean"
52080+
},
5206552081
"kind": {
5206652082
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
5206752083
"type": "string"
@@ -52070,6 +52086,10 @@
5207052086
"description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces",
5207152087
"type": "string"
5207252088
},
52089+
"path": {
52090+
"description": "Path is the path of a non resource URL",
52091+
"type": "string"
52092+
},
5207352093
"resource": {
5207452094
"description": "Resource is one of the existing resource types",
5207552095
"type": "string"
@@ -54480,7 +54500,9 @@
5448054500
"resourceAPIGroup",
5448154501
"resourceAPIVersion",
5448254502
"resource",
54483-
"resourceName"
54503+
"resourceName",
54504+
"path",
54505+
"isNonResourceURL"
5448454506
],
5448554507
"properties": {
5448654508
"apiVersion": {
@@ -54491,6 +54513,10 @@
5449154513
"description": "Content is the actual content of the request for create and update",
5449254514
"$ref": "#/definitions/runtime.RawExtension"
5449354515
},
54516+
"isNonResourceURL": {
54517+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)",
54518+
"type": "boolean"
54519+
},
5449454520
"kind": {
5449554521
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
5449654522
"type": "string"
@@ -54499,6 +54525,10 @@
5449954525
"description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces",
5450054526
"type": "string"
5450154527
},
54528+
"path": {
54529+
"description": "Path is the path of a non resource URL",
54530+
"type": "string"
54531+
},
5450254532
"resource": {
5450354533
"description": "Resource is one of the existing resource types",
5450454534
"type": "string"
@@ -56019,6 +56049,8 @@
5601956049
"resourceAPIVersion",
5602056050
"resource",
5602156051
"resourceName",
56052+
"path",
56053+
"isNonResourceURL",
5602256054
"user",
5602356055
"groups",
5602456056
"scopes"
@@ -56039,6 +56071,10 @@
5603956071
"type": "string"
5604056072
}
5604156073
},
56074+
"isNonResourceURL": {
56075+
"description": "IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)",
56076+
"type": "boolean"
56077+
},
5604256078
"kind": {
5604356079
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds",
5604456080
"type": "string"
@@ -56047,6 +56083,10 @@
5604756083
"description": "Namespace is the namespace of the action being requested. Currently, there is no distinction between no namespace and all namespaces",
5604856084
"type": "string"
5604956085
},
56086+
"path": {
56087+
"description": "Path is the path of a non resource URL",
56088+
"type": "string"
56089+
},
5605056090
"resource": {
5605156091
"description": "Resource is one of the existing resource types",
5605256092
"type": "string"

‎pkg/authorization/api/types.go

+4
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,10 @@ type Action struct {
291291
Resource string
292292
// ResourceName is the name of the resource being requested for a "get" or deleted for a "delete"
293293
ResourceName string
294+
// Path is the path of a non resource URL
295+
Path string
296+
// IsNonResourceURL is true if this is a request for a non-resource URL (outside of the resource hieraarchy)
297+
IsNonResourceURL bool
294298
// Content is the actual content of the request for create and update
295299
Content kruntime.Object
296300
}

0 commit comments

Comments
 (0)