[AutoPR] keyvault/resource-manager

azure-mgmt-batch/MANIFEST.in

@@ -1,3 +1,4 @@
+recursive-include tests *.py *.yaml
 include *.rst
 include azure/__init__.py
 include azure/mgmt/__init__.py

azure-mgmt-batch/README.rst

@@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
 
-Compatibility
-=============
-
-**IMPORTANT**: If you have an earlier version of the azure package
-(version < 1.0), you should uninstall it before installing this package.
-
-You can check the version using pip:
-
-.. code:: shell
-
-    pip freeze
-
-If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
-
-.. code:: shell
-
-    pip uninstall azure
-
-
 Usage
 =====
 

azure-mgmt-batch/dev_requirements.txt

@@ -1,2 +1,2 @@
 -e ../azure-sdk-tools
--e ../azure-mgmt-keyvault
+-e ../sdk/keyvault/azure-mgmt-keyvault

azure-mgmt-batch/setup.py

@@ -53,6 +53,7 @@
     version=version,
     description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME),
     long_description=readme + '\n\n' + history,
+    long_description_content_type='text/x-rst',
     license='MIT License',
     author='Microsoft Corporation',
     author_email='azpysdkhelp@microsoft.com',

sdk/keyvault/azure-keyvault/dev_requirements.txt

@@ -1,3 +1,3 @@
 -e ../../../azure-mgmt-authorization
--e ../../../azure-mgmt-keyvault
+-e ../azure-mgmt-keyvault
 -e ../../../azure-sdk-tools

sdk/keyvault/azure-mgmt-keyvault/MANIFEST.in

@@ -0,0 +1,5 @@
+recursive-include tests *.py *.yaml
+include *.rst
+include azure/__init__.py
+include azure/mgmt/__init__.py
+

azure-mgmt-keyvault/README.rst → sdk/keyvault/azure-mgmt-keyvault/README.rst

@@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
 
-Compatibility
-=============
-
-**IMPORTANT**: If you have an earlier version of the azure package
-(version < 1.0), you should uninstall it before installing this package.
-
-You can check the version using pip:
-
-.. code:: shell
-
-    pip freeze
-
-If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
-
-.. code:: shell
-
-    pip uninstall azure
-
-
 Usage
 =====
 

azure-mgmt-keyvault/azure/mgmt/keyvault/key_vault_management_client.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/key_vault_management_client.py

@@ -110,7 +110,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
             from .v2018_02_14 import models
             return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
-    
+
     @property
     def operations(self):
         """Instance depends on the API version:

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display.py

@@ -21,7 +21,7 @@ class OperationDisplay(Model):
     :type resource: str
     :param operation: Type of operation: get, read, delete, etc.
     :type operation: str
-    :param description: Decription of operation.
+    :param description: Description of operation.
     :type description: str
     """
 

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display_py3.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/operation_display_py3.py

@@ -21,7 +21,7 @@ class OperationDisplay(Model):
     :type resource: str
     :param operation: Type of operation: get, read, delete, etc.
     :type operation: str
-    :param description: Decription of operation.
+    :param description: Description of operation.
     :type description: str
     """
 

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters.py

@@ -26,7 +26,7 @@ class VaultAccessPolicyParameters(Model):
     :vartype name: str
     :ivar type: The resource name of the access policy.
     :vartype type: str
-    :ivar location: The resource type of the the access policy.
+    :ivar location: The resource type of the access policy.
     :vartype location: str
     :param properties: Required. Properties of the access policy
     :type properties:

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters_py3.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_access_policy_parameters_py3.py

@@ -26,7 +26,7 @@ class VaultAccessPolicyParameters(Model):
     :vartype name: str
     :ivar type: The resource name of the access policy.
     :vartype type: str
-    :ivar location: The resource type of the the access policy.
+    :ivar location: The resource type of the access policy.
     :vartype location: str
     :param properties: Required. Properties of the access policy
     :type properties:

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

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

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_check_name_availability_parameters_py3.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_check_name_availability_parameters_py3.py

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

azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties.py → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties.py

@@ -24,7 +24,8 @@ class VaultProperties(Model):
     :type sku: ~azure.mgmt.keyvault.v2016_10_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.
+     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.v2016_10_01.models.AccessPolicyEntry]
     :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 → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/models/vault_properties_py3.py

@@ -24,7 +24,8 @@ class VaultProperties(Model):
     :type sku: ~azure.mgmt.keyvault.v2016_10_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.
+     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.v2016_10_01.models.AccessPolicyEntry]
     :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 → sdk/keyvault/azure-mgmt-keyvault/azure/mgmt/keyvault/v2016_10_01/operations/operations.py

@@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)