Authorization to multi API client (#2656)

* Authorization to multi API client

* Remove Version from Readm

* azure-common 1.1.12 with profile definition for Authorization

* Authorization 0.50.0 ChangeLog

* Auto packaging

* Udpate with Swagger

* Update HISTORY.rst

azure-common/HISTORY.rst

@@ -3,6 +3,13 @@
 Release History
 ===============
 
+1.1.12 (2018-05-29)
++++++++++++++++++++
+
+**Features**
+
+- Add Authorization profile definition
+
 1.1.11 (2018-05-08)
 +++++++++++++++++++
 

azure-common/azure/common/__init__.py

@@ -5,7 +5,7 @@
 #--------------------------------------------------------------------------
 
 __author__ = 'Microsoft Corp. <azpysdkhelp@microsoft.com>'
-__version__ = '1.1.11'
+__version__ = '1.1.12'
 
 
 class AzureException(Exception):

azure-common/azure/profiles/__init__.py

@@ -72,6 +72,9 @@ class KnownProfiles(Enum):
     latest = ProfileDefinition(None, "latest")
     v2017_03_09_profile = ProfileDefinition(
         {
+            "azure.mgmt.authorization.AuthorizationManagementClient": {
+                None: "2015-07-01"
+            },
             "azure.mgmt.compute.ComputeManagementClient": {
                 None: "2016-03-30"
             },

azure-common/setup.py

@@ -39,7 +39,7 @@
 
 setup(
     name='azure-common',
-    version='1.1.11',
+    version='1.1.12',
     description='Microsoft Azure Client Library for Python (Common)',
     long_description=readme + '\n\n' + history,
     license='MIT License',

azure-mgmt-authorization/HISTORY.rst

@@ -3,12 +3,24 @@
 Release History
 ===============
 
+0.50.0 (2018-05-29)
++++++++++++++++++++
+
+**Features**
+
+- Support Azure Stack (multi API versionning)
+- Client class can be used as a context manager to keep the underlying HTTP session open for performance
+
+**Bugfixes**
+
+- Compatibility of the sdist with wheel 0.31.0
+
 0.40.0 (2018-03-13)
 +++++++++++++++++++
 
 **Breaking changes**
 
-- Several properties have been flattened ans "properties" attribute is not needed anymore
+- Several properties have been flattened and "properties" attribute is not needed anymore
   (e.g. properties.email_address => email_address)
 - Some method signature change (e.g. create_by_id)
 

azure-mgmt-authorization/azure/mgmt/authorization/authorization_management_client.py

@@ -9,16 +9,13 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
+
+from azure.profiles import KnownProfiles, ProfileDefinition
+from azure.profiles.multiapiclient import MultiApiClientMixin
 from .version import VERSION
-from .operations.classic_administrators_operations import ClassicAdministratorsOperations
-from .operations.provider_operations_metadata_operations import ProviderOperationsMetadataOperations
-from .operations.permissions_operations import PermissionsOperations
-from .operations.role_assignments_operations import RoleAssignmentsOperations
-from .operations.role_definitions_operations import RoleDefinitionsOperations
-from . import models
 
 
 class AuthorizationManagementClientConfiguration(AzureConfiguration):
@@ -53,48 +50,151 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class AuthorizationManagementClient(object):
+class AuthorizationManagementClient(MultiApiClientMixin, SDKClient):
     """Role based access control provides you a way to apply granular level policy administration down to individual resources or resource groups. These operations enable you to manage role definitions and role assignments. A role definition describes the set of actions that can be performed on resources. A role assignment grants access to Azure Active Directory users.
 
+    This ready contains multiple API versions, to help you deal with all Azure clouds
+    (Azure Stack, Azure Government, Azure China, etc.).
+    By default, uses latest API version available on public Azure.
+    For production, you should stick a particular api-version and/or profile.
+    The profile sets a mapping between the operation group and an API version.
+    The api-version parameter sets the default API version if the operation
+    group is not described in the profile.
+
     :ivar config: Configuration for client.
     :vartype config: AuthorizationManagementClientConfiguration
 
-    :ivar classic_administrators: ClassicAdministrators operations
-    :vartype classic_administrators: azure.mgmt.authorization.operations.ClassicAdministratorsOperations
-    :ivar provider_operations_metadata: ProviderOperationsMetadata operations
-    :vartype provider_operations_metadata: azure.mgmt.authorization.operations.ProviderOperationsMetadataOperations
-    :ivar permissions: Permissions operations
-    :vartype permissions: azure.mgmt.authorization.operations.PermissionsOperations
-    :ivar role_assignments: RoleAssignments operations
-    :vartype role_assignments: azure.mgmt.authorization.operations.RoleAssignmentsOperations
-    :ivar role_definitions: RoleDefinitions operations
-    :vartype role_definitions: azure.mgmt.authorization.operations.RoleDefinitionsOperations
-
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
      object<msrestazure.azure_active_directory>`
-    :param subscription_id: The ID of the target subscription.
+    :param subscription_id: Subscription credentials which uniquely identify
+     Microsoft Azure subscription. The subscription ID forms part of the URI
+     for every service call.
     :type subscription_id: str
+    :param str api_version: API version to use if no profile is provided, or if
+     missing in profile.
     :param str base_url: Service URL
+    :param profile: A profile definition, from KnownProfiles to dict.
+    :type profile: azure.profiles.KnownProfiles
     """
 
-    def __init__(
-            self, credentials, subscription_id, base_url=None):
-
+    DEFAULT_API_VERSION='2018-01-01-preview'
+    _PROFILE_TAG = "azure.mgmt.authorization.AuthorizationManagementClient"
+    LATEST_PROFILE = ProfileDefinition({
+        _PROFILE_TAG: {
+            'classic_administrators': '2015-06-01',
+            None: DEFAULT_API_VERSION
+        }},
+        _PROFILE_TAG + " latest"
+    )
+
+    def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
         self.config = AuthorizationManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
-        client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self._serialize = Serializer(client_models)
-        self._deserialize = Deserializer(client_models)
-
-        self.classic_administrators = ClassicAdministratorsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.provider_operations_metadata = ProviderOperationsMetadataOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.permissions = PermissionsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.role_assignments = RoleAssignmentsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.role_definitions = RoleDefinitionsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
+        super(AuthorizationManagementClient, self).__init__(
+            credentials,
+            self.config,
+            api_version=api_version,
+            profile=profile
+        )
+
+############ Generated from here ############
+
+    @classmethod
+    def _models_dict(cls, api_version):
+        return {k: v for k, v in cls.models(api_version).__dict__.items() if isinstance(v, type)}
+
+    @classmethod
+    def models(cls, api_version=DEFAULT_API_VERSION):
+        """Module depends on the API version:
+
+           * 2015-06-01: :mod:`v2015_06_01.models<azure.mgmt.authorization.v2015_06_01.models>`
+           * 2015-07-01: :mod:`v2015_07_01.models<azure.mgmt.authorization.v2015_07_01.models>`
+           * 2018-01-01-preview: :mod:`v2018_01_01_preview.models<azure.mgmt.authorization.v2018_01_01_preview.models>`
+        """
+        if api_version == '2015-06-01':
+            from .v2015_06_01 import models
+            return models
+        elif api_version == '2015-07-01':
+            from .v2015_07_01 import models
+            return models
+        elif api_version == '2018-01-01-preview':
+            from .v2018_01_01_preview import models
+            return models
+        raise NotImplementedError("APIVersion {} is not available".format(api_version))
+
+    @property
+    def classic_administrators(self):
+        """Instance depends on the API version:
+
+           * 2015-06-01: :class:`ClassicAdministratorsOperations<azure.mgmt.authorization.v2015_06_01.operations.ClassicAdministratorsOperations>`
+        """
+        api_version = self._get_api_version('classic_administrators')
+        if api_version == '2015-06-01':
+            from .v2015_06_01.operations import ClassicAdministratorsOperations as OperationClass
+        else:
+            raise NotImplementedError("APIVersion {} is not available".format(api_version))
+        return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+
+    @property
+    def permissions(self):
+        """Instance depends on the API version:
+
+           * 2015-07-01: :class:`PermissionsOperations<azure.mgmt.authorization.v2015_07_01.operations.PermissionsOperations>`
+           * 2018-01-01-preview: :class:`PermissionsOperations<azure.mgmt.authorization.v2018_01_01_preview.operations.PermissionsOperations>`
+        """
+        api_version = self._get_api_version('permissions')
+        if api_version == '2015-07-01':
+            from .v2015_07_01.operations import PermissionsOperations as OperationClass
+        elif api_version == '2018-01-01-preview':
+            from .v2018_01_01_preview.operations import PermissionsOperations as OperationClass
+        else:
+            raise NotImplementedError("APIVersion {} is not available".format(api_version))
+        return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+
+    @property
+    def provider_operations_metadata(self):
+        """Instance depends on the API version:
+
+           * 2015-07-01: :class:`ProviderOperationsMetadataOperations<azure.mgmt.authorization.v2015_07_01.operations.ProviderOperationsMetadataOperations>`
+           * 2018-01-01-preview: :class:`ProviderOperationsMetadataOperations<azure.mgmt.authorization.v2018_01_01_preview.operations.ProviderOperationsMetadataOperations>`
+        """
+        api_version = self._get_api_version('provider_operations_metadata')
+        if api_version == '2015-07-01':
+            from .v2015_07_01.operations import ProviderOperationsMetadataOperations as OperationClass
+        elif api_version == '2018-01-01-preview':
+            from .v2018_01_01_preview.operations import ProviderOperationsMetadataOperations as OperationClass
+        else:
+            raise NotImplementedError("APIVersion {} is not available".format(api_version))
+        return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+
+    @property
+    def role_assignments(self):
+        """Instance depends on the API version:
+
+           * 2015-07-01: :class:`RoleAssignmentsOperations<azure.mgmt.authorization.v2015_07_01.operations.RoleAssignmentsOperations>`
+           * 2018-01-01-preview: :class:`RoleAssignmentsOperations<azure.mgmt.authorization.v2018_01_01_preview.operations.RoleAssignmentsOperations>`
+        """
+        api_version = self._get_api_version('role_assignments')
+        if api_version == '2015-07-01':
+            from .v2015_07_01.operations import RoleAssignmentsOperations as OperationClass
+        elif api_version == '2018-01-01-preview':
+            from .v2018_01_01_preview.operations import RoleAssignmentsOperations as OperationClass
+        else:
+            raise NotImplementedError("APIVersion {} is not available".format(api_version))
+        return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+
+    @property
+    def role_definitions(self):
+        """Instance depends on the API version:
+
+           * 2015-07-01: :class:`RoleDefinitionsOperations<azure.mgmt.authorization.v2015_07_01.operations.RoleDefinitionsOperations>`
+           * 2018-01-01-preview: :class:`RoleDefinitionsOperations<azure.mgmt.authorization.v2018_01_01_preview.operations.RoleDefinitionsOperations>`
+        """
+        api_version = self._get_api_version('role_definitions')
+        if api_version == '2015-07-01':
+            from .v2015_07_01.operations import RoleDefinitionsOperations as OperationClass
+        elif api_version == '2018-01-01-preview':
+            from .v2018_01_01_preview.operations import RoleDefinitionsOperations as OperationClass
+        else:
+            raise NotImplementedError("APIVersion {} is not available".format(api_version))
+        return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

azure-mgmt-authorization/azure/mgmt/authorization/models.py

@@ -0,0 +1,8 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+from .v2015_07_01.models import *
+from .v2018_01_01_preview.models import *

azure-mgmt-authorization/azure/mgmt/authorization/v2015_06_01/__init__.py

@@ -0,0 +1,18 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .authorization_management_client import AuthorizationManagementClient
+from .version import VERSION
+
+__all__ = ['AuthorizationManagementClient']
+
+__version__ = VERSION
+

azure-mgmt-authorization/azure/mgmt/authorization/v2015_06_01/authorization_management_client.py

@@ -0,0 +1,81 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.service_client import SDKClient
+from msrest import Serializer, Deserializer
+from msrestazure import AzureConfiguration
+from .version import VERSION
+from .operations.classic_administrators_operations import ClassicAdministratorsOperations
+from . import models
+
+
+class AuthorizationManagementClientConfiguration(AzureConfiguration):
+    """Configuration for AuthorizationManagementClient
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: The ID of the target subscription.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        if credentials is None:
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not base_url:
+            base_url = 'https://management.azure.com'
+
+        super(AuthorizationManagementClientConfiguration, self).__init__(base_url)
+
+        self.add_user_agent('azure-mgmt-authorization/{}'.format(VERSION))
+        self.add_user_agent('Azure-SDK-For-Python')
+
+        self.credentials = credentials
+        self.subscription_id = subscription_id
+
+
+class AuthorizationManagementClient(SDKClient):
+    """Role based access control provides you a way to apply granular level policy administration down to individual resources or resource groups. These operations enable you to manage role definitions and role assignments. A role definition describes the set of actions that can be performed on resources. A role assignment grants access to Azure Active Directory users.
+
+    :ivar config: Configuration for client.
+    :vartype config: AuthorizationManagementClientConfiguration
+
+    :ivar classic_administrators: ClassicAdministrators operations
+    :vartype classic_administrators: azure.mgmt.authorization.v2015_06_01.operations.ClassicAdministratorsOperations
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: The ID of the target subscription.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        self.config = AuthorizationManagementClientConfiguration(credentials, subscription_id, base_url)
+        super(AuthorizationManagementClient, self).__init__(self.config.credentials, self.config)
+
+        client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
+        self.api_version = '2015-06-01'
+        self._serialize = Serializer(client_models)
+        self._deserialize = Deserializer(client_models)
+
+        self.classic_administrators = ClassicAdministratorsOperations(
+            self._client, self.config, self._serialize, self._deserialize)