Merge pull request #216 from microsoft/dev

M151 clients and other minor fixes

Author: tedchamb

azure-devops/azure/devops/client.py

@@ -46,7 +46,7 @@ def add_user_agent(self, user_agent):
         if user_agent is not None:
             self.config.add_user_agent(user_agent)
 
-    def _send_request(self, request, headers=None, content=None, **operation_config):
+    def _send_request(self, request, headers=None, content=None, media_type=None, **operation_config):
         """Prepare and send request object according to configuration.
         :param ClientRequest request: The request object to be sent.
         :param dict headers: Any headers to add to the request.
@@ -57,10 +57,13 @@ def _send_request(self, request, headers=None, content=None, **operation_config)
                 or (TRACE_ENV_VAR_COMPAT in os.environ and os.environ[TRACE_ENV_VAR_COMPAT] == 'true'):
             print(request.method + ' ' + request.url)
         logger.debug('%s %s', request.method, request.url)
-        logger.debug('Request content: %s', content)
+        if media_type is not None and media_type == 'application/json':
+            logger.debug('Request content: %s', content)
         response = self._client.send(request=request, headers=headers,
                                      content=content, **operation_config)
-        logger.debug('Response content: %s', response.content)
+        if ('Content-Type' in response.headers
+                and response.headers['Content-Type'].startswith('application/json')):
+            logger.debug('Response content: %s', response.content)
         if response.status_code < 200 or response.status_code >= 300:
             self._handle_error(request, response)
         return response
@@ -94,7 +97,7 @@ def _send(self, http_method, location_id, version, route_values=None,
             headers['X-VSS-ForceMsaPassThrough'] = 'true'
         if Client._session_header_key in Client._session_data and Client._session_header_key not in headers:
             headers[Client._session_header_key] = Client._session_data[Client._session_header_key]
-        response = self._send_request(request=request, headers=headers, content=content)
+        response = self._send_request(request=request, headers=headers, content=content, media_type=media_type)
         if Client._session_header_key in response.headers:
             Client._session_data[Client._session_header_key] = response.headers[Client._session_header_key]
         return response

azure-devops/azure/devops/connection.py

@@ -14,7 +14,6 @@
 from .v5_0.client_factory import ClientFactoryV5_0
 from .v5_1.client_factory import ClientFactoryV5_1
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -75,10 +74,25 @@ def _get_url_for_client_instance(self, client_class):
             for resource_area in resource_areas:
                 if resource_area.id.lower() == resource_id.lower():
                     return resource_area.location_url
+
+            # Check SPS deployment level for the resource area
+            resource_area = self._get_deployment_resource_area_from_sps(resource_id)
+            if resource_area is not None:
+                return resource_area.location_url
+
             raise AzureDevOpsClientRequestError(('Could not find information for resource area {id} '
                                                  + 'from server: {url}').format(id=resource_id,
                                                                                 url=self.base_url))
 
+    def _get_deployment_resource_area_from_sps(self, resource_id):
+        resource_id = resource_id.lower()
+        if resource_id in _deployment_level_resource_areas:
+            return _deployment_level_resource_areas[resource_id]
+        location_client = LocationClient(sps_url, self._creds)
+        resource_area = location_client.get_resource_area(area_id=resource_id)
+        _deployment_level_resource_areas[resource_id] = resource_area
+        return resource_area
+
     def authenticate(self):
         self._get_resource_areas(force=True)
 
@@ -110,3 +124,7 @@ def _get_resource_areas(self, force=False):
     @staticmethod
     def _combine_url(part1, part2):
         return part1.rstrip('/') + '/' + part2.strip('/')
+
+
+_deployment_level_resource_areas = {}
+sps_url = 'https://app.vssps.visualstudio.com'

azure-devops/azure/devops/released/profile/profile_client.py

@@ -23,7 +23,7 @@ def __init__(self, base_url=None, creds=None):
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-    resource_area_identifier = None
+    resource_area_identifier = '8ccfef3d-2b87-4e99-8ccb-66e343d2daa8'
 
     def get_profile(self, id, details=None, with_attributes=None, partition=None, core_attributes=None, force_refresh=None):
         """GetProfile.

azure-devops/azure/devops/v5_0/nuget/nuget_client.py

@@ -25,7 +25,7 @@ def __init__(self, base_url=None, creds=None):
 
     resource_area_identifier = 'b3be7473-68ea-4a81-bfc7-9530baaa19ad'
 
-    def download_package(self, feed_id, package_name, package_version, source_protocol_version=None):
+    def download_package(self, feed_id, package_name, package_version, source_protocol_version=None, **kwargs):
         """DownloadPackage.
         [Preview API] Download a package version directly.  This API is intended for manual UI download options, not for programmatic access and scripting.  You may be heavily throttled if accessing this api for scripting purposes.
         :param str feed_id: Name or ID of the feed.
@@ -48,8 +48,13 @@ def download_package(self, feed_id, package_name, package_version, source_protoc
                               location_id='6ea81b8c-7386-490b-a71f-6cf23c80b388',
                               version='5.0-preview.1',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
+                              query_parameters=query_parameters,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def update_package_versions(self, batch_request, feed_id):
         """UpdatePackageVersions.

azure-devops/azure/devops/v5_0/profile/profile_client.py

@@ -23,7 +23,7 @@ def __init__(self, base_url=None, creds=None):
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-    resource_area_identifier = None
+    resource_area_identifier = '8ccfef3d-2b87-4e99-8ccb-66e343d2daa8'
 
     def get_profile(self, id, details=None, with_attributes=None, partition=None, core_attributes=None, force_refresh=None):
         """GetProfile.

azure-devops/azure/devops/v5_1/build/build_client.py

@@ -246,13 +246,14 @@ def get_project_resources(self, project, type=None, id=None):
                               query_parameters=query_parameters)
         return self._deserialize('[DefinitionResourceReference]', self._unwrap_collection(response))
 
-    def list_branches(self, project, provider_name, service_endpoint_id=None, repository=None):
+    def list_branches(self, project, provider_name, service_endpoint_id=None, repository=None, branch_name=None):
         """ListBranches.
         [Preview API] Gets a list of branches for the given source code repository.
         :param str project: Project ID or project name
         :param str provider_name: The name of the source provider.
         :param str service_endpoint_id: If specified, the ID of the service endpoint to query. Can only be omitted for providers that do not use service endpoints, e.g. TFVC or TFGit.
-        :param str repository: If specified, the vendor-specific identifier or the name of the repository to get branches. Can only be omitted for providers that do not support multiple repositories.
+        :param str repository: The vendor-specific identifier or the name of the repository to get branches. Can only be omitted for providers that do not support multiple repositories.
+        :param str branch_name: If supplied, the name of the branch to check for specifically.
         :rtype: [str]
         """
         route_values = {}
@@ -265,6 +266,8 @@ def list_branches(self, project, provider_name, service_endpoint_id=None, reposi
             query_parameters['serviceEndpointId'] = self._serialize.query('service_endpoint_id', service_endpoint_id, 'str')
         if repository is not None:
             query_parameters['repository'] = self._serialize.query('repository', repository, 'str')
+        if branch_name is not None:
+            query_parameters['branchName'] = self._serialize.query('branch_name', branch_name, 'str')
         response = self._send(http_method='GET',
                               location_id='e05d4403-9b81-4244-8763-20fde28d1976',
                               version='5.1-preview.1',

azure-devops/azure/devops/v5_1/build/models.py

@@ -1572,13 +1572,13 @@ def __init__(self, links=None):
 class ReleaseReference(Model):
     """ReleaseReference.
 
-    :param attempt:
+    :param attempt: Number of Release Attempt.
     :type attempt: int
-    :param creation_date:
+    :param creation_date: Release Creation Date.
     :type creation_date: datetime
     :param definition_id: Release definition ID.
     :type definition_id: int
-    :param environment_creation_date:
+    :param environment_creation_date: Environment creation Date.
     :type environment_creation_date: datetime
     :param environment_definition_id: Release environment definition ID.
     :type environment_definition_id: int

azure-devops/azure/devops/v5_1/cix/models.py

@@ -36,20 +36,16 @@ def __init__(self, content=None, is_base64_encoded=None, path=None):
 class CreatedResources(Model):
     """CreatedResources.
 
-    :param error:
-    :type error: str
     :param resources:
     :type resources: dict
     """
 
     _attribute_map = {
-        'error': {'key': 'error', 'type': 'str'},
         'resources': {'key': 'resources', 'type': '{object}'}
     }
 
-    def __init__(self, error=None, resources=None):
+    def __init__(self, resources=None):
         super(CreatedResources, self).__init__()
-        self.error = error
         self.resources = resources
 
 

azure-devops/azure/devops/v5_1/core/__init__.py

@@ -11,6 +11,8 @@
 
 __all__ = [
     'GraphSubjectBase',
+    'Identity',
+    'IdentityBase',
     'IdentityData',
     'IdentityRef',
     'JsonPatchOperation',

azure-devops/azure/devops/v5_1/core/core_client.py

@@ -372,12 +372,13 @@ def get_proxies(self, proxy_url=None):
                               query_parameters=query_parameters)
         return self._deserialize('[Proxy]', self._unwrap_collection(response))
 
-    def get_all_teams(self, mine=None, top=None, skip=None):
+    def get_all_teams(self, mine=None, top=None, skip=None, expand_identity=None):
         """GetAllTeams.
         [Preview API] Get a list of all teams.
-        :param bool mine: If true return all the teams requesting user is member, otherwise return all the teams user has read access
+        :param bool mine: If true, then return all teams requesting user is member. Otherwise return all teams user has read access.
         :param int top: Maximum number of teams to return.
         :param int skip: Number of teams to skip.
+        :param bool expand_identity: A value indicating whether or not to expand Identity information in the result WebApiTeam object.
         :rtype: [WebApiTeam]
         """
         query_parameters = {}
@@ -387,9 +388,11 @@ def get_all_teams(self, mine=None, top=None, skip=None):
             query_parameters['$top'] = self._serialize.query('top', top, 'int')
         if skip is not None:
             query_parameters['$skip'] = self._serialize.query('skip', skip, 'int')
+        if expand_identity is not None:
+            query_parameters['$expandIdentity'] = self._serialize.query('expand_identity', expand_identity, 'bool')
         response = self._send(http_method='GET',
                               location_id='7a4d9ee9-3433-4347-b47a-7a80f1cf307e',
-                              version='5.1-preview.2',
+                              version='5.1-preview.3',
                               query_parameters=query_parameters)
         return self._deserialize('[WebApiTeam]', self._unwrap_collection(response))
 
@@ -406,7 +409,7 @@ def create_team(self, team, project_id):
         content = self._serialize.body(team, 'WebApiTeam')
         response = self._send(http_method='POST',
                               location_id='d30a3dd1-f8ba-442a-b86a-bd0c0c383e59',
-                              version='5.1-preview.2',
+                              version='5.1-preview.3',
                               route_values=route_values,
                               content=content)
         return self._deserialize('WebApiTeam', response)
@@ -424,34 +427,40 @@ def delete_team(self, project_id, team_id):
             route_values['teamId'] = self._serialize.url('team_id', team_id, 'str')
         self._send(http_method='DELETE',
                    location_id='d30a3dd1-f8ba-442a-b86a-bd0c0c383e59',
-                   version='5.1-preview.2',
+                   version='5.1-preview.3',
                    route_values=route_values)
 
-    def get_team(self, project_id, team_id):
+    def get_team(self, project_id, team_id, expand_identity=None):
         """GetTeam.
         [Preview API] Get a specific team.
         :param str project_id: The name or ID (GUID) of the team project containing the team.
         :param str team_id: The name or ID (GUID) of the team.
+        :param bool expand_identity: A value indicating whether or not to expand Identity information in the result WebApiTeam object.
         :rtype: :class:`<WebApiTeam> <azure.devops.v5_1.core.models.WebApiTeam>`
         """
         route_values = {}
         if project_id is not None:
             route_values['projectId'] = self._serialize.url('project_id', project_id, 'str')
         if team_id is not None:
             route_values['teamId'] = self._serialize.url('team_id', team_id, 'str')
+        query_parameters = {}
+        if expand_identity is not None:
+            query_parameters['$expandIdentity'] = self._serialize.query('expand_identity', expand_identity, 'bool')
         response = self._send(http_method='GET',
                               location_id='d30a3dd1-f8ba-442a-b86a-bd0c0c383e59',
-                              version='5.1-preview.2',
-                              route_values=route_values)
+                              version='5.1-preview.3',
+                              route_values=route_values,
+                              query_parameters=query_parameters)
         return self._deserialize('WebApiTeam', response)
 
-    def get_teams(self, project_id, mine=None, top=None, skip=None):
+    def get_teams(self, project_id, mine=None, top=None, skip=None, expand_identity=None):
         """GetTeams.
         [Preview API] Get a list of teams.
         :param str project_id:
-        :param bool mine: If true return all the teams requesting user is member, otherwise return all the teams user has read access
+        :param bool mine: If true return all the teams requesting user is member, otherwise return all the teams user has read access.
         :param int top: Maximum number of teams to return.
         :param int skip: Number of teams to skip.
+        :param bool expand_identity: A value indicating whether or not to expand Identity information in the result WebApiTeam object.
         :rtype: [WebApiTeam]
         """
         route_values = {}
@@ -464,9 +473,11 @@ def get_teams(self, project_id, mine=None, top=None, skip=None):
             query_parameters['$top'] = self._serialize.query('top', top, 'int')
         if skip is not None:
             query_parameters['$skip'] = self._serialize.query('skip', skip, 'int')
+        if expand_identity is not None:
+            query_parameters['$expandIdentity'] = self._serialize.query('expand_identity', expand_identity, 'bool')
         response = self._send(http_method='GET',
                               location_id='d30a3dd1-f8ba-442a-b86a-bd0c0c383e59',
-                              version='5.1-preview.2',
+                              version='5.1-preview.3',
                               route_values=route_values,
                               query_parameters=query_parameters)
         return self._deserialize('[WebApiTeam]', self._unwrap_collection(response))
@@ -487,7 +498,7 @@ def update_team(self, team_data, project_id, team_id):
         content = self._serialize.body(team_data, 'WebApiTeam')
         response = self._send(http_method='PATCH',
                               location_id='d30a3dd1-f8ba-442a-b86a-bd0c0c383e59',
-                              version='5.1-preview.2',
+                              version='5.1-preview.3',
                               route_values=route_values,
                               content=content)
         return self._deserialize('WebApiTeam', response)