Merge pull request #11 from Microsoft/users/tedchamb/initial

better error message when we can't retrieve resource areas.

Author: tedchamb

vsts/vsts/git/v4_0/git_client.py

@@ -30,3 +30,15 @@ def get_vsts_info(self, relative_remote_url):
         response = self._send_request(request, headers)
         return self._deserialize('VstsInfo', response)
 
+    @staticmethod
+    def get_vsts_info_by_remote_url(remote_url, credentials, suppress_fedauth_redirect=True):
+        request = ClientRequest()
+        request.url = remote_url.rstrip('/') + '/vsts/info'
+        request.method = 'GET'
+        headers = {'Accept': 'application/json'}
+        if suppress_fedauth_redirect:
+            headers['X-TFS-FedAuthRedirect'] = 'Suppress'
+        git_client = GitClient(base_url=remote_url, creds=credentials)
+        response = git_client._send_request(request, headers)
+        return git_client._deserialize('VstsInfo', response)
+

vsts/vsts/vss_client.py

@@ -47,7 +47,7 @@ def _send_request(self, request, headers=None, content=None, **operation_config)
         :param content: Any body data to add to the request.
         :param config: Any specific config overrides
         """
-        if self._trace_env_var in os.environ and os.environ[self._trace_env_var] == 'true':
+        if TRACE_ENV_VAR in os.environ and os.environ[TRACE_ENV_VAR] == 'true':
             print(request.method + ' ' + request.url)
         response = self._client.send(request=request, headers=headers,
                                      content=content, **operation_config)
@@ -235,12 +235,11 @@ def _handle_error(self, request, response):
 
     @staticmethod
     def _normalize_url(url):
-        if url.endswith("/"):
-            url = url[:-1]
-        url = url.lower()
-        return url
+        return url.rstrip('/').lower()
 
     _locations_cache = {}
-    _trace_env_var = 'vsts_python_print_urls'
     _session_header_key = 'X-TFS-Session'
     _session_data = {_session_header_key: str(uuid.uuid4())}
+
+
+TRACE_ENV_VAR = 'vsts_python_print_urls'

vsts/vsts/vss_connection.py

@@ -56,10 +56,16 @@ def _get_url_for_client_instance(self, client_class):
             return self.base_url
         else:
             resource_areas = self._get_resource_areas()
+            if resource_areas is None:
+                raise VstsClientRequestError(('Failed to retrieve resource areas '
+                                              + 'from server: {url}').format(url=self.base_url))
+            if len(resource_areas) == 0:
+                # For OnPrem environments we get an empty list.
+                return self.base_url
             for resource_area in resource_areas:
                 if resource_area.id.lower() == resource_id.lower():
                     return resource_area.location_url
-            raise VstsClientRequestError(('Could not find information for resource area {id}'
+            raise VstsClientRequestError(('Could not find information for resource area {id} '
                                           + 'from server: {url}').format(id=resource_id,
                                                                          url=self.base_url))
 
@@ -80,8 +86,12 @@ def _get_resource_areas(self, force=False):
             elif not force:
                 logging.info('File cache miss for resources on: %s', location_client.normalized_url)
             self._resource_areas = location_client.get_resource_areas()
+            if self._resource_areas is None:
+                # For OnPrem environments we get an empty collection wrapper.
+                self._resource_areas = []
             try:
-                serialized = location_client._base_serialize.serialize_data(self._resource_areas, '[ResourceAreaInfo]')
+                serialized = location_client._base_serialize.serialize_data(self._resource_areas,
+                                                                            '[ResourceAreaInfo]')
                 RESOURCE_FILE_CACHE[location_client.normalized_url] = serialized
             except Exception as ex:
                 logging.exception(str(ex))