[Key Vault] Generate Certificates with TypeSpec (Azure#36903)

Author: mccoyp

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

@@ -9,6 +9,7 @@
 ### Bugs Fixed
 
 ### Other Changes
+- Updated minimum `typing-extensions` version to 4.6.0
 
 ## 4.9.0 (2024-10-17)
 

sdk/keyvault/azure-keyvault-certificates/MANIFEST.in

@@ -1,7 +1,7 @@
 include *.md
 include LICENSE
-include azure/__init__.py
-include azure/keyvault/__init__.py
-recursive-include samples *.py
-recursive-include tests *.py
 include azure/keyvault/certificates/py.typed
+recursive-include tests *.py
+recursive-include samples *.py *.md
+include azure/__init__.py
+include azure/keyvault/__init__.py

sdk/keyvault/azure-keyvault-certificates/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/keyvault/azure-keyvault-certificates",
-  "Tag": "python/keyvault/azure-keyvault-certificates_1cf731dd01"
+  "Tag": "python/keyvault/azure-keyvault-certificates_9d117c2e38"
 }

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_client.py

@@ -117,7 +117,6 @@ def begin_create_certificate(
         )
 
         pipeline_response, cert_bundle = self._client.create_certificate(
-            vault_base_url=self.vault_url,
             certificate_name=certificate_name,
             parameters=parameters,
             cls=lambda pipeline_response, deserialized, _: (pipeline_response, deserialized),
@@ -165,7 +164,7 @@ def get_certificate(self, certificate_name: str, **kwargs: Any) -> KeyVaultCerti
                 :dedent: 8
         """
         bundle = self._client.get_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, certificate_version="", **kwargs
+            certificate_name=certificate_name, certificate_version="", **kwargs
         )
         return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
 
@@ -194,7 +193,7 @@ def get_certificate_version(self, certificate_name: str, version: str, **kwargs:
                 :dedent: 8
         """
         bundle = self._client.get_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, certificate_version=version, **kwargs
+            certificate_name=certificate_name, certificate_version=version, **kwargs
         )
         return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
 
@@ -230,7 +229,6 @@ def begin_delete_certificate(self, certificate_name: str, **kwargs: Any) -> LROP
         if polling_interval is None:
             polling_interval = 2
         pipeline_response, deleted_cert_bundle = self._client.delete_certificate(
-            vault_base_url=self.vault_url,
             certificate_name=certificate_name,
             cls=lambda pipeline_response, deserialized, _: (pipeline_response, deserialized),
             **kwargs,
@@ -272,7 +270,7 @@ def get_deleted_certificate(self, certificate_name: str, **kwargs: Any) -> Delet
                 :dedent: 8
         """
         bundle = self._client.get_deleted_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
+            certificate_name=certificate_name, **kwargs
         )
         return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)
 
@@ -294,7 +292,7 @@ def purge_deleted_certificate(self, certificate_name: str, **kwargs: Any) -> Non
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         self._client.purge_deleted_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
+            certificate_name=certificate_name, **kwargs
         )
 
     @distributed_trace
@@ -329,7 +327,6 @@ def begin_recover_deleted_certificate(self, certificate_name: str, **kwargs: Any
             polling_interval = 2
 
         pipeline_response, recovered_cert_bundle = self._client.recover_deleted_certificate(
-            vault_base_url=self.vault_url,
             certificate_name=certificate_name,
             cls=lambda pipeline_response, deserialized, _: (pipeline_response, deserialized),
             **kwargs,
@@ -401,7 +398,7 @@ def import_certificate(
         )
 
         bundle = self._client.import_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, parameters=parameters, **kwargs
+            certificate_name=certificate_name, parameters=parameters, **kwargs
         )
         return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
 
@@ -419,7 +416,7 @@ def get_certificate_policy(self, certificate_name: str, **kwargs: Any) -> Certif
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         bundle = self._client.get_certificate_policy(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
+            certificate_name=certificate_name, **kwargs
         )
         return CertificatePolicy._from_certificate_policy_bundle(certificate_policy_bundle=bundle)
 
@@ -441,7 +438,6 @@ def update_certificate_policy(
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         bundle = self._client.update_certificate_policy(
-            vault_base_url=self.vault_url,
             certificate_name=certificate_name,
             certificate_policy=policy._to_certificate_policy_bundle(),
             **kwargs
@@ -491,7 +487,6 @@ def update_certificate_properties(
         )
 
         bundle = self._client.update_certificate(
-            vault_base_url=self.vault_url,
             certificate_name=certificate_name,
             certificate_version=version or "",
             parameters=parameters,
@@ -525,7 +520,7 @@ def backup_certificate(self, certificate_name: str, **kwargs: Any) -> bytes:
                 :dedent: 8
         """
         backup_result = self._client.backup_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
+            certificate_name=certificate_name, **kwargs
         )
         return backup_result.value
 
@@ -553,7 +548,6 @@ def restore_certificate_backup(self, backup: bytes, **kwargs: Any) -> KeyVaultCe
                 :dedent: 8
         """
         bundle = self._client.restore_certificate(
-            vault_base_url=self.vault_url,
             parameters=self._models.CertificateRestoreParameters(certificate_bundle_backup=backup),
             **kwargs
         )
@@ -597,7 +591,6 @@ def list_deleted_certificates(
             kwargs.update({"include_pending": include_pending})
 
         return self._client.get_deleted_certificates(
-            vault_base_url=self._vault_url,
             maxresults=max_page_size,
             cls=lambda objs: [
                 DeletedCertificate._from_deleted_certificate_item(deleted_certificate_item=x) for x in objs
@@ -642,7 +635,6 @@ def list_properties_of_certificates(
             kwargs.update({"include_pending": include_pending})
 
         return self._client.get_certificates(
-            vault_base_url=self._vault_url,
             maxresults=max_page_size,
             cls=lambda objs: [CertificateProperties._from_certificate_item(certificate_item=x) for x in objs],
             **kwargs
@@ -673,7 +665,6 @@ def list_properties_of_certificate_versions(
         """
         max_page_size = kwargs.pop("max_page_size", None)
         return self._client.get_certificate_versions(
-            vault_base_url=self._vault_url,
             certificate_name=certificate_name,
             maxresults=max_page_size,
             cls=lambda objs: [CertificateProperties._from_certificate_item(certificate_item=x) for x in objs],
@@ -701,7 +692,6 @@ def set_contacts(self, contacts: "List[CertificateContact]", **kwargs: Any) -> "
                 :dedent: 8
         """
         new_contacts = self._client.set_certificate_contacts(
-            vault_base_url=self.vault_url,
             contacts=self._models.Contacts(contact_list=[c._to_certificate_contacts_item() for c in contacts]),
             **kwargs
         )
@@ -726,7 +716,7 @@ def get_contacts(self, **kwargs: Any) -> "List[CertificateContact]":
                 :caption: Get contacts
                 :dedent: 8
         """
-        contacts = self._client.get_certificate_contacts(vault_base_url=self._vault_url, **kwargs)
+        contacts = self._client.get_certificate_contacts(**kwargs)
         return [CertificateContact._from_certificate_contacts_item(contact_item=item) for item in contacts.contact_list]
 
     @distributed_trace
@@ -746,7 +736,7 @@ def delete_contacts(self, **kwargs: Any) -> "List[CertificateContact]":
                 :caption: Delete contacts
                 :dedent: 8
         """
-        contacts = self._client.delete_certificate_contacts(vault_base_url=self.vault_url, **kwargs)
+        contacts = self._client.delete_certificate_contacts(**kwargs)
         return [CertificateContact._from_certificate_contacts_item(contact_item=item) for item in contacts.contact_list]
 
     @distributed_trace
@@ -763,7 +753,7 @@ def get_certificate_operation(self, certificate_name: str, **kwargs: Any) -> Cer
         """
 
         bundle = self._client.get_certificate_operation(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
+            certificate_name=certificate_name, **kwargs
         )
         return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
 
@@ -781,7 +771,7 @@ def delete_certificate_operation(self, certificate_name: str, **kwargs: Any) ->
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         bundle = self._client.delete_certificate_operation(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
+            certificate_name=certificate_name, **kwargs
         )
         return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
 
@@ -797,7 +787,6 @@ def cancel_certificate_operation(self, certificate_name: str, **kwargs: Any) ->
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         bundle = self._client.update_certificate_operation(
-            vault_base_url=self.vault_url,
             certificate_name=certificate_name,
             certificate_operation=self._models.CertificateOperationUpdateParameter(cancellation_requested=True),
             **kwargs
@@ -846,7 +835,7 @@ def merge_certificate(
         )
 
         bundle = self._client.merge_certificate(
-            vault_base_url=self.vault_url, certificate_name=certificate_name, parameters=parameters, **kwargs
+            certificate_name=certificate_name, parameters=parameters, **kwargs
         )
         return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
 
@@ -871,7 +860,7 @@ def get_issuer(self, issuer_name: str, **kwargs: Any) -> CertificateIssuer:
                 :dedent: 8
         """
         issuer_bundle = self._client.get_certificate_issuer(
-            vault_base_url=self.vault_url, issuer_name=issuer_name, **kwargs
+            issuer_name=issuer_name, **kwargs
         )
         return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
 
@@ -948,7 +937,7 @@ def create_issuer(
         )
 
         issuer_bundle = self._client.set_certificate_issuer(
-            vault_base_url=self.vault_url, issuer_name=issuer_name, parameter=parameters, **kwargs
+            issuer_name=issuer_name, parameter=parameters, **kwargs
         )
         return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
 
@@ -1016,7 +1005,7 @@ def update_issuer(
         )
 
         issuer_bundle = self._client.update_certificate_issuer(
-            vault_base_url=self.vault_url, issuer_name=issuer_name, parameter=parameters, **kwargs
+            issuer_name=issuer_name, parameter=parameters, **kwargs
         )
         return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
 
@@ -1042,7 +1031,7 @@ def delete_issuer(self, issuer_name: str, **kwargs: Any) -> CertificateIssuer:
                 :dedent: 8
         """
         issuer_bundle = self._client.delete_certificate_issuer(
-            vault_base_url=self.vault_url, issuer_name=issuer_name, **kwargs
+            issuer_name=issuer_name, **kwargs
         )
         return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
 
@@ -1067,7 +1056,6 @@ def list_properties_of_issuers(self, **kwargs: Any) -> ItemPaged[IssuerPropertie
         """
         max_page_size = kwargs.pop("max_page_size", None)
         return self._client.get_certificate_issuers(
-            vault_base_url=self.vault_url,
             maxresults=max_page_size,
             cls=lambda objs: [IssuerProperties._from_issuer_item(issuer_item=x) for x in objs],
             **kwargs

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/__init__.py

@@ -2,22 +2,31 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
+# pylint: disable=wrong-import-position
 
-from ._client import KeyVaultClient
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._patch import *  # pylint: disable=unused-wildcard-import
+
+from ._client import KeyVaultClient  # type: ignore
+from ._version import VERSION
+
+__version__ = VERSION
 
 try:
     from ._patch import __all__ as _patch_all
-    from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import *
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk
 
 __all__ = [
     "KeyVaultClient",
 ]
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])  # pyright: ignore
 
 _patch_sdk()

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_generated/_client.py

@@ -2,35 +2,42 @@
 # --------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
-# Code generated by Microsoft (R) AutoRest Code Generator.
+# Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
 from copy import deepcopy
-from typing import Any
+from typing import Any, TYPE_CHECKING
+from typing_extensions import Self
 
 from azure.core import PipelineClient
 from azure.core.pipeline import policies
 from azure.core.rest import HttpRequest, HttpResponse
 
-from . import models as _models
 from ._configuration import KeyVaultClientConfiguration
 from ._operations import KeyVaultClientOperationsMixin
 from ._serialization import Deserializer, Serializer
 
+if TYPE_CHECKING:
+    from azure.core.credentials import TokenCredential
 
-class KeyVaultClient(KeyVaultClientOperationsMixin):  # pylint: disable=client-accepts-api-version-keyword
+
+class KeyVaultClient(KeyVaultClientOperationsMixin):
     """The key vault client performs cryptographic key operations and vault operations against the Key
     Vault service.
 
-    :keyword api_version: Api Version. Default value is "7.5". Note that overriding this default
-     value may result in unsupported behavior.
+    :param vault_base_url: Required.
+    :type vault_base_url: str
+    :param credential: Credential used to authenticate requests to the service. Required.
+    :type credential: ~azure.core.credentials.TokenCredential
+    :keyword api_version: The API version to use for this operation. Default value is
+     "7.6-preview.2". Note that overriding this default value may result in unsupported behavior.
     :paramtype api_version: str
     """
 
-    def __init__(self, **kwargs: Any) -> None:  # pylint: disable=missing-client-constructor-parameter-credential
+    def __init__(self, vault_base_url: str, credential: "TokenCredential", **kwargs: Any) -> None:
         _endpoint = "{vaultBaseUrl}"
-        self._config = KeyVaultClientConfiguration(**kwargs)
+        self._config = KeyVaultClientConfiguration(vault_base_url=vault_base_url, credential=credential, **kwargs)
         _policies = kwargs.pop("policies", None)
         if _policies is None:
             _policies = [
@@ -50,10 +57,8 @@ def __init__(self, **kwargs: Any) -> None:  # pylint: disable=missing-client-con
             ]
         self._client: PipelineClient = PipelineClient(base_url=_endpoint, policies=_policies, **kwargs)
 
-        client_models = {k: v for k, v in _models._models.__dict__.items() if isinstance(v, type)}
-        client_models.update({k: v for k, v in _models.__dict__.items() if isinstance(v, type)})
-        self._serialize = Serializer(client_models)
-        self._deserialize = Deserializer(client_models)
+        self._serialize = Serializer()
+        self._deserialize = Deserializer()
         self._serialize.client_side_validation = False
 
     def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
@@ -75,13 +80,19 @@ def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
         """
 
         request_copy = deepcopy(request)
-        request_copy.url = self._client.format_url(request_copy.url)
+        path_format_arguments = {
+            "vaultBaseUrl": self._serialize.url(
+                "self._config.vault_base_url", self._config.vault_base_url, "str", skip_quote=True
+            ),
+        }
+
+        request_copy.url = self._client.format_url(request_copy.url, **path_format_arguments)
         return self._client.send_request(request_copy, stream=stream, **kwargs)  # type: ignore
 
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> "KeyVaultClient":
+    def __enter__(self) -> Self:
         self._client.__enter__()
         return self