Skip to content

Commit 2bf6265

Browse files
aldbraldbr
committed
feat: adapt clients
1 parent 85aa0ec commit 2bf6265

6 files changed

Lines changed: 250 additions & 0 deletions

File tree

‎diracx-client/src/diracx/client/_generated/aio/operations/_operations.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
build_jobs_unassign_bulk_jobs_sandboxes_request,
5555
build_jobs_unassign_job_sandboxes_request,
5656
build_well_known_get_installation_metadata_request,
57+
build_well_known_get_jwks_request,
5758
build_well_known_get_openid_configuration_request,
5859
)
5960
from .._configuration import DiracConfiguration
@@ -146,6 +147,57 @@ async def get_openid_configuration(
146147

147148
return deserialized # type: ignore
148149

150+
@distributed_trace_async
151+
async def get_jwks(self, **kwargs: Any) -> Dict[str, Any]:
152+
"""Get Jwks.
153+
154+
Get the JWKs (public keys).
155+
156+
:return: dict mapping str to any
157+
:rtype: dict[str, any]
158+
:raises ~azure.core.exceptions.HttpResponseError:
159+
"""
160+
error_map: MutableMapping = {
161+
401: ClientAuthenticationError,
162+
404: ResourceNotFoundError,
163+
409: ResourceExistsError,
164+
304: ResourceNotModifiedError,
165+
}
166+
error_map.update(kwargs.pop("error_map", {}) or {})
167+
168+
_headers = kwargs.pop("headers", {}) or {}
169+
_params = kwargs.pop("params", {}) or {}
170+
171+
cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None)
172+
173+
_request = build_well_known_get_jwks_request(
174+
headers=_headers,
175+
params=_params,
176+
)
177+
_request.url = self._client.format_url(_request.url)
178+
179+
_stream = False
180+
pipeline_response: PipelineResponse = (
181+
await self._client._pipeline.run( # pylint: disable=protected-access
182+
_request, stream=_stream, **kwargs
183+
)
184+
)
185+
186+
response = pipeline_response.http_response
187+
188+
if response.status_code not in [200]:
189+
map_error(
190+
status_code=response.status_code, response=response, error_map=error_map
191+
)
192+
raise HttpResponseError(response=response)
193+
194+
deserialized = self._deserialize("{object}", pipeline_response.http_response)
195+
196+
if cls:
197+
return cls(pipeline_response, deserialized, {}) # type: ignore
198+
199+
return deserialized # type: ignore
200+
149201
@distributed_trace_async
150202
async def get_installation_metadata(self, **kwargs: Any) -> _models.Metadata:
151203
"""Get Installation Metadata.

‎diracx-client/src/diracx/client/_generated/models/_models.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,8 @@ class OpenIDConfiguration(_serialization.Model):
563563
:vartype device_authorization_endpoint: str
564564
:ivar revocation_endpoint: Revocation Endpoint. Required.
565565
:vartype revocation_endpoint: str
566+
:ivar jwks_uri: Jwks Uri. Required.
567+
:vartype jwks_uri: str
566568
:ivar grant_types_supported: Grant Types Supported. Required.
567569
:vartype grant_types_supported: list[str]
568570
:ivar scopes_supported: Scopes Supported. Required.
@@ -585,6 +587,7 @@ class OpenIDConfiguration(_serialization.Model):
585587
"authorization_endpoint": {"required": True},
586588
"device_authorization_endpoint": {"required": True},
587589
"revocation_endpoint": {"required": True},
590+
"jwks_uri": {"required": True},
588591
"grant_types_supported": {"required": True},
589592
"scopes_supported": {"required": True},
590593
"response_types_supported": {"required": True},
@@ -603,6 +606,7 @@ class OpenIDConfiguration(_serialization.Model):
603606
"type": "str",
604607
},
605608
"revocation_endpoint": {"key": "revocation_endpoint", "type": "str"},
609+
"jwks_uri": {"key": "jwks_uri", "type": "str"},
606610
"grant_types_supported": {"key": "grant_types_supported", "type": "[str]"},
607611
"scopes_supported": {"key": "scopes_supported", "type": "[str]"},
608612
"response_types_supported": {
@@ -632,6 +636,7 @@ def __init__(
632636
authorization_endpoint: str,
633637
device_authorization_endpoint: str,
634638
revocation_endpoint: str,
639+
jwks_uri: str,
635640
grant_types_supported: List[str],
636641
scopes_supported: List[str],
637642
response_types_supported: List[str],
@@ -653,6 +658,8 @@ def __init__(
653658
:paramtype device_authorization_endpoint: str
654659
:keyword revocation_endpoint: Revocation Endpoint. Required.
655660
:paramtype revocation_endpoint: str
661+
:keyword jwks_uri: Jwks Uri. Required.
662+
:paramtype jwks_uri: str
656663
:keyword grant_types_supported: Grant Types Supported. Required.
657664
:paramtype grant_types_supported: list[str]
658665
:keyword scopes_supported: Scopes Supported. Required.
@@ -675,6 +682,7 @@ def __init__(
675682
self.authorization_endpoint = authorization_endpoint
676683
self.device_authorization_endpoint = device_authorization_endpoint
677684
self.revocation_endpoint = revocation_endpoint
685+
self.jwks_uri = jwks_uri
678686
self.grant_types_supported = grant_types_supported
679687
self.scopes_supported = scopes_supported
680688
self.response_types_supported = response_types_supported

‎diracx-client/src/diracx/client/_generated/operations/_operations.py‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@ def build_well_known_get_openid_configuration_request(
5353
return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs)
5454

5555

56+
def build_well_known_get_jwks_request(**kwargs: Any) -> HttpRequest:
57+
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
58+
59+
accept = _headers.pop("Accept", "application/json")
60+
61+
# Construct URL
62+
_url = "/.well-known/jwks.json"
63+
64+
# Construct headers
65+
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
66+
67+
return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs)
68+
69+
5670
def build_well_known_get_installation_metadata_request(
5771
**kwargs: Any,
5872
) -> HttpRequest: # pylint: disable=name-too-long
@@ -746,6 +760,57 @@ def get_openid_configuration(self, **kwargs: Any) -> _models.OpenIDConfiguration
746760

747761
return deserialized # type: ignore
748762

763+
@distributed_trace
764+
def get_jwks(self, **kwargs: Any) -> Dict[str, Any]:
765+
"""Get Jwks.
766+
767+
Get the JWKs (public keys).
768+
769+
:return: dict mapping str to any
770+
:rtype: dict[str, any]
771+
:raises ~azure.core.exceptions.HttpResponseError:
772+
"""
773+
error_map: MutableMapping = {
774+
401: ClientAuthenticationError,
775+
404: ResourceNotFoundError,
776+
409: ResourceExistsError,
777+
304: ResourceNotModifiedError,
778+
}
779+
error_map.update(kwargs.pop("error_map", {}) or {})
780+
781+
_headers = kwargs.pop("headers", {}) or {}
782+
_params = kwargs.pop("params", {}) or {}
783+
784+
cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None)
785+
786+
_request = build_well_known_get_jwks_request(
787+
headers=_headers,
788+
params=_params,
789+
)
790+
_request.url = self._client.format_url(_request.url)
791+
792+
_stream = False
793+
pipeline_response: PipelineResponse = (
794+
self._client._pipeline.run( # pylint: disable=protected-access
795+
_request, stream=_stream, **kwargs
796+
)
797+
)
798+
799+
response = pipeline_response.http_response
800+
801+
if response.status_code not in [200]:
802+
map_error(
803+
status_code=response.status_code, response=response, error_map=error_map
804+
)
805+
raise HttpResponseError(response=response)
806+
807+
deserialized = self._deserialize("{object}", pipeline_response.http_response)
808+
809+
if cls:
810+
return cls(pipeline_response, deserialized, {}) # type: ignore
811+
812+
return deserialized # type: ignore
813+
749814
@distributed_trace
750815
def get_installation_metadata(self, **kwargs: Any) -> _models.Metadata:
751816
"""Get Installation Metadata.

‎extensions/gubbins/gubbins-client/src/gubbins/client/_generated/aio/operations/_operations.py‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
build_lollygag_get_owner_object_request,
5858
build_lollygag_insert_owner_object_request,
5959
build_well_known_get_installation_metadata_request,
60+
build_well_known_get_jwks_request,
6061
build_well_known_get_openid_configuration_request,
6162
)
6263
from .._configuration import DiracConfiguration
@@ -149,6 +150,57 @@ async def get_openid_configuration(
149150

150151
return deserialized # type: ignore
151152

153+
@distributed_trace_async
154+
async def get_jwks(self, **kwargs: Any) -> Dict[str, Any]:
155+
"""Get Jwks.
156+
157+
Get the JWKs (public keys).
158+
159+
:return: dict mapping str to any
160+
:rtype: dict[str, any]
161+
:raises ~azure.core.exceptions.HttpResponseError:
162+
"""
163+
error_map: MutableMapping = {
164+
401: ClientAuthenticationError,
165+
404: ResourceNotFoundError,
166+
409: ResourceExistsError,
167+
304: ResourceNotModifiedError,
168+
}
169+
error_map.update(kwargs.pop("error_map", {}) or {})
170+
171+
_headers = kwargs.pop("headers", {}) or {}
172+
_params = kwargs.pop("params", {}) or {}
173+
174+
cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None)
175+
176+
_request = build_well_known_get_jwks_request(
177+
headers=_headers,
178+
params=_params,
179+
)
180+
_request.url = self._client.format_url(_request.url)
181+
182+
_stream = False
183+
pipeline_response: PipelineResponse = (
184+
await self._client._pipeline.run( # pylint: disable=protected-access
185+
_request, stream=_stream, **kwargs
186+
)
187+
)
188+
189+
response = pipeline_response.http_response
190+
191+
if response.status_code not in [200]:
192+
map_error(
193+
status_code=response.status_code, response=response, error_map=error_map
194+
)
195+
raise HttpResponseError(response=response)
196+
197+
deserialized = self._deserialize("{object}", pipeline_response.http_response)
198+
199+
if cls:
200+
return cls(pipeline_response, deserialized, {}) # type: ignore
201+
202+
return deserialized # type: ignore
203+
152204
@distributed_trace_async
153205
async def get_installation_metadata(
154206
self, **kwargs: Any

‎extensions/gubbins/gubbins-client/src/gubbins/client/_generated/models/_models.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,8 @@ class OpenIDConfiguration(_serialization.Model):
582582
:vartype device_authorization_endpoint: str
583583
:ivar revocation_endpoint: Revocation Endpoint. Required.
584584
:vartype revocation_endpoint: str
585+
:ivar jwks_uri: Jwks Uri. Required.
586+
:vartype jwks_uri: str
585587
:ivar grant_types_supported: Grant Types Supported. Required.
586588
:vartype grant_types_supported: list[str]
587589
:ivar scopes_supported: Scopes Supported. Required.
@@ -604,6 +606,7 @@ class OpenIDConfiguration(_serialization.Model):
604606
"authorization_endpoint": {"required": True},
605607
"device_authorization_endpoint": {"required": True},
606608
"revocation_endpoint": {"required": True},
609+
"jwks_uri": {"required": True},
607610
"grant_types_supported": {"required": True},
608611
"scopes_supported": {"required": True},
609612
"response_types_supported": {"required": True},
@@ -622,6 +625,7 @@ class OpenIDConfiguration(_serialization.Model):
622625
"type": "str",
623626
},
624627
"revocation_endpoint": {"key": "revocation_endpoint", "type": "str"},
628+
"jwks_uri": {"key": "jwks_uri", "type": "str"},
625629
"grant_types_supported": {"key": "grant_types_supported", "type": "[str]"},
626630
"scopes_supported": {"key": "scopes_supported", "type": "[str]"},
627631
"response_types_supported": {
@@ -651,6 +655,7 @@ def __init__(
651655
authorization_endpoint: str,
652656
device_authorization_endpoint: str,
653657
revocation_endpoint: str,
658+
jwks_uri: str,
654659
grant_types_supported: List[str],
655660
scopes_supported: List[str],
656661
response_types_supported: List[str],
@@ -672,6 +677,8 @@ def __init__(
672677
:paramtype device_authorization_endpoint: str
673678
:keyword revocation_endpoint: Revocation Endpoint. Required.
674679
:paramtype revocation_endpoint: str
680+
:keyword jwks_uri: Jwks Uri. Required.
681+
:paramtype jwks_uri: str
675682
:keyword grant_types_supported: Grant Types Supported. Required.
676683
:paramtype grant_types_supported: list[str]
677684
:keyword scopes_supported: Scopes Supported. Required.
@@ -694,6 +701,7 @@ def __init__(
694701
self.authorization_endpoint = authorization_endpoint
695702
self.device_authorization_endpoint = device_authorization_endpoint
696703
self.revocation_endpoint = revocation_endpoint
704+
self.jwks_uri = jwks_uri
697705
self.grant_types_supported = grant_types_supported
698706
self.scopes_supported = scopes_supported
699707
self.response_types_supported = response_types_supported

‎extensions/gubbins/gubbins-client/src/gubbins/client/_generated/operations/_operations.py‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@ def build_well_known_get_openid_configuration_request(
5353
return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs)
5454

5555

56+
def build_well_known_get_jwks_request(**kwargs: Any) -> HttpRequest:
57+
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
58+
59+
accept = _headers.pop("Accept", "application/json")
60+
61+
# Construct URL
62+
_url = "/.well-known/jwks.json"
63+
64+
# Construct headers
65+
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
66+
67+
return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs)
68+
69+
5670
def build_well_known_get_installation_metadata_request(
5771
**kwargs: Any,
5872
) -> HttpRequest: # pylint: disable=name-too-long
@@ -797,6 +811,57 @@ def get_openid_configuration(self, **kwargs: Any) -> _models.OpenIDConfiguration
797811

798812
return deserialized # type: ignore
799813

814+
@distributed_trace
815+
def get_jwks(self, **kwargs: Any) -> Dict[str, Any]:
816+
"""Get Jwks.
817+
818+
Get the JWKs (public keys).
819+
820+
:return: dict mapping str to any
821+
:rtype: dict[str, any]
822+
:raises ~azure.core.exceptions.HttpResponseError:
823+
"""
824+
error_map: MutableMapping = {
825+
401: ClientAuthenticationError,
826+
404: ResourceNotFoundError,
827+
409: ResourceExistsError,
828+
304: ResourceNotModifiedError,
829+
}
830+
error_map.update(kwargs.pop("error_map", {}) or {})
831+
832+
_headers = kwargs.pop("headers", {}) or {}
833+
_params = kwargs.pop("params", {}) or {}
834+
835+
cls: ClsType[Dict[str, Any]] = kwargs.pop("cls", None)
836+
837+
_request = build_well_known_get_jwks_request(
838+
headers=_headers,
839+
params=_params,
840+
)
841+
_request.url = self._client.format_url(_request.url)
842+
843+
_stream = False
844+
pipeline_response: PipelineResponse = (
845+
self._client._pipeline.run( # pylint: disable=protected-access
846+
_request, stream=_stream, **kwargs
847+
)
848+
)
849+
850+
response = pipeline_response.http_response
851+
852+
if response.status_code not in [200]:
853+
map_error(
854+
status_code=response.status_code, response=response, error_map=error_map
855+
)
856+
raise HttpResponseError(response=response)
857+
858+
deserialized = self._deserialize("{object}", pipeline_response.http_response)
859+
860+
if cls:
861+
return cls(pipeline_response, deserialized, {}) # type: ignore
862+
863+
return deserialized # type: ignore
864+
800865
@distributed_trace
801866
def get_installation_metadata(self, **kwargs: Any) -> _models.ExtendedMetadata:
802867
"""Get Installation Metadata.

0 commit comments

Comments
 (0)