Skip to content

Dont default to RequestsTransport #25618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Laia Patiño (laiapat) merged 6 commits into from
Aug 18, 2022
Merged

Dont default to RequestsTransport #25618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d59081
Dont default to RequestsTransport
Aug 9, 2022
443c238
trailing whitespace
Aug 9, 2022
5e82f7e
Merge branch 'main' into fix/kv-core-imports
Aug 9, 2022
0931b03
Merge branch 'main' into fix/kv-core-imports
Aug 10, 2022
647431b
remove all transport and pipeline references
Aug 18, 2022
85ea70b
Merge branch 'main' into fix/kv-core-imports
Aug 18, 2022
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
8 changes: 0 additions & 8 deletions ...zure-keyvault-administration/azure/keyvault/administration/_internal/async_client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ def __init__(self, vault_url: str, credential: "AsyncTokenCredential", **kwargs:
self._models = models or _KeyVaultClient.models(api_version=api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", None)
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{
Expand All @@ -51,14 +49,8 @@ def __init__(self, vault_url: str, credential: "AsyncTokenCredential", **kwargs:
}
)

if not transport and not pipeline:
from azure.core.pipeline.transport import AioHttpTransport
transport = AioHttpTransport(**kwargs)

self._client = _KeyVaultClient(
api_version=api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=AsyncChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
5 changes: 0 additions & 5 deletions ...ault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from six import with_metaclass

from azure.core import CaseInsensitiveEnumMeta
from azure.core.pipeline.transport import RequestsTransport
from azure.core.pipeline.policies import HttpLoggingPolicy

from . import ChallengeAuthPolicy
Expand Down Expand Up @@ -54,17 +53,13 @@ def __init__(self, vault_url, credential, **kwargs):
self._models = models or _KeyVaultClient.models(api_version=api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", RequestsTransport(**kwargs))
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

self._client = _KeyVaultClient(
api_version=api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=ChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ class CertificateClient(KeyVaultClientBase):
:mod:`azure.identity`
:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.certificates.ApiVersion
:keyword transport: transport to use. Defaults to :class:`~azure.core.pipeline.transport.RequestsTransport`.
:paramtype transport: ~azure.core.pipeline.transport.HttpTransport

Example:
.. literalinclude:: ../tests/test_examples_certificates.py
Expand Down
9 changes: 0 additions & 9 deletions ...ault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,13 @@ def __init__(self, vault_url: str, credential: "AsyncTokenCredential", **kwargs:
self._models = models or _KeyVaultClient.models(api_version=self.api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", None)
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

if not transport and not pipeline:
from azure.core.pipeline.transport import AioHttpTransport

transport = AioHttpTransport(**kwargs)

self._client = _KeyVaultClient(
api_version=self.api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=AsyncChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
5 changes: 0 additions & 5 deletions sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from six import with_metaclass

from azure.core import CaseInsensitiveEnumMeta
from azure.core.pipeline.transport import RequestsTransport
from azure.core.pipeline.policies import HttpLoggingPolicy

from . import ChallengeAuthPolicy
Expand Down Expand Up @@ -58,17 +57,13 @@ def __init__(self, vault_url, credential, **kwargs):
self._models = models or _KeyVaultClient.models(api_version=self.api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", RequestsTransport(**kwargs))
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

self._client = _KeyVaultClient(
api_version=self.api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=ChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ class CertificateClient(AsyncKeyVaultClientBase):
:mod:`azure.identity.aio`
:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.certificates.ApiVersion
:keyword transport: transport to use. Defaults to
:class:`~azure.core.pipeline.transport.AioHttpTransport`.
:paramtype transport: ~azure.core.pipeline.transport.AsyncHttpTransport

Example:
.. literalinclude:: ../tests/test_examples_certificates_async.py
Expand Down
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ class KeyClient(KeyVaultClientBase):

:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.keys.ApiVersion
:keyword transport: transport to use. Defaults to :class:`~azure.core.pipeline.transport.RequestsTransport`.
:paramtype transport: ~azure.core.pipeline.transport.HttpTransport

Example:
.. literalinclude:: ../tests/test_samples_keys.py
Expand Down
9 changes: 0 additions & 9 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,13 @@ def __init__(self, vault_url: str, credential: "AsyncTokenCredential", **kwargs:
self._models = models or _KeyVaultClient.models(api_version=self.api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", None)
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

if not transport and not pipeline:
from azure.core.pipeline.transport import AioHttpTransport

transport = AioHttpTransport(**kwargs)

self._client = _KeyVaultClient(
api_version=self.api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=AsyncChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
5 changes: 0 additions & 5 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from six import with_metaclass

from azure.core import CaseInsensitiveEnumMeta
from azure.core.pipeline.transport import RequestsTransport
from azure.core.pipeline.policies import HttpLoggingPolicy

from . import ChallengeAuthPolicy
Expand Down Expand Up @@ -58,17 +57,13 @@ def __init__(self, vault_url, credential, **kwargs):
self._models = models or _KeyVaultClient.models(api_version=self.api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", RequestsTransport(**kwargs))
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

self._client = _KeyVaultClient(
api_version=self.api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=ChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ class KeyClient(AsyncKeyVaultClientBase):

:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.keys.ApiVersion
:keyword transport: transport to use. Defaults to
:class:`~azure.core.pipeline.transport.AioHttpTransport`.
:paramtype transport: ~azure.core.pipeline.transport.AsyncHttpTransport

Example:
.. literalinclude:: ../tests/test_samples_keys_async.py
Expand Down
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ class CryptographyClient(KeyVaultClientBase):
:mod:`azure.identity`
:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.keys.ApiVersion
:keyword transport: transport to use. Defaults to :class:`~azure.core.pipeline.transport.RequestsTransport`.
:paramtype transport: ~azure.core.pipeline.transport.HttpTransport

.. literalinclude:: ../tests/test_examples_crypto.py
:start-after: [START create_client]
Expand Down
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ class CryptographyClient(AsyncKeyVaultClientBase):
:mod:`azure.identity.aio`
:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.keys.ApiVersion
:keyword transport: transport to use. Defaults to :class:`~azure.core.pipeline.transport.AioHttpTransport`.
:paramtype transport: ~azure.core.pipeline.transport.AsyncHttpTransport

.. literalinclude:: ../tests/test_examples_crypto_async.py
:start-after: [START create_client]
Expand Down
2 changes: 0 additions & 2 deletions sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ class SecretClient(KeyVaultClientBase):
:mod:`azure.identity`
:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.secrets.ApiVersion
:keyword transport: transport to use. Defaults to :class:`~azure.core.pipeline.transport.RequestsTransport`.
:paramtype transport: ~azure.core.pipeline.transport.HttpTransport

Example:
.. literalinclude:: ../tests/test_samples_secrets.py
Expand Down
9 changes: 0 additions & 9 deletions sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,13 @@ def __init__(self, vault_url: str, credential: "AsyncTokenCredential", **kwargs:
self._models = models or _KeyVaultClient.models(api_version=self.api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", None)
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

if not transport and not pipeline:
from azure.core.pipeline.transport import AioHttpTransport

transport = AioHttpTransport(**kwargs)

self._client = _KeyVaultClient(
api_version=self.api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=AsyncChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
5 changes: 0 additions & 5 deletions sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from six import with_metaclass

from azure.core import CaseInsensitiveEnumMeta
from azure.core.pipeline.transport import RequestsTransport
from azure.core.pipeline.policies import HttpLoggingPolicy

from . import ChallengeAuthPolicy
Expand Down Expand Up @@ -58,17 +57,13 @@ def __init__(self, vault_url, credential, **kwargs):
self._models = models or _KeyVaultClient.models(api_version=self.api_version)
return

pipeline = kwargs.pop("pipeline", None)
transport = kwargs.pop("transport", RequestsTransport(**kwargs))
http_logging_policy = HttpLoggingPolicy(**kwargs)
http_logging_policy.allowed_header_names.update(
{"x-ms-keyvault-network-info", "x-ms-keyvault-region", "x-ms-keyvault-service-version"}
)

self._client = _KeyVaultClient(
api_version=self.api_version,
pipeline=pipeline,
transport=transport,
authentication_policy=ChallengeAuthPolicy(credential),
sdk_moniker=SDK_MONIKER,
http_logging_policy=http_logging_policy,
Expand Down
3 changes: 0 additions & 3 deletions sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/aio/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ class SecretClient(AsyncKeyVaultClientBase):
:mod:`azure.identity.aio`
:keyword api_version: version of the Key Vault API to use. Defaults to the most recent.
:paramtype api_version: ~azure.keyvault.secrets.ApiVersion
:keyword transport: transport to use. Defaults to
:class:`~azure.core.pipeline.transport.AioHttpTransport`.
:paramtype transport: ~azure.core.pipeline.transport.AsyncHttpTransport

Example:
.. literalinclude:: ../tests/test_samples_secrets_async.py
Expand Down