Skip to content

Commit 8336657

Browse files
AutorestCIlmazuel
authored andcommitted
[AutoPR] keyvault/resource-manager (#3970)
* [AutoPR keyvault/resource-manager] typo: resource-manager/Microsoft.KeyVault (#3945) * Generated from 062256ec3137eb264c9f6938d199f94af2543c14 typo: resource-manager/Microsoft.KeyVault - Double word "the" - availabity -> availability - accesibility -> accessibility - Decription -> Description * Packaging update of azure-mgmt-keyvault * [AutoPR keyvault/resource-manager] add description of access policies required condition (#4330) * Generated from bddc29df0c1abc1a1f25b2b2a07c6deb2043c2e6 add description of access policies required condition * Packaging update of azure-mgmt-keyvault * Move KV mgmt to SDK folder * Add missing dev_req * Packaging update of azure-mgmt-keyvault * Clean up * Fix KV test req * Adapt Batch Mgmt test req * Packaging update of azure-mgmt-batch
1 parent f3453f5 commit 8336657

File tree

128 files changed

+110
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+110
-151
lines changed

azure-mgmt-batch/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
recursive-include tests *.py *.yaml
12
include *.rst
23
include azure/__init__.py
34
include azure/mgmt/__init__.py

azure-mgmt-batch/README.rst

Lines changed: 0 additions & 19 deletions

azure-mgmt-batch/dev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
-e ../azure-sdk-tools
2-
-e ../azure-mgmt-keyvault
2+
-e ../sdk/keyvault/azure-mgmt-keyvault

azure-mgmt-batch/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
version=version,
5454
description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME),
5555
long_description=readme + '\n\n' + history,
56+
long_description_content_type='text/x-rst',
5657
license='MIT License',
5758
author='Microsoft Corporation',
5859
author_email='[email protected]',

azure-mgmt-keyvault/MANIFEST.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

azure-mgmt-keyvault/dev_requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-e ../../../azure-mgmt-authorization
2-
-e ../../../azure-mgmt-keyvault
2+
-e ../azure-mgmt-keyvault
33
-e ../../../azure-sdk-tools
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
recursive-include tests *.py *.yaml
2+
include *.rst
3+
include azure/__init__.py
4+
include azure/mgmt/__init__.py
5+

azure-mgmt-keyvault/README.rst renamed to sdk/keyvault/azure-mgmt-keyvault/README.rst

Lines changed: 0 additions & 19 deletions

azure-mgmt-keyvault/azure/mgmt/keyvault/key_vault_management_client.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/key_vault_management_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
110110
from .v2018_02_14 import models
111111
return models
112112
raise NotImplementedError("APIVersion {} is not available".format(api_version))
113-
113+
114114
@property
115115
def operations(self):
116116
"""Instance depends on the API version:

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class OperationDisplay(Model):
2121
:type resource: str
2222
:param operation: Type of operation: get, read, delete, etc.
2323
:type operation: str
24-
:param description: Decription of operation.
24+
:param description: Description of operation.
2525
:type description: str
2626
"""
2727

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display_py3.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class OperationDisplay(Model):
2121
:type resource: str
2222
:param operation: Type of operation: get, read, delete, etc.
2323
:type operation: str
24-
:param description: Decription of operation.
24+
:param description: Description of operation.
2525
:type description: str
2626
"""
2727

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class VaultAccessPolicyParameters(Model):
2626
:vartype name: str
2727
:ivar type: The resource name of the access policy.
2828
:vartype type: str
29-
:ivar location: The resource type of the the access policy.
29+
:ivar location: The resource type of the access policy.
3030
:vartype location: str
3131
:param properties: Required. Properties of the access policy
3232
:type properties:

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters_py3.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class VaultAccessPolicyParameters(Model):
2626
:vartype name: str
2727
:ivar type: The resource name of the access policy.
2828
:vartype type: str
29-
:ivar location: The resource type of the the access policy.
29+
:ivar location: The resource type of the access policy.
3030
:vartype location: str
3131
:param properties: Required. Properties of the access policy
3232
:type properties:

azure-mgmt-keyvault/azure/mgmt/keyvault/v2018_02_14/models/vault_check_name_availability_parameters.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_check_name_availability_parameters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
class VaultCheckNameAvailabilityParameters(Model):
16-
"""The parameters used to check the availabity of the vault name.
16+
"""The parameters used to check the availability of the vault name.
1717
1818
Variables are only populated by the server, and will be ignored when
1919
sending a request.

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_check_name_availability_parameters_py3.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_check_name_availability_parameters_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
class VaultCheckNameAvailabilityParameters(Model):
16-
"""The parameters used to check the availabity of the vault name.
16+
"""The parameters used to check the availability of the vault name.
1717
1818
Variables are only populated by the server, and will be ignored when
1919
sending a request.

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class VaultProperties(Model):
2424
:type sku: ~azure.mgmt.keyvault.v2016_10_01.models.Sku
2525
:param access_policies: An array of 0 to 16 identities that have access to
2626
the key vault. All identities in the array must use the same tenant ID as
27-
the key vault's tenant ID.
27+
the key vault's tenant ID. When `createMode` is set to `recover`, access
28+
policies are not required. Otherwise, access policies are required.
2829
:type access_policies:
2930
list[~azure.mgmt.keyvault.v2016_10_01.models.AccessPolicyEntry]
3031
:param vault_uri: The URI of the vault for performing operations on keys

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties_py3.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties_py3.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ class VaultProperties(Model):
2424
:type sku: ~azure.mgmt.keyvault.v2016_10_01.models.Sku
2525
:param access_policies: An array of 0 to 16 identities that have access to
2626
the key vault. All identities in the array must use the same tenant ID as
27-
the key vault's tenant ID.
27+
the key vault's tenant ID. When `createMode` is set to `recover`, access
28+
policies are not required. Otherwise, access policies are required.
2829
:type access_policies:
2930
list[~azure.mgmt.keyvault.v2016_10_01.models.AccessPolicyEntry]
3031
:param vault_uri: The URI of the vault for performing operations on keys

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/operations/operations.py renamed to sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/operations/operations.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
6767

6868
# Construct headers
6969
header_parameters = {}
70-
header_parameters['Content-Type'] = 'application/json; charset=utf-8'
70+
header_parameters['Accept'] = 'application/json'
7171
if self.config.generate_client_request_id:
7272
header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
7373
if custom_headers:
@@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False):
7676
header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
7777

7878
# Construct and send request
79-
request = self._client.get(url, query_parameters)
80-
response = self._client.send(
81-
request, header_parameters, stream=False, **operation_config)
79+
request = self._client.get(url, query_parameters, header_parameters)
80+
response = self._client.send(request, stream=False, **operation_config)
8281

8382
if response.status_code not in [200]:
8483
exp = CloudError(response)

0 commit comments

Comments
 (0)