got rid of not before and expires

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/client.py

@@ -45,8 +45,6 @@ async def create_certificate(
         name: str,
         policy: CertificatePolicy,
         enabled: Optional[bool] = None,
-        not_before: Optional[datetime] = None,
-        expires: Optional[datetime] = None,
         tags: Optional[Dict[str, str]] = None,
         **kwargs: Mapping[str, Any]
     ) -> CertificateOperation:
@@ -62,10 +60,6 @@ async def create_certificate(
          ~azure.security.keyvault.certificates._models.CertificatePolicy
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param tags: Application specific metadata in the form of key-value pairs.
         :type tags: dict(str, str)
         :returns: The created CertificateOperation
@@ -81,11 +75,9 @@ async def create_certificate(
                 :caption: Create a certificate
                 :dedent: 8
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled,
-                not_before=not_before,
-                expires=expires
+                enabled=enabled
             )
         else:
             attributes = None
@@ -259,8 +251,6 @@ async def import_certificate(
         password: Optional[str] = None,
         policy: Optional[CertificatePolicy] = None,
         enabled: Optional[bool] = None,
-        not_before: Optional[datetime] = None,
-        expires: Optional[datetime] = None,
         tags: Optional[Dict[str, str]] = None,
         **kwargs: Mapping[str, Any]
         ) -> Certificate:
@@ -285,19 +275,15 @@ async def import_certificate(
          ~azure.security.keyvault.v7_0.models.CertificatePolicy
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param tags: Application specific metadata in the form of key-value
          pairs.
         :type tags: dict[str, str]
         :returns: The imported Certificate
         :rtype: ~azure.security.keyvault.certificates._models.Certificate
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled, not_before=not_before, expires=expires
+                enabled=enabled
             )
         else:
             attributes = None
@@ -369,8 +355,6 @@ async def update_certificate(
         self,
         name: str,
         version: Optional[str] = None,
-        not_before: Optional[datetime] = None,
-        expires: Optional[datetime] = None,
         enabled: Optional[bool] = None,
         tags: Optional[Dict[str, str]] = None,
         **kwargs: Mapping[str, Any]
@@ -386,10 +370,6 @@ async def update_certificate(
         :type name: str
         :param version: The version of the certificate.
         :type version: str
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
         :param tags: Application specific metadata in the form of key-value pairs.
@@ -407,9 +387,9 @@ async def update_certificate(
                 :caption: Update a certificate's attributes
                 :dedent: 8
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled, not_before=not_before, expires=expires
+                enabled=enabled
             )
         else:
             attributes = None
@@ -780,8 +760,6 @@ async def merge_certificate(
         name: str,
         x509_certificates: List[bytearray],
         enabled: Optional[bool] = None,
-        not_before: Optional[datetime] = None,
-        expires: Optional[datetime] = None,
         tags: Optional[Dict[str, str]] = None,
         **kwargs: Mapping[str, Any]
     ) -> Certificate:
@@ -796,20 +774,16 @@ async def merge_certificate(
         :type x509_certificates: list[bytearray]
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param tags: Application specific metadata in the form of key-value pairs.
         :type tags: dict[str, str]
         :return: The merged certificate operation
         :rtype: ~azure.security.keyvault.certificates._models.CertificateOperation
         :raises:
          :class:`KeyVaultErrorException<azure.keyvault.v7_0.models.KeyVaultErrorException>`
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled, not_before=not_before, expires=expires
+                enabled=enabled
             )
         else:
             attributes = None

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

@@ -7,7 +7,6 @@
 import base64
 import uuid
 from typing import Any, Dict, List, Mapping, Optional, Iterable
-from datetime import datetime
 from azure.core.exceptions import ResourceExistsError, ResourceNotFoundError
 from azure.core.tracing.decorator import distributed_trace
 
@@ -45,8 +44,6 @@ def create_certificate(
             name,  # type: str
             policy,  # type: CertificatePolicy
             enabled=None,  # type: Optional[bool]
-            not_before=None,  # type: Optional[datetime]
-            expires=None, # type: Optional[datetime]
             tags=None,  # type: Optional[Dict[str, str]]
             **kwargs  # type: Mapping[str, Any]
     ):
@@ -62,10 +59,6 @@ def create_certificate(
         :type policy:
          ~azure.security.keyvault.certificates._models.CertificatePolicy
         :param bool enabled: Determines whether the object is enabled.
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param tags: Application specific metadata in the form of key-value pairs.
         :type tags: dict(str, str)
         :returns: The created CertificateOperation
@@ -82,11 +75,9 @@ def create_certificate(
                 :dedent: 8
         """
 
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled,
-                not_before=not_before,
-                expires=expires
+                enabled=enabled
             )
         else:
             attributes = None
@@ -260,8 +251,6 @@ def import_certificate(
             password=None,  # type: Optional[str]
             policy=None,  # type: Optional[CertificatePolicy]
             enabled=None,  # type: Optional[bool]
-            not_before=None,  # type: Optional[datetime]
-            expires=None,  # type: Optional[datetime]
             tags=None,  # type: Optional[Dict[str, str]]
             **kwargs  # type: Mapping[str, Any]
     ):
@@ -287,19 +276,15 @@ def import_certificate(
          ~azure.security.keyvault.v7_0.models.CertificatePolicy
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param tags: Application specific metadata in the form of key-value
          pairs.
         :type tags: dict[str, str]
         :returns: The imported Certificate
         :rtype: ~azure.security.keyvault.certificates._models.Certificate
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled, not_before=not_before, expires=expires
+                enabled=enabled
             )
         else:
             attributes = None
@@ -364,8 +349,6 @@ def update_certificate(
             self,
             name,  # type: str
             version=None,   # type: Optional[str]
-            not_before=None,  # type: Optional[datetime]
-            expires=None,  # type: Optional[datetime]
             enabled=None,  # type: Optional[bool]
             tags=None,  # type: Optional[Dict[str, str]]
             **kwargs  # type: Mapping[str, Any]
@@ -382,10 +365,6 @@ def update_certificate(
         :type name: str
         :param version: The version of the certificate.
         :type version: str
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
         :param tags: Application specific metadata in the form of key-value pairs.
@@ -403,9 +382,9 @@ def update_certificate(
                 :caption: Update a certificate's attributes
                 :dedent: 8
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None :
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled, not_before=not_before, expires=expires
+                enabled=enabled
             )
         else:
             attributes = None
@@ -711,8 +690,6 @@ def merge_certificate(
         name,  # type: str
         x509_certificates,  # type: List[bytearray]
         enabled=None,  # type: Optional[bool]
-        not_before=None,  # type: Optional[datetime]
-        expires=None,  # type: Optional[datetime]
         tags=None,  # type: Optional[Dict[str, str]]
         **kwargs  # type: Mapping[str, Any]
     ):
@@ -728,20 +705,16 @@ def merge_certificate(
         :type x509_certificates: list[bytearray]
         :param enabled: Determines whether the object is enabled.
         :type enabled: bool
-        :param not_before: Not before date of the secret in UTC
-        :type not_before: datetime.datetime
-        :param expires: Expiry date of the secret  in UTC.
-        :type expires: datetime.datetime
         :param tags: Application specific metadata in the form of key-value pairs.
         :type tags: dict[str, str]
         :return: The merged certificate
         :rtype: ~azure.security.keyvault.certificates._models.Certificate
         :raises:
          :class:`KeyVaultErrorException<azure.keyvault.v7_0.models.KeyVaultErrorException>`
         """
-        if enabled is not None or not_before is not None or expires is not None:
+        if enabled is not None:
             attributes = self._client.models.CertificateAttributes(
-                enabled=enabled, not_before=not_before, expires=expires
+                enabled=enabled
             )
         else:
             attributes = None

sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates.py

@@ -37,7 +37,6 @@ def test_example_certificate_crud_operations(self, vault_client, **kwargs):
 
         certificate_client = vault_client.certificates
         # [START create_certificate]
-        from dateutil import parser as date_parse
         from azure.keyvault.certificates import CertificatePolicy, KeyProperties
         import time
         # specify the certificate policy
@@ -52,11 +51,8 @@ def test_example_certificate_crud_operations(self, vault_client, **kwargs):
                                         validity_in_months=24
                                         )
 
-        expires = date_parse.parse("2050-02-02T08:00:00.000Z")
-
         # create a certificate with optional arguments, returns a certificate operation that is creating the certificate
-        certificate_operation = certificate_client.create_certificate(name="cert-name", policy=cert_policy,
-                                                                      expires=expires)
+        certificate_operation = certificate_client.create_certificate(name="cert-name", policy=cert_policy)
 
         print(certificate_operation.name)
         print(certificate_operation.id)
@@ -81,7 +77,6 @@ def test_example_certificate_crud_operations(self, vault_client, **kwargs):
 
         print(certificate.id)
         print(certificate.name)
-        print(certificate.expires)
         print(certificate.policy.key_properties.exportable)
         print(certificate.policy.key_properties.key_type)
         print(certificate.policy.key_properties.key_size)
@@ -96,13 +91,11 @@ def test_example_certificate_crud_operations(self, vault_client, **kwargs):
         # [START update_certificate]
 
         # update attributes of an existing certificate
-        expires = date_parse.parse("2050-01-02T08:00:00.000Z")
         tags = {"foo": "updated tag"}
-        updated_certificate = certificate_client.update_certificate(name=certificate.name, expires=expires, tags=tags)
+        updated_certificate = certificate_client.update_certificate(name=certificate.name, tags=tags)
 
         print(updated_certificate.version)
         print(updated_certificate.updated)
-        print(updated_certificate.expires)
         print(updated_certificate.tags)
 
         # [END update_certificate]

sdk/keyvault/azure-keyvault-certificates/tests/test_examples_certificates_async.py

@@ -35,7 +35,6 @@ async def test_example_certificate_crud_operations(self, vault_client, **kwargs)
         import asyncio
         certificate_client = vault_client.certificates
         # [START create_certificate]
-        from dateutil import parser as date_parse
         from azure.keyvault.certificates import CertificatePolicy, KeyProperties
         # specify the certificate policy
         cert_policy = CertificatePolicy(key_properties=KeyProperties(exportable=True,
@@ -49,10 +48,8 @@ async def test_example_certificate_crud_operations(self, vault_client, **kwargs)
                                         validity_in_months=24
                                         )
 
-        expires = date_parse.parse("2050-02-02T08:00:00.000Z")
-
         # create a certificate with optional arguments, returns a certificate operation that is creating the certificate
-        certificate_operation = await certificate_client.create_certificate(name="cert-name", policy=cert_policy, expires=expires)
+        certificate_operation = await certificate_client.create_certificate(name="cert-name", policy=cert_policy)
 
         print(certificate_operation.name)
         print(certificate_operation.id)
@@ -78,7 +75,6 @@ async def test_example_certificate_crud_operations(self, vault_client, **kwargs)
 
         print(certificate.id)
         print(certificate.name)
-        print(certificate.expires)
         print(certificate.policy.key_properties.exportable)
         print(certificate.policy.key_properties.key_type)
         print(certificate.policy.key_properties.key_size)
@@ -93,13 +89,11 @@ async def test_example_certificate_crud_operations(self, vault_client, **kwargs)
         # [START update_certificate]
 
         # update attributes of an existing certificate
-        expires = date_parse.parse("2050-01-02T08:00:00.000Z")
         tags = {"foo": "updated tag"}
-        updated_certificate = await certificate_client.update_certificate(certificate.name, expires=expires, tags=tags)
+        updated_certificate = await certificate_client.update_certificate(certificate.name, tags=tags)
 
         print(updated_certificate.version)
         print(updated_certificate.updated)
-        print(updated_certificate.expires)
         print(updated_certificate.tags)
 
         # [END update_certificate]
@@ -162,7 +156,6 @@ async def test_example_certificate_list_operations(self, vault_client, **kwargs)
             print(certificate.id)
             print(certificate.updated)
             print(certificate.version)
-            print(certificate.expires)
 
         # [END list_certificate_versions]
         # [START list_deleted_certificates]