Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"sdk/**/azure-cognitiveservices**",
"sdk/**/_generated/**",
"**/*requirement*.txt",
"**/assets.json",

"sdk/applicationinsights/azure-applicationinsights/**",
"sdk/appconfiguration/azure-appconfiguration/**",
Expand Down
4 changes: 3 additions & 1 deletion sdk/keyvault/azure-keyvault-administration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@

### Other Changes
- Updated minimum `azure-core` version to 1.24.0
- Updated minimum `msrest` version to 0.7.1
- Dropped `msrest` requirement
- Added requirement for `isodate>=0.6.1` (`isodate` was required by `msrest`)
- Added requirement for `typing-extensions>=4.0.1`

## 4.2.0 (2022-09-19)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@
patch_sdk()
except ImportError:
pass

from ._version import VERSION

__version__ = VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,13 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from typing import TYPE_CHECKING
from typing import Any

from azure.core.configuration import Configuration
from azure.core.pipeline import policies

from ._version import VERSION

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any

class KeyVaultClientConfiguration(Configuration):
"""Configuration for KeyVaultClient.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,15 @@
# regenerated.
# --------------------------------------------------------------------------

from typing import TYPE_CHECKING

from msrest import Deserializer, Serializer
from typing import Any, Optional

from azure.core import PipelineClient
from azure.profiles import KnownProfiles, ProfileDefinition
from azure.profiles.multiapiclient import MultiApiClientMixin

from ._configuration import KeyVaultClientConfiguration
from ._operations_mixin import KeyVaultClientOperationsMixin

if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
from typing import Any, Optional
from ._serialization import Deserializer, Serializer

class _SDKClient(object):
def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -63,7 +58,7 @@ def __init__(
profile=KnownProfiles.default, # type: KnownProfiles
**kwargs # type: Any
):
if api_version == '7.2' or api_version == '7.3':
if api_version == '7.2' or api_version == '7.3' or api_version == '7.4-preview.1':
base_url = '{vaultBaseUrl}'
else:
raise ValueError("API version {} is not available".format(api_version))
Expand All @@ -84,13 +79,17 @@ def models(cls, api_version=DEFAULT_API_VERSION):

* 7.2: :mod:`v7_2.models<azure.keyvault.v7_2.models>`
* 7.3: :mod:`v7_3.models<azure.keyvault.v7_3.models>`
* 7.4-preview.1: :mod:`v7_4_preview_1.models<azure.keyvault.v7_4_preview_1.models>`
"""
if api_version == '7.2':
from .v7_2 import models
return models
elif api_version == '7.3':
from .v7_3 import models
return models
elif api_version == '7.4-preview.1':
from .v7_4_preview_1 import models
return models
raise ValueError("API version {} is not available".format(api_version))

@property
Expand All @@ -99,14 +98,18 @@ def role_assignments(self):

* 7.2: :class:`RoleAssignmentsOperations<azure.keyvault.v7_2.operations.RoleAssignmentsOperations>`
* 7.3: :class:`RoleAssignmentsOperations<azure.keyvault.v7_3.operations.RoleAssignmentsOperations>`
* 7.4-preview.1: :class:`RoleAssignmentsOperations<azure.keyvault.v7_4_preview_1.operations.RoleAssignmentsOperations>`
"""
api_version = self._get_api_version('role_assignments')
if api_version == '7.2':
from .v7_2.operations import RoleAssignmentsOperations as OperationClass
elif api_version == '7.3':
from .v7_3.operations import RoleAssignmentsOperations as OperationClass
elif api_version == '7.4-preview.1':
from .v7_4_preview_1.operations import RoleAssignmentsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'role_assignments'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
Expand All @@ -115,14 +118,18 @@ def role_definitions(self):

* 7.2: :class:`RoleDefinitionsOperations<azure.keyvault.v7_2.operations.RoleDefinitionsOperations>`
* 7.3: :class:`RoleDefinitionsOperations<azure.keyvault.v7_3.operations.RoleDefinitionsOperations>`
* 7.4-preview.1: :class:`RoleDefinitionsOperations<azure.keyvault.v7_4_preview_1.operations.RoleDefinitionsOperations>`
"""
api_version = self._get_api_version('role_definitions')
if api_version == '7.2':
from .v7_2.operations import RoleDefinitionsOperations as OperationClass
elif api_version == '7.3':
from .v7_3.operations import RoleDefinitionsOperations as OperationClass
elif api_version == '7.4-preview.1':
from .v7_4_preview_1.operations import RoleDefinitionsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'role_definitions'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

def close(self):
Expand Down
Loading