Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Regenerate KV with latest Autorest + Paging branch (#6479)
* Regenerate KV with latest Autorest + Paging branch

* Remove unused import in tests

* Make the async adapter more generic

* Regeneration after operation mixin fix in Autorest

* COmmit changes forgotten in #6418
  • Loading branch information
lmazuel authored Jul 24, 2019
commit 8e3ebf4380fce1da9f2775e5d62e4f7333289564
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
# regenerated.
# --------------------------------------------------------------------------

from ._configuration import KeyVaultClientConfiguration
from ._key_vault_client import KeyVaultClient
__all__ = ['KeyVaultClient', 'KeyVaultClientConfiguration']
__all__ = ['KeyVaultClient']

from .version import VERSION

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def __init__(self, credentials, **kwargs):

self.user_agent_policy.add_user_agent('azsdk-python-azure-keyvault/{}'.format(VERSION))
self.generate_client_request_id = True
self.accept_language = None

self.credentials = credentials

Expand All @@ -45,4 +44,5 @@ def _configure(self, **kwargs):
self.proxy_policy = policies.ProxyPolicy(**kwargs)
self.logging_policy = policies.NetworkTraceLoggingPolicy(**kwargs)
self.retry_policy = policies.RetryPolicy(**kwargs)
self.custom_hook_policy = policies.CustomHookPolicy(**kwargs)
self.redirect_policy = policies.RedirectPolicy(**kwargs)
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class KeyVaultClient(KeyVaultClientOperationsMixin):
"""

def __init__(
self, credentials, config=None, **kwargs):
self, credentials, **kwargs):

base_url = '{vaultBaseUrl}'
self._config = config or KeyVaultClientConfiguration(credentials, **kwargs)
self._config = KeyVaultClientConfiguration(credentials, **kwargs)
self._client = PipelineClient(base_url=base_url, config=self._config, **kwargs)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@
# --------------------------------------------------------------------------

from ._key_vault_client_async import KeyVaultClient
from ._configuration_async import KeyVaultClientConfiguration
__all__ = ['KeyVaultClient', 'KeyVaultClientConfiguration']
__all__ = ['KeyVaultClient']
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def __init__(self, credentials, **kwargs):

self.user_agent_policy.add_user_agent('azsdk-python-azure-keyvault/{}'.format(VERSION))
self.generate_client_request_id = True
self.accept_language = None

self.credentials = credentials

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class KeyVaultClient(KeyVaultClientOperationsMixin):
"""

def __init__(
self, credentials, config=None, **kwargs):
self, credentials, **kwargs):

base_url = '{vaultBaseUrl}'
self._config = config or KeyVaultClientConfiguration(credentials, **kwargs)
self._config = KeyVaultClientConfiguration(credentials, **kwargs)
self._client = AsyncPipelineClient(base_url=base_url, config=self._config, **kwargs)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
from ._models_py3 import CertificateCreateParameters
from ._models_py3 import CertificateImportParameters
from ._models_py3 import CertificateIssuerItem
from ._models_py3 import CertificateIssuerListResult
from ._models_py3 import CertificateIssuerSetParameters
from ._models_py3 import CertificateIssuerUpdateParameters
from ._models_py3 import CertificateItem
from ._models_py3 import CertificateListResult
from ._models_py3 import CertificateMergeParameters
from ._models_py3 import CertificateOperation
from ._models_py3 import CertificateOperationUpdateParameter
Expand All @@ -32,10 +34,13 @@
from ._models_py3 import Contacts
from ._models_py3 import DeletedCertificateBundle
from ._models_py3 import DeletedCertificateItem
from ._models_py3 import DeletedCertificateListResult
from ._models_py3 import DeletedKeyBundle
from ._models_py3 import DeletedKeyItem
from ._models_py3 import DeletedKeyListResult
from ._models_py3 import DeletedSecretBundle
from ._models_py3 import DeletedSecretItem
from ._models_py3 import DeletedSecretListResult
from ._models_py3 import Error
from ._models_py3 import IssuerAttributes
from ._models_py3 import IssuerBundle
Expand All @@ -47,6 +52,7 @@
from ._models_py3 import KeyCreateParameters
from ._models_py3 import KeyImportParameters
from ._models_py3 import KeyItem
from ._models_py3 import KeyListResult
from ._models_py3 import KeyOperationResult
from ._models_py3 import KeyOperationsParameters
from ._models_py3 import KeyProperties
Expand All @@ -63,10 +69,12 @@
from ._models_py3 import SasDefinitionBundle
from ._models_py3 import SasDefinitionCreateParameters
from ._models_py3 import SasDefinitionItem
from ._models_py3 import SasDefinitionListResult
from ._models_py3 import SasDefinitionUpdateParameters
from ._models_py3 import SecretAttributes
from ._models_py3 import SecretBundle
from ._models_py3 import SecretItem
from ._models_py3 import SecretListResult
from ._models_py3 import SecretProperties
from ._models_py3 import SecretRestoreParameters
from ._models_py3 import SecretSetParameters
Expand All @@ -77,6 +85,7 @@
from ._models_py3 import StorageAccountRegenerteKeyParameters
from ._models_py3 import StorageAccountUpdateParameters
from ._models_py3 import StorageBundle
from ._models_py3 import StorageListResult
from ._models_py3 import SubjectAlternativeNames
from ._models_py3 import Trigger
from ._models_py3 import X509CertificateProperties
Expand All @@ -91,9 +100,11 @@
from ._models import CertificateCreateParameters
from ._models import CertificateImportParameters
from ._models import CertificateIssuerItem
from ._models import CertificateIssuerListResult
from ._models import CertificateIssuerSetParameters
from ._models import CertificateIssuerUpdateParameters
from ._models import CertificateItem
from ._models import CertificateListResult
from ._models import CertificateMergeParameters
from ._models import CertificateOperation
from ._models import CertificateOperationUpdateParameter
Expand All @@ -103,10 +114,13 @@
from ._models import Contacts
from ._models import DeletedCertificateBundle
from ._models import DeletedCertificateItem
from ._models import DeletedCertificateListResult
from ._models import DeletedKeyBundle
from ._models import DeletedKeyItem
from ._models import DeletedKeyListResult
from ._models import DeletedSecretBundle
from ._models import DeletedSecretItem
from ._models import DeletedSecretListResult
from ._models import Error
from ._models import IssuerAttributes
from ._models import IssuerBundle
Expand All @@ -118,6 +132,7 @@
from ._models import KeyCreateParameters
from ._models import KeyImportParameters
from ._models import KeyItem
from ._models import KeyListResult
from ._models import KeyOperationResult
from ._models import KeyOperationsParameters
from ._models import KeyProperties
Expand All @@ -134,10 +149,12 @@
from ._models import SasDefinitionBundle
from ._models import SasDefinitionCreateParameters
from ._models import SasDefinitionItem
from ._models import SasDefinitionListResult
from ._models import SasDefinitionUpdateParameters
from ._models import SecretAttributes
from ._models import SecretBundle
from ._models import SecretItem
from ._models import SecretListResult
from ._models import SecretProperties
from ._models import SecretRestoreParameters
from ._models import SecretSetParameters
Expand All @@ -148,18 +165,10 @@
from ._models import StorageAccountRegenerteKeyParameters
from ._models import StorageAccountUpdateParameters
from ._models import StorageBundle
from ._models import StorageListResult
from ._models import SubjectAlternativeNames
from ._models import Trigger
from ._models import X509CertificateProperties
from ._paged_models import CertificateIssuerItemPaged
from ._paged_models import CertificateItemPaged
from ._paged_models import DeletedCertificateItemPaged
from ._paged_models import DeletedKeyItemPaged
from ._paged_models import DeletedSecretItemPaged
from ._paged_models import KeyItemPaged
from ._paged_models import SasDefinitionItemPaged
from ._paged_models import SecretItemPaged
from ._paged_models import StorageAccountItemPaged
from ._key_vault_client_enums import (
JsonWebKeyType,
JsonWebKeyCurveName,
Expand All @@ -182,9 +191,11 @@
'CertificateCreateParameters',
'CertificateImportParameters',
'CertificateIssuerItem',
'CertificateIssuerListResult',
'CertificateIssuerSetParameters',
'CertificateIssuerUpdateParameters',
'CertificateItem',
'CertificateListResult',
'CertificateMergeParameters',
'CertificateOperation',
'CertificateOperationUpdateParameter',
Expand All @@ -194,10 +205,13 @@
'Contacts',
'DeletedCertificateBundle',
'DeletedCertificateItem',
'DeletedCertificateListResult',
'DeletedKeyBundle',
'DeletedKeyItem',
'DeletedKeyListResult',
'DeletedSecretBundle',
'DeletedSecretItem',
'DeletedSecretListResult',
'Error',
'IssuerAttributes',
'IssuerBundle',
Expand All @@ -209,6 +223,7 @@
'KeyCreateParameters',
'KeyImportParameters',
'KeyItem',
'KeyListResult',
'KeyOperationResult',
'KeyOperationsParameters',
'KeyProperties',
Expand All @@ -225,10 +240,12 @@
'SasDefinitionBundle',
'SasDefinitionCreateParameters',
'SasDefinitionItem',
'SasDefinitionListResult',
'SasDefinitionUpdateParameters',
'SecretAttributes',
'SecretBundle',
'SecretItem',
'SecretListResult',
'SecretProperties',
'SecretRestoreParameters',
'SecretSetParameters',
Expand All @@ -239,18 +256,10 @@
'StorageAccountRegenerteKeyParameters',
'StorageAccountUpdateParameters',
'StorageBundle',
'StorageListResult',
'SubjectAlternativeNames',
'Trigger',
'X509CertificateProperties',
'KeyItemPaged',
'DeletedKeyItemPaged',
'SecretItemPaged',
'DeletedSecretItemPaged',
'CertificateItemPaged',
'CertificateIssuerItemPaged',
'DeletedCertificateItemPaged',
'StorageAccountItemPaged',
'SasDefinitionItemPaged',
'JsonWebKeyType',
'JsonWebKeyCurveName',
'DeletionRecoveryLevel',
Expand Down
Loading