[Key Vault] Reintroduce activation skipping in security domain upload (Azure#40944)

Author: mccoyp

sdk/keyvault/azure-keyvault-securitydomain/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0b1 (2025-05-06)
+## 1.0.0b1 (2025-05-07)
 
 ### Features Added
 

sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/__init__.py

@@ -9,6 +9,7 @@
 from .async_polling import (
     AsyncSecurityDomainDownloadNoPolling,
     AsyncSecurityDomainDownloadPollingMethod,
+    AsyncSecurityDomainUploadNoPolling,
     AsyncSecurityDomainUploadPollingMethod,
 )
 from .challenge_auth_policy import ChallengeAuthPolicy
@@ -18,6 +19,7 @@
     SecurityDomainDownloadNoPolling,
     SecurityDomainDownloadPolling,
     SecurityDomainDownloadPollingMethod,
+    SecurityDomainUploadNoPolling,
     SecurityDomainUploadPolling,
     SecurityDomainUploadPollingMethod,
 )
@@ -27,13 +29,15 @@
 __all__ = [
     "AsyncSecurityDomainDownloadNoPolling",
     "AsyncSecurityDomainDownloadPollingMethod",
+    "AsyncSecurityDomainUploadNoPolling",
     "AsyncSecurityDomainUploadPollingMethod",
     "ChallengeAuthPolicy",
     "HttpChallenge",
     "HttpChallengeCache",
     "SecurityDomainDownloadNoPolling",
     "SecurityDomainDownloadPolling",
     "SecurityDomainDownloadPollingMethod",
+    "SecurityDomainUploadNoPolling",
     "SecurityDomainUploadPolling",
     "SecurityDomainUploadPollingMethod",
 ]

sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/async_polling.py

@@ -158,3 +158,6 @@ def resource(self) -> None:
         :return: The built resource.
         """
         return None
+
+class AsyncSecurityDomainUploadNoPolling(AsyncSecurityDomainUploadPollingMethod, AsyncNoPollingMixin):
+    pass

sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_internal/polling.py

@@ -198,3 +198,6 @@ def resource(self) -> None:
         :return: The built resource.
         """
         return None
+
+class SecurityDomainUploadNoPolling(SecurityDomainUploadPollingMethod, NoPollingMixin):
+    pass

sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/_patch.py

@@ -25,6 +25,7 @@
     SecurityDomainDownloadNoPolling,
     SecurityDomainDownloadPolling,
     SecurityDomainDownloadPollingMethod,
+    SecurityDomainUploadNoPolling,
     SecurityDomainUploadPolling,
     SecurityDomainUploadPollingMethod,
 )
@@ -178,7 +179,7 @@ def begin_download(
         delay = kwargs.pop("polling_interval", self._config.polling_interval)
         polling_method = (
             SecurityDomainDownloadNoPolling()
-            if skip_activation_polling is True
+            if skip_activation_polling
             else SecurityDomainDownloadPollingMethod(lro_algorithms=[SecurityDomainDownloadPolling()], timeout=delay)
         )
         return super()._begin_download(  # type: ignore[return-value]
@@ -195,6 +196,7 @@ def begin_upload(
         security_domain: SecurityDomain,
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> LROPoller[None]: ...
 
@@ -205,6 +207,7 @@ def begin_upload(
         security_domain: JSON,
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> LROPoller[None]: ...
 
@@ -215,6 +218,7 @@ def begin_upload(
         security_domain: IO[bytes],
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> LROPoller[None]: ...
 
@@ -224,6 +228,7 @@ def begin_upload(
         security_domain: Union[SecurityDomain, JSON, IO[bytes]],
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> LROPoller[None]:
         """Restore the provided Security Domain.
@@ -234,14 +239,19 @@ def begin_upload(
          IO[bytes]
         :keyword str content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
+        :keyword bool skip_activation_polling: If set to True, the operation will not poll for HSM activation to
+         complete and calling `.result()` on the poller will return None immediately, or raise an exception in case of
+         an error. Default value is False.
 
         :return: An instance of LROPoller that returns None.
         :rtype: ~azure.core.polling.LROPoller[None]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         delay = kwargs.pop("polling_interval", self._config.polling_interval)
-        polling_method = SecurityDomainUploadPollingMethod(
-            lro_algorithms=[SecurityDomainUploadPolling()], timeout=delay
+        polling_method = (
+            SecurityDomainUploadNoPolling()
+            if skip_activation_polling
+            else SecurityDomainUploadPollingMethod(lro_algorithms=[SecurityDomainUploadPolling()], timeout=delay)
         )
         return super()._begin_upload(  # type: ignore[return-value]
             security_domain,

sdk/keyvault/azure-keyvault-securitydomain/azure/keyvault/securitydomain/aio/_patch.py

@@ -20,6 +20,7 @@
     AsyncChallengeAuthPolicy,
     AsyncSecurityDomainDownloadNoPolling,
     AsyncSecurityDomainDownloadPollingMethod,
+    AsyncSecurityDomainUploadNoPolling,
     AsyncSecurityDomainUploadPollingMethod,
     SecurityDomainDownloadPolling,
     SecurityDomainUploadPolling,
@@ -136,7 +137,7 @@ async def begin_download(
         delay = kwargs.pop("polling_interval", self._config.polling_interval)
         polling_method = (
             AsyncSecurityDomainDownloadNoPolling()
-            if skip_activation_polling is True
+            if skip_activation_polling
             else AsyncSecurityDomainDownloadPollingMethod(
                 lro_algorithms=[SecurityDomainDownloadPolling()], timeout=delay
             )
@@ -155,6 +156,7 @@ async def begin_upload(
         security_domain: SecurityDomain,
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> AsyncLROPoller[None]: ...
 
@@ -165,6 +167,7 @@ async def begin_upload(
         security_domain: JSON,
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> AsyncLROPoller[None]: ...
 
@@ -175,6 +178,7 @@ async def begin_upload(
         security_domain: IO[bytes],
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> AsyncLROPoller[None]: ...
 
@@ -184,6 +188,7 @@ async def begin_upload(
         security_domain: Union[SecurityDomain, JSON, IO[bytes]],
         *,
         content_type: str = "application/json",
+        skip_activation_polling: bool = False,
         **kwargs: Any,
     ) -> AsyncLROPoller[None]:
         """Restore the provided Security Domain.
@@ -194,14 +199,19 @@ async def begin_upload(
          IO[bytes]
         :keyword str content_type: Body Parameter content-type. Content type parameter for JSON body.
          Default value is "application/json".
+        :keyword bool skip_activation_polling: If set to True, the operation will not poll for HSM activation to
+         complete and calling `.result()` on the poller will return None immediately, or raise an exception in case of
+         an error. Default value is False.
 
         :return: An instance of AsyncLROPoller that returns None.
         :rtype: ~azure.core.polling.AsyncLROPoller[None]
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         delay = kwargs.pop("polling_interval", self._config.polling_interval)
-        polling_method = AsyncSecurityDomainUploadPollingMethod(
-            lro_algorithms=[SecurityDomainUploadPolling()], timeout=delay
+        polling_method = (
+            AsyncSecurityDomainUploadNoPolling()
+            if skip_activation_polling
+            else AsyncSecurityDomainUploadPollingMethod(lro_algorithms=[SecurityDomainUploadPolling()], timeout=delay)
         )
         return await super()._begin_upload(  # type: ignore[return-value]
             security_domain,