Skip to content

Commit ea11f0a

Browse files
Updated docstr and typehints to reflect apiview.dev requirements (Azure#18818)
* Updated docstr and typehints to reflect apiview.dev requirements
1 parent 4e8d72f commit ea11f0a

File tree

5 files changed

+316
-183
lines changed

5 files changed

+316
-183
lines changed

sdk/attestation/azure-security-attestation/azure/security/attestation/_administration_client.py

Lines changed: 51 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@
4444
class AttestationAdministrationClient(object):
4545
"""Provides administrative APIs for managing an instance of the Attestation Service.
4646
47-
:param str instance_url: base url of the service
47+
:param instance_url: base url of the service
48+
:type instance_url: str
4849
:param credential: Credentials for the caller used to interact with the service.
49-
:type credential: azure.core.credentials.TokenCredential
50+
:type credential: :class:`~azure.core.credentials.TokenCredential`
51+
5052
:keyword Pipeline pipeline: If omitted, the standard pipeline is used.
5153
:keyword HttpTransport transport: If omitted, the standard pipeline is used.
5254
:keyword list[HTTPPolicy] policies: If omitted, the standard pipeline is used.
@@ -68,12 +70,17 @@ def __init__(
6870

6971
@distributed_trace
7072
def get_policy(self, attestation_type, **kwargs):
71-
#type(AttestationType, **Any) -> AttestationResult[str]:
73+
#type(AttestationType, **Any) -> AttestationResponse[str]:
7274
""" Retrieves the attestation policy for a specified attestation type.
7375
74-
:param azure.security.attestation.AttestationType attestation_type: :class:`azure.security.attestation.AttestationType` for
76+
:param attestation_type: :class:`azure.security.attestation.AttestationType` for
7577
which to retrieve the policy.
76-
:return azure.security.attestation.AttestationResponse[str]: Attestation service response encapsulating a string attestation policy.
78+
79+
:type attestation_type: azure.security.attestation.AttestationType
80+
81+
:return: Attestation service response encapsulating a string attestation policy.
82+
83+
:rtype: azure.security.attestation.AttestationResponse[str]
7784
7885
:raises azure.security.attestation.AttestationTokenValidationException: Raised when an attestation token is invalid.
7986
@@ -97,12 +104,20 @@ def set_policy(self, attestation_type, attestation_policy, signing_key=None, **k
97104
#type:(AttestationType, str, Optional[AttestationSigningKey], **Any) -> AttestationResponse[PolicyResult]
98105
""" Sets the attestation policy for the specified attestation type.
99106
100-
:param azure.security.attestation.AttestationType attestation_type: :class:`azure.security.attestation.AttestationType` for
107+
:param attestation_type: :class:`azure.security.attestation.AttestationType` for
101108
which to set the policy.
102-
:param str attestation_policy: Attestation policy to be set.
103-
:keyword azure.security.attestation.AttestationSigningKey signing_key: Signing key to be
104-
used to sign the policy before sending it to the service.
105-
:return azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyResult]: Attestation service response encapsulating a :class:`PolicyResult`.
109+
:type attestation_type: azure.security.attestation.AttestationType
110+
:param attestation_policy: Attestation policy to be set.
111+
:type attestation_policy: str
112+
:param signing_key: Signing key to be used to sign the policy
113+
before sending it to the service.
114+
115+
:type signing_key: azure.security.attestation.AttestationSigningKey
116+
117+
:return: Attestation service response encapsulating a :class:`PolicyResult`.
118+
119+
:rtype: azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyResult]
120+
106121
:raises azure.security.attestation.AttestationTokenValidationException: Raised when an attestation token is invalid.
107122
108123
.. note::
@@ -133,12 +148,20 @@ def reset_policy(self, attestation_type, signing_key=None, **kwargs):
133148
#type:(AttestationType, Optional[AttestationSigningKey], **dict[str, Any]) -> AttestationResponse[PolicyResult]
134149
""" Resets the attestation policy for the specified attestation type to the default value.
135150
136-
:param azure.security.attestation.AttestationType attestation_type: :class:`azure.security.attestation.AttestationType` for
151+
:param attestation_type: :class:`azure.security.attestation.AttestationType` for
137152
which to set the policy.
138-
:param str attestation_policy: Attestation policy to be reset.
139-
:keyword azure.security.attestation.AttestationSigningKey signing_key: Signing key to be
153+
:type attestation_type: azure.security.attestation.AttestationType
154+
:param attestation_policy: Attestation policy to be reset.
155+
:type attestation_policy: str
156+
:param signing_key: Signing key to be
140157
used to sign the policy before sending it to the service.
141-
:return azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyResult]: Attestation service response encapsulating a :class:`PolicyResult`.
158+
159+
:type signing_key: azure.security.attestation.AttestationSigningKey
160+
161+
:return: Attestation service response encapsulating a :class:`PolicyResult`.
162+
163+
:rtype: azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyResult]
164+
142165
:raises azure.security.attestation.AttestationTokenValidationException: Raised when an attestation token is invalid.
143166
144167
.. note::
@@ -170,8 +193,9 @@ def get_policy_management_certificates(self, **kwargs):
170193
The list of policy management certificates will only be non-empty if the
171194
attestation service instance is in Isolated mode.
172195
173-
:return azure.security.attestation.AttestationResponse[list[list[bytes]]: Attestation service response
196+
:return: Attestation service response
174197
encapsulating a list of DER encoded X.509 certificate chains.
198+
:rtype: azure.security.attestation.AttestationResponse[list[list[bytes]]]
175199
"""
176200

177201
cert_response = self._client.policy_certificates.get(**kwargs)
@@ -192,16 +216,20 @@ def get_policy_management_certificates(self, **kwargs):
192216

193217
@distributed_trace
194218
def add_policy_management_certificate(self, certificate_to_add, signing_key, **kwargs):
195-
#type:(bytes, AttestationSigningKey, **Any)-> AttestationResponse[PolicyCertificatesModificationResult]
219+
#type:(bytes, AttestationSigningKey, **Any) -> AttestationResponse[PolicyCertificatesModificationResult]
196220
""" Adds a new policy management certificate to the set of policy management certificates for the instance.
197221
198222
:param bytes certificate_to_add: DER encoded X.509 certificate to add to
199223
the list of attestation policy management certificates.
200-
:param azure.security.attestation.AttestationSigningKey signing_key: Signing Key representing one of
224+
:param signing_key: Signing Key representing one of
201225
the *existing* attestation signing certificates.
202-
:return azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyCertificatesModificationResult]: Attestation service response
226+
:type signing_key: azure.security.attestation.AttestationSigningKey
227+
228+
:return: Attestation service response
203229
encapsulating the status of the add request.
204230
231+
:rtype: azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyCertificatesModificationResult]
232+
205233
The :class:`PolicyCertificatesModificationResult` response to the
206234
:meth:`add_policy_management_certificate` API contains two attributes
207235
of interest.
@@ -233,15 +261,17 @@ def add_policy_management_certificate(self, certificate_to_add, signing_key, **k
233261

234262
@distributed_trace
235263
def remove_policy_management_certificate(self, certificate_to_add, signing_key, **kwargs):
236-
#type:(bytes, AttestationSigningKey, **Any)-> AttestationResponse[PolicyCertificatesModificationResult]
264+
#type:(bytes, AttestationSigningKey, **Any) -> AttestationResponse[PolicyCertificatesModificationResult]
237265
""" Removes a new policy management certificate to the set of policy management certificates for the instance.
238266
239267
:param bytes certificate_to_add: DER encoded X.509 certificate to add to
240268
the list of attestation policy management certificates.
241-
:param azure.security.attestation.AttestationSigningKey signing_key: Signing Key representing one of
269+
:param signing_key: Signing Key representing one of
242270
the *existing* attestation signing certificates.
243-
:return azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyCertificatesModificationResult]: Attestation service response
271+
:type signing_key: azure.security.attestation.AttestationSigningKey
272+
:return: Attestation service response
244273
encapsulating a list of DER encoded X.509 certificate chains.
274+
:rtype: azure.security.attestation.AttestationResponse[azure.security.attestation.PolicyCertificatesModificationResult]
245275
246276
The :class:`PolicyCertificatesModificationResult` response to the
247277
:meth:`remove_policy_management_certificate` API contains two attributes

sdk/attestation/azure-security-attestation/azure/security/attestation/_client.py

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@ class AttestationClient(object):
4141
"""An AttestationClient object enables access to the Attestation family of APIs provided
4242
by the attestation service.
4343
44-
:param str base_url: base url of the service
44+
:param str instance_url: base url of the service
4545
:param credential: Credentials for the caller used to interact with the service.
46-
:type credential: ~azure.core.credentials.TokenCredentials
47-
:keyword Pipeline pipeline: If omitted, the standard pipeline is used.
46+
:type credential: :class:`~azure.core.credentials.TokenCredential`
47+
:keyword pipeline: If omitted, the standard pipeline is used.
48+
:paramtype pipeline: Pipeline
49+
:keyword policies: If omitted, the standard pipeline is used.
50+
:paramtype policies: list[HTTPPolicy]
4851
:keyword HttpTransport transport: If omitted, the standard pipeline is used.
49-
:keyword list[HTTPPolicy] policies: If omitted, the standard pipeline is used.
52+
:paramtype transport: HttpTransport
5053
5154
For additional client creation configuration options, please see https://aka.ms/azsdk/python/options.
5255
@@ -59,6 +62,7 @@ def __init__(
5962
**kwargs # type: Any
6063
):
6164
# type: (TokenCredential, str, Any) -> None
65+
6266
if not credential:
6367
raise ValueError("Missing credential.")
6468
self._config = AttestationClientConfiguration(credential, instance_url, **kwargs)
@@ -67,18 +71,23 @@ def __init__(
6771
self._signing_certificates = None
6872

6973
@distributed_trace
70-
def get_openidmetadata(self):
71-
#type:()->Any
74+
def get_openidmetadata(self, **kwargs):
75+
#type:(Dict[str, Any]) -> Any
7276
""" Retrieves the OpenID metadata configuration document for this attestation instance.
77+
78+
:return: OpenID metadata configuration
79+
:rtype: Any
7380
"""
74-
return self._client.metadata_configuration.get()
81+
return self._client.metadata_configuration.get(**kwargs)
7582

7683
@distributed_trace
7784
def get_signing_certificates(self, **kwargs):
78-
# type: (Any) ->list[AttestationSigner]
85+
# type: (Any) -> list[AttestationSigner]
7986
""" Returns the set of signing certificates used to sign attestation tokens.
8087
81-
:return list[azure.security.attestation.AttestationSigner]: A list of :class:`azure.security.attestation.AttestationSigner` objects.
88+
:return: A list of :class:`azure.security.attestation.AttestationSigner` objects.
89+
90+
:rtype: list[azure.security.attestation.AttestationSigner]
8291
8392
For additional request configuration options, please see `Python Request Options <https://aka.ms/azsdk/python/options>`_.
8493
@@ -96,15 +105,21 @@ def attest_sgx_enclave(self, quote, inittime_data=None, runtime_data=None, **kwa
96105
""" Attests the validity of an SGX quote.
97106
98107
:param bytes quote: An SGX quote generated from an Intel(tm) SGX enclave
99-
:keyword azure.security.attestation.AttestationData inittime_data: Data presented at the time that the SGX enclave was initialized.
100-
:keyword azure.security.attestation.AttestationData runtime_data: Data presented at the time that the SGX quote was created.
101-
:keyword str draft_policy: "draft" or "experimental" policy to be used with
108+
:param inittime_data: Data presented at the time that the SGX enclave was initialized.
109+
:type inittime_data: azure.security.attestation.AttestationData
110+
:param runtime_data: Data presented at the time that the SGX quote was created.
111+
:type runtime_data: azure.security.attestation.AttestationData
112+
:keyword draft_policy: "draft" or "experimental" policy to be used with
102113
this attestation request. If this parameter is provided, then this
103114
policy document will be used for the attestation request.
104115
This allows a caller to test various policy documents against actual data
105116
before applying the policy document via the set_policy API
106117
107-
:return azure.security.attestation.AttestationResponse[azure.security.attestation.AttestationResult]: Attestation service response encapsulating an :class:`AttestationResult`.
118+
:paramtype draft_policy: str
119+
120+
:return: Attestation service response encapsulating an :class:`AttestationResult`.
121+
122+
:rtype: azure.security.attestation.AttestationResponse[azure.security.attestation.AttestationResult]
108123
109124
.. note::
110125
Note that if the `draft_policy` parameter is provided, the resulting attestation token will be an unsecured attestation token.
@@ -147,14 +162,21 @@ def attest_open_enclave(self, report, inittime_data=None, runtime_data=None, **k
147162
""" Attests the validity of an Open Enclave report.
148163
149164
:param bytes report: An open_enclave report generated from an Intel(tm) SGX enclave
150-
:keyword azure.security.attestation.AttestationData inittime_data: Data presented at the time that the SGX enclave was initialized.
151-
:keyword azure.security.attestation.AttestationData runtime_data: Data presented at the time that the open_enclave report was created.
152-
:keyword str draft_policy: "draft" or "experimental" policy to be used with
165+
:param inittime_data: Data presented at the time that the SGX enclave was initialized.
166+
:type inittime_data: azure.security.attestation.AttestationData
167+
:param runtime_data: Data presented at the time that the open_enclave report was created.
168+
:type runtime_data: azure.security.attestation.AttestationData
169+
:keyword draft_policy: "draft" or "experimental" policy to be used with
153170
this attestation request. If this parameter is provided, then this
154171
policy document will be used for the attestation request.
155172
This allows a caller to test various policy documents against actual data
156173
before applying the policy document via the set_policy API.
157-
:return azure.security.attestation.AttestationResponse[azure.security.attestation.AttestationResult]: Attestation service response encapsulating an :class:`AttestationResult`.
174+
175+
:paramtype draft_policy: str
176+
177+
:return: Attestation service response encapsulating an :class:`AttestationResult`.
178+
179+
:rtype: azure.security.attestation.AttestationResponse[azure.security.attestation.AttestationResult]
158180
159181
.. admonition:: Example: Simple OpenEnclave attestation.
160182
@@ -208,9 +230,10 @@ def attest_tpm(self, request, **kwargs):
208230
209231
See the `TPM Attestation Protocol Reference <https://docs.microsoft.com/en-us/azure/attestation/virtualization-based-security-protocol>`_ for more information.
210232
211-
:param azure.security.attestation.TpmAttestationRequest request: Incoming request to send to the TPM attestation service.
212-
:returns azure.security.attestation.TpmAttestationResponse: A structure containing the response from the TPM attestation.
213-
233+
:param request: Incoming request to send to the TPM attestation service.
234+
:type request: azure.security.attestation.TpmAttestationRequest
235+
:returns: A structure containing the response from the TPM attestation.
236+
:rtype: azure.security.attestation.TpmAttestationResponse
214237
"""
215238
response = self._client.attestation.attest_tpm(request.data, **kwargs)
216239
return TpmAttestationResponse(response.data)

0 commit comments

Comments
 (0)