Skip to content

Commit 4859cb8

Browse files
mccoypmccoyp
authored
[Key Vault] Updates for next-pylint and next-mypy (#41803)
1 parent a059136 commit 4859cb8

File tree

17 files changed

+109
-154
lines changed

17 files changed

+109
-154
lines changed

‎sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_polling.py‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
import logging
65
from typing import Any, Callable, cast, Optional, Union
76

87
from azure.core.pipeline import PipelineResponse
98
from azure.core.pipeline.transport import HttpTransport
109
from azure.core.polling import PollingMethod
1110
from azure.keyvault.certificates._models import KeyVaultCertificate, CertificateOperation
1211

13-
logger = logging.getLogger(__name__)
14-
1512

1613
class CreateCertificatePoller(PollingMethod):
1714
def __init__(
@@ -32,21 +29,17 @@ def initialize(self, client: Any, initial_response: Any, _: Any) -> None:
3229
self._pending_certificate_op = initial_response
3330

3431
def run(self) -> None:
35-
try:
36-
while not self.finished():
37-
self._update_status()
38-
if not self.finished():
39-
# We should always ask the client's transport to sleep, instead of sleeping directly
40-
transport: HttpTransport = cast(HttpTransport, self._pipeline_response.context.transport)
41-
transport.sleep(self._polling_interval)
42-
operation = self._pending_certificate_op
43-
if operation and operation.status and operation.status.lower() == "completed":
44-
self._resource = self._get_certificate_command()
45-
else:
46-
self._resource = self._pending_certificate_op
47-
except Exception as e:
48-
logger.warning(str(e))
49-
raise
32+
while not self.finished():
33+
self._update_status()
34+
if not self.finished():
35+
# We should always ask the client's transport to sleep, instead of sleeping directly
36+
transport: HttpTransport = cast(HttpTransport, self._pipeline_response.context.transport)
37+
transport.sleep(self._polling_interval)
38+
operation = self._pending_certificate_op
39+
if operation and operation.status and operation.status.lower() == "completed":
40+
self._resource = self._get_certificate_command()
41+
else:
42+
self._resource = self._pending_certificate_op
5043

5144
def finished(self) -> bool:
5245
operation = self._pending_certificate_op

‎sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_polling.py‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
import logging
65
import threading
76
import uuid
87
from typing import Any, Callable, cast, Optional
@@ -15,8 +14,6 @@
1514
from azure.core.tracing.decorator import distributed_trace
1615
from azure.core.tracing.common import with_current_context
1716

18-
logger = logging.getLogger(__name__)
19-
2017

2118
class KeyVaultOperationPoller(LROPoller):
2219
"""Poller for long running operations where calling result() doesn't wait for operation to complete.
@@ -122,16 +119,12 @@ def initialize(self, client: Any, initial_response: Any, deserialization_callbac
122119
pass
123120

124121
def run(self) -> None:
125-
try:
126-
while not self.finished():
127-
self._update_status()
128-
if not self.finished():
129-
# We should always ask the client's transport to sleep, instead of sleeping directly
130-
transport: HttpTransport = cast(HttpTransport, self._pipeline_response.context.transport)
131-
transport.sleep(self._polling_interval)
132-
except Exception as e:
133-
logger.warning(str(e))
134-
raise
122+
while not self.finished():
123+
self._update_status()
124+
if not self.finished():
125+
# We should always ask the client's transport to sleep, instead of sleeping directly
126+
transport: HttpTransport = cast(HttpTransport, self._pipeline_response.context.transport)
127+
transport.sleep(self._polling_interval)
135128

136129
def finished(self) -> bool:
137130
return self._finished

‎sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/_polling_async.py‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
import logging
65
from typing import Any, Callable, cast
76

87
from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
98
from azure.core.pipeline import PipelineResponse
109
from azure.core.pipeline.transport import AsyncHttpTransport
1110
from azure.core.polling import AsyncPollingMethod
1211

13-
logger = logging.getLogger(__name__)
14-
1512

1613
class AsyncDeleteRecoverPollingMethod(AsyncPollingMethod):
1714
"""Poller for deleting resources, and recovering deleted resources, in vaults with soft-delete enabled.
@@ -66,16 +63,12 @@ async def _update_status(self) -> None:
6663
raise
6764

6865
async def run(self) -> None:
69-
try:
70-
while not self.finished():
71-
await self._update_status()
72-
if not self.finished():
73-
# We should always ask the client's transport to sleep, instead of sleeping directly
74-
transport: AsyncHttpTransport = cast(AsyncHttpTransport, self._pipeline_response.context.transport)
75-
await transport.sleep(self._polling_interval)
76-
except Exception as e:
77-
logger.warning(str(e))
78-
raise
66+
while not self.finished():
67+
await self._update_status()
68+
if not self.finished():
69+
# We should always ask the client's transport to sleep, instead of sleeping directly
70+
transport: AsyncHttpTransport = cast(AsyncHttpTransport, self._pipeline_response.context.transport)
71+
await transport.sleep(self._polling_interval)
7972

8073
def finished(self) -> bool:
8174
return self._finished

‎sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/_polling_async.py‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
import logging
65
from typing import Any, Callable, cast, Optional, Union
76

87
from azure.core.pipeline import PipelineResponse
@@ -12,9 +11,6 @@
1211
from .._models import KeyVaultCertificate, CertificateOperation
1312

1413

15-
logger = logging.getLogger(__name__)
16-
17-
1814
class CreateCertificatePollerAsync(AsyncPollingMethod):
1915
def __init__(
2016
self, pipeline_response: PipelineResponse, get_certificate_command: Callable, interval: int = 5
@@ -34,21 +30,17 @@ def initialize(self, client: Any, initial_response: Any, _: Callable) -> None:
3430
self._pending_certificate_op = initial_response
3531

3632
async def run(self) -> None:
37-
try:
38-
while not self.finished():
39-
await self._update_status()
40-
if not self.finished():
41-
# We should always ask the client's transport to sleep, instead of sleeping directly
42-
transport: AsyncHttpTransport = cast(AsyncHttpTransport, self._pipeline_response.context.transport)
43-
await transport.sleep(self._polling_interval)
44-
operation = self._pending_certificate_op
45-
if operation and operation.status and operation.status.lower() == "completed":
46-
self._resource = await self._get_certificate_command()
47-
else:
48-
self._resource = self._pending_certificate_op
49-
except Exception as e:
50-
logger.warning(str(e))
51-
raise
33+
while not self.finished():
34+
await self._update_status()
35+
if not self.finished():
36+
# We should always ask the client's transport to sleep, instead of sleeping directly
37+
transport: AsyncHttpTransport = cast(AsyncHttpTransport, self._pipeline_response.context.transport)
38+
await transport.sleep(self._polling_interval)
39+
operation = self._pending_certificate_op
40+
if operation and operation.status and operation.status.lower() == "completed":
41+
self._resource = await self._get_certificate_command()
42+
else:
43+
self._resource = self._pending_certificate_op
5244

5345
def finished(self) -> bool:
5446
operation = self._pending_certificate_op

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"KeyVaultClientBase",
2121
]
2222

23-
class KeyVaultResourceId():
23+
24+
class KeyVaultResourceId:
2425
"""Represents a Key Vault identifier and its parsed contents.
2526
2627
:param str source_id: The complete identifier received from Key Vault

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_polling.py‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
import logging
65
import threading
76
import uuid
87
from typing import Any, Callable, cast, Optional
@@ -15,8 +14,6 @@
1514
from azure.core.tracing.decorator import distributed_trace
1615
from azure.core.tracing.common import with_current_context
1716

18-
logger = logging.getLogger(__name__)
19-
2017

2118
class KeyVaultOperationPoller(LROPoller):
2219
"""Poller for long running operations where calling result() doesn't wait for operation to complete.
@@ -89,14 +86,15 @@ class DeleteRecoverPollingMethod(PollingMethod):
8986
:param bool finished: Whether or not the polling operation is completed.
9087
:param int interval: The polling interval, in seconds.
9188
"""
89+
9290
def __init__(
93-
self,
94-
pipeline_response: PipelineResponse,
95-
command: Callable,
96-
final_resource: Any,
97-
finished: bool,
98-
interval: int = 2
99-
) -> None:
91+
self,
92+
pipeline_response: PipelineResponse,
93+
command: Callable,
94+
final_resource: Any,
95+
finished: bool,
96+
interval: int = 2,
97+
) -> None:
10098
self._pipeline_response = pipeline_response
10199
self._command = command
102100
self._resource = final_resource
@@ -121,16 +119,12 @@ def initialize(self, client: Any, initial_response: Any, deserialization_callbac
121119
pass
122120

123121
def run(self) -> None:
124-
try:
125-
while not self.finished():
126-
self._update_status()
127-
if not self.finished():
128-
# We should always ask the client's transport to sleep, instead of sleeping directly
129-
transport: HttpTransport = cast(HttpTransport, self._pipeline_response.context.transport)
130-
transport.sleep(self._polling_interval)
131-
except Exception as e:
132-
logger.warning(str(e))
133-
raise
122+
while not self.finished():
123+
self._update_status()
124+
if not self.finished():
125+
# We should always ask the client's transport to sleep, instead of sleeping directly
126+
transport: HttpTransport = cast(HttpTransport, self._pipeline_response.context.transport)
127+
transport.sleep(self._polling_interval)
134128

135129
def finished(self) -> bool:
136130
return self._finished

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_polling_async.py‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
# Copyright (c) Microsoft Corporation.
33
# Licensed under the MIT License.
44
# ------------------------------------
5-
import logging
65
from typing import Any, Callable, cast
76

87
from azure.core.exceptions import ResourceNotFoundError, HttpResponseError
98
from azure.core.pipeline import PipelineResponse
109
from azure.core.pipeline.transport import AsyncHttpTransport
1110
from azure.core.polling import AsyncPollingMethod
1211

13-
logger = logging.getLogger(__name__)
14-
1512

1613
class AsyncDeleteRecoverPollingMethod(AsyncPollingMethod):
1714
"""Poller for deleting resources, and recovering deleted resources, in vaults with soft-delete enabled.
@@ -35,13 +32,13 @@ class AsyncDeleteRecoverPollingMethod(AsyncPollingMethod):
3532
"""
3633

3734
def __init__(
38-
self,
39-
pipeline_response: PipelineResponse,
40-
command: Callable,
41-
final_resource: Any,
42-
finished: bool,
43-
interval: int = 2
44-
) -> None:
35+
self,
36+
pipeline_response: PipelineResponse,
37+
command: Callable,
38+
final_resource: Any,
39+
finished: bool,
40+
interval: int = 2,
41+
) -> None:
4542
self._pipeline_response = pipeline_response
4643
self._command = command
4744
self._resource = final_resource
@@ -66,16 +63,12 @@ async def _update_status(self) -> None:
6663
raise
6764

6865
async def run(self) -> None:
69-
try:
70-
while not self.finished():
71-
await self._update_status()
72-
if not self.finished():
73-
# We should always ask the client's transport to sleep, instead of sleeping directly
74-
transport: AsyncHttpTransport = cast(AsyncHttpTransport, self._pipeline_response.context.transport)
75-
await transport.sleep(self._polling_interval)
76-
except Exception as e:
77-
logger.warning(str(e))
78-
raise
66+
while not self.finished():
67+
await self._update_status()
68+
if not self.finished():
69+
# We should always ask the client's transport to sleep, instead of sleeping directly
70+
transport: AsyncHttpTransport = cast(AsyncHttpTransport, self._pipeline_response.context.transport)
71+
await transport.sleep(self._polling_interval)
7972

8073
def finished(self) -> bool:
8174
return self._finished

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_challenge_auth_policy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ async def await_result(func: Callable[P, Union[T, Awaitable[T]]], *args: P.args,
6666
return result
6767

6868

69+
6970
class AsyncChallengeAuthPolicy(AsyncBearerTokenCredentialPolicy):
7071
"""Policy for handling HTTP authentication challenges.
7172
@@ -184,7 +185,6 @@ async def on_request(self, request: PipelineRequest) -> None:
184185
bodiless_request.headers["Content-Length"] = "0"
185186
request.http_request = bodiless_request
186187

187-
188188
async def on_challenge(self, request: PipelineRequest, response: PipelineResponse) -> bool:
189189
try:
190190
# CAE challenges may not include a scope or tenant; cache from the previous challenge to use if necessary

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def __init__(self, vault_url: str, credential: AsyncTokenCredential, **kwargs: A
6161
authentication_policy=AsyncChallengeAuthPolicy(credential, verify_challenge_resource=verify_challenge),
6262
sdk_moniker=SDK_MONIKER,
6363
http_logging_policy=http_logging_policy,
64-
**kwargs
64+
**kwargs,
6565
)
6666
self._models = _models
6767
except ValueError as exc:

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def __init__(self, vault_url: str, credential: TokenCredential, **kwargs: Any) -
107107
authentication_policy=ChallengeAuthPolicy(credential, verify_challenge_resource=verify_challenge),
108108
sdk_moniker=SDK_MONIKER,
109109
http_logging_policy=http_logging_policy,
110-
**kwargs
110+
**kwargs,
111111
)
112112
self._models = _models
113113
except ValueError as exc:

0 commit comments

Comments
 (0)