For #8724, bootstap hook from basic config

Author: gplsteph

hooks/core/bootstrap.py

@@ -54,11 +54,7 @@ def can_cache_bundle(self, descriptor):
         :raises RuntimeError: If six.moves is not available.
         """
         descd = descriptor.get_dict()
-        # Some descriptors like shotgun descriptors don't have a path: ignore
-        # them.
-        if not descd.get("path"):
-            return False
-        return bool(self._should_download_release(descd["path"]))
+        return bool(self._should_download_release(descd))
 
     def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
         """
@@ -92,7 +88,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
         descd = descriptor.get_dict()
         version = descriptor.version
         self.logger.info("Treating %s" % descd)
-        specs = self._should_download_release(descd["path"])
+        specs = self._should_download_release(descd)
         if not specs:
             raise RuntimeError("Don't know how to download %s" % descd)
         name = specs[0]
@@ -142,7 +138,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             for asset in response_d["assets"]:
                 name = asset["name"]
                 m = re.match(
-                    r"%s-py\d.\d-%s.zip" % (version, pname),
+                    "%s-py\d.\d-%s.zip" % (version, pname),
                     name
                 )
                 if m:
@@ -171,17 +167,28 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             self.logger.exception(e)
             raise
 
-    def _should_download_release(self, desc_path):
+    def _should_download_release(self, desc):
         """
-        Return a repo name and a token if the given descriptor path should be downloaded
+        Return a repo name and a token if the given descriptor should be downloaded
         from a github release.
 
-        :param str desc_path: A Toolkit descriptor path.
+        :param str desc: A Toolkit descriptor.
         :returns: A name, token tuple or ``None``.
         """
-        for name, token in self._download_release_from_github:
-            if "[email protected]:%s.git" % name == desc_path:
-                return name, token
+        if desc["type"] == "github_release":
+            # Let's be safe...
+            if not desc.get("organization") or not desc.get("repository"):
+                return None
+            desc_path = "%s/%s" % (desc["organization"], desc["repository"])
+            for name, token in self._download_release_from_github:
+                if name == desc_path:
+                    return name, token
+        elif desc.get("path"):
+            # Check the path for a git descriptor
+            desc_path = desc["path"]
+            for name, token in self._download_release_from_github:
+                if "[email protected]:%s.git" % name == desc_path:
+                    return name, token
         return None
 
     def _download_zip_github_asset(self, asset, destination, token):