From e500fa504494226fc07a50d396c722ca35ff60e8 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Tue, 25 Aug 2020 06:32:39 +0000 Subject: [PATCH] Update from release/v3 --- sdk/keyvault/azure-mgmt-keyvault/README.md | 2 +- .../mgmt/keyvault/v2018_02_14/models/_models.py | 14 +++++++------- .../keyvault/v2018_02_14/models/_models_py3.py | 14 +++++++------- .../mgmt/keyvault/v2019_09_01/models/_models.py | 8 ++++---- .../keyvault/v2019_09_01/models/_models_py3.py | 8 ++++---- sdk/keyvault/azure-mgmt-keyvault/setup.py | 4 +++- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/sdk/keyvault/azure-mgmt-keyvault/README.md b/sdk/keyvault/azure-mgmt-keyvault/README.md index 3ed5476b0beb..cc4b5919a6d2 100644 --- a/sdk/keyvault/azure-mgmt-keyvault/README.md +++ b/sdk/keyvault/azure-mgmt-keyvault/README.md @@ -7,7 +7,7 @@ For a more complete view of Azure libraries, see the [azure sdk python release]( # Usage -For code examples, see [Key Vault Management](https://docs.microsoft.com/python/api/overview/azure/?view=azure-python-preview) +For code examples, see [Key Vault Management](https://docs.microsoft.com/python/api/overview/azure/key-vault) on docs.microsoft.com. diff --git a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models.py b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models.py index bb2afb4d5a2a..85844c56f854 100644 --- a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models.py +++ b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models.py @@ -911,9 +911,9 @@ class VaultPatchProperties(Model): :type tenant_id: str :param sku: SKU details :type sku: ~azure.mgmt.keyvault.v2018_02_14.models.Sku - :param access_policies: An array of 0 to 16 identities that have access to - the key vault. All identities in the array must use the same tenant ID as - the key vault's tenant ID. + :param access_policies: An array of 0 to 1024 identities that have access + to the key vault. All identities in the array must use the same tenant ID + as the key vault's tenant ID. :type access_policies: list[~azure.mgmt.keyvault.v2018_02_14.models.AccessPolicyEntry] :param enabled_for_deployment: Property to specify whether Azure Virtual @@ -988,10 +988,10 @@ class VaultProperties(Model): :type tenant_id: str :param sku: Required. SKU details :type sku: ~azure.mgmt.keyvault.v2018_02_14.models.Sku - :param access_policies: An array of 0 to 16 identities that have access to - the key vault. All identities in the array must use the same tenant ID as - the key vault's tenant ID. When `createMode` is set to `recover`, access - policies are not required. Otherwise, access policies are required. + :param access_policies: An array of 0 to 1024 identities that have access + to the key vault. All identities in the array must use the same tenant ID + as the key vault's tenant ID. When `createMode` is set to `recover`, + access policies are not required. Otherwise, access policies are required. :type access_policies: list[~azure.mgmt.keyvault.v2018_02_14.models.AccessPolicyEntry] :param vault_uri: The URI of the vault for performing operations on keys diff --git a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models_py3.py b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models_py3.py index 7c13a32a59ed..9e436db58a6e 100644 --- a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models_py3.py +++ b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/_models_py3.py @@ -911,9 +911,9 @@ class VaultPatchProperties(Model): :type tenant_id: str :param sku: SKU details :type sku: ~azure.mgmt.keyvault.v2018_02_14.models.Sku - :param access_policies: An array of 0 to 16 identities that have access to - the key vault. All identities in the array must use the same tenant ID as - the key vault's tenant ID. + :param access_policies: An array of 0 to 1024 identities that have access + to the key vault. All identities in the array must use the same tenant ID + as the key vault's tenant ID. :type access_policies: list[~azure.mgmt.keyvault.v2018_02_14.models.AccessPolicyEntry] :param enabled_for_deployment: Property to specify whether Azure Virtual @@ -988,10 +988,10 @@ class VaultProperties(Model): :type tenant_id: str :param sku: Required. SKU details :type sku: ~azure.mgmt.keyvault.v2018_02_14.models.Sku - :param access_policies: An array of 0 to 16 identities that have access to - the key vault. All identities in the array must use the same tenant ID as - the key vault's tenant ID. When `createMode` is set to `recover`, access - policies are not required. Otherwise, access policies are required. + :param access_policies: An array of 0 to 1024 identities that have access + to the key vault. All identities in the array must use the same tenant ID + as the key vault's tenant ID. When `createMode` is set to `recover`, + access policies are not required. Otherwise, access policies are required. :type access_policies: list[~azure.mgmt.keyvault.v2018_02_14.models.AccessPolicyEntry] :param vault_uri: The URI of the vault for performing operations on keys diff --git a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models.py b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models.py index 32b541cd9bd1..5c8acb72a484 100644 --- a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models.py +++ b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models.py @@ -1004,10 +1004,10 @@ class VaultProperties(Model): :type tenant_id: str :param sku: Required. SKU details :type sku: ~azure.mgmt.keyvault.v2019_09_01.models.Sku - :param access_policies: An array of 0 to 16 identities that have access to - the key vault. All identities in the array must use the same tenant ID as - the key vault's tenant ID. When `createMode` is set to `recover`, access - policies are not required. Otherwise, access policies are required. + :param access_policies: An array of 0 to 1024 identities that have access + to the key vault. All identities in the array must use the same tenant ID + as the key vault's tenant ID. When `createMode` is set to `recover`, + access policies are not required. Otherwise, access policies are required. :type access_policies: list[~azure.mgmt.keyvault.v2019_09_01.models.AccessPolicyEntry] :param vault_uri: The URI of the vault for performing operations on keys diff --git a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models_py3.py b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models_py3.py index 7c0dcb3c6fd4..4cce16589601 100644 --- a/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models_py3.py +++ b/sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2019_09_01/models/_models_py3.py @@ -1004,10 +1004,10 @@ class VaultProperties(Model): :type tenant_id: str :param sku: Required. SKU details :type sku: ~azure.mgmt.keyvault.v2019_09_01.models.Sku - :param access_policies: An array of 0 to 16 identities that have access to - the key vault. All identities in the array must use the same tenant ID as - the key vault's tenant ID. When `createMode` is set to `recover`, access - policies are not required. Otherwise, access policies are required. + :param access_policies: An array of 0 to 1024 identities that have access + to the key vault. All identities in the array must use the same tenant ID + as the key vault's tenant ID. When `createMode` is set to `recover`, + access policies are not required. Otherwise, access policies are required. :type access_policies: list[~azure.mgmt.keyvault.v2019_09_01.models.AccessPolicyEntry] :param vault_uri: The URI of the vault for performing operations on keys diff --git a/sdk/keyvault/azure-mgmt-keyvault/setup.py b/sdk/keyvault/azure-mgmt-keyvault/setup.py index a69d42f38a99..68f7f441e9f1 100644 --- a/sdk/keyvault/azure-mgmt-keyvault/setup.py +++ b/sdk/keyvault/azure-mgmt-keyvault/setup.py @@ -36,7 +36,9 @@ pass # Version extraction inspired from 'requests' -with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: +with open(os.path.join(package_folder_path, 'version.py') + if os.path.exists(os.path.join(package_folder_path, 'version.py')) + else os.path.join(package_folder_path, '_version.py'), 'r') as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)