Fix tests

Author: armenzg

src/sentry/integrations/github/client.py

@@ -190,7 +190,7 @@ def _populate_trees(self, repositories: List[Dict[str, str]]) -> Dict[str, RepoT
         This function takes API rate limits into consideration to prevent exhaustion.
         """
 
-        def process_error(error: Exception, extra: Dict[str, str]):
+        def process_error(error: ApiError, extra: Dict[str, str]) -> None:
             msg = "Continuing exectuion."
             txt = error.text
             if error.json:
@@ -234,8 +234,11 @@ def process_error(error: Exception, extra: Dict[str, str]):
                 trees[repo_full_name] = self._populate_tree(
                     repo_info, only_use_cache, (3600 * 24) + (3600 * (index % 24))
                 )
-            except Exception as error:
+            except ApiError as error:
                 process_error(error, extra)
+            except Exception as error:
+                # Report for investigatagiation but do not stop processing
+                logger.exception(error, extra=extra)
 
             remaining_requests -= 1
 

src/sentry/tasks/derive_code_mappings.py

@@ -15,7 +15,9 @@
 from sentry.models.organization import Organization
 from sentry.models.repository import Repository
 from sentry.services.hybrid_cloud.integration import APIOrganizationIntegration, integration_service
+from sentry.shared_integrations.exceptions.base import ApiError
 from sentry.tasks.base import instrumented_task
+from sentry.utils.json import JSONData
 from sentry.utils.locking import UnableToAcquireLock
 from sentry.utils.safe import get_path
 
@@ -77,17 +79,23 @@ def derive_code_mappings(
         with lock.acquire():
             # This method is specific to the GithubIntegration
             trees = installation.get_trees_for_org()  # type: ignore
-
+    except ApiError as error:
+        msg = error.text
+        if error.json:
+            json_data: JSONData = error.json
+            msg = json_data.get("message")
+        extra["error"] = msg
+
+        if msg == "Not Found":
+            logger.warning("The org has uninstalled the Sentry App.", extra=extra)
+            return
+
+        raise error  # Let's report the issue
     except UnableToAcquireLock as error:
         extra["error"] = error
         logger.warning("derive_code_mappings.getting_lock_failed", extra=extra)
         # This will cause the auto-retry logic to try again
         raise error
-    except Exception:
-        # Investigate in order to determine if we should retry the task
-        # or catch it within get_trees_for_org
-        logger.exception("Failed to get trees for org. Investigate.", extra=extra)
-        return
 
     if not trees:
         logger.error("The tree is empty. Investigate.")

tests/sentry/integrations/github/test_integration.py

@@ -611,11 +611,8 @@ def test_get_trees_for_org_works(self):
         installation = self.get_installation_helper()
         self.set_rate_limit(MINIMUM_REQUESTS + 50)
         expected_trees = {
-            "Test-Organization/bar": RepoTree(Repo("Test-Organization/bar", "main"), []),
-            "Test-Organization/baz": RepoTree(Repo("Test-Organization/baz", "master"), []),
             "Test-Organization/foo": RepoTree(
-                Repo("Test-Organization/foo", "master"),
-                ["src/sentry/api/endpoints/auth_login.py"],
+                Repo("Test-Organization/foo", "master"), ["src/sentry/api/endpoints/auth_login.py"]
             ),
             "Test-Organization/xyz": RepoTree(
                 Repo("Test-Organization/xyz", "master"), ["src/foo.py"]
@@ -647,6 +644,7 @@ def test_get_trees_for_org_prevent_exhaustion_some_repos(self):
         """Some repos will hit the network but the rest will grab from the cache."""
         gh_org = "Test-Organization"
         installation = self.get_installation_helper()
+
         expected_trees = {
             f"{gh_org}/xyz": RepoTree(Repo(f"{gh_org}/xyz", "master"), ["src/foo.py"]),
             # This will have no files because we will hit the minimum remaining requests floor
@@ -668,8 +666,10 @@ def test_get_trees_for_org_prevent_exhaustion_some_repos(self):
             # We reset the remaining values
             self.set_rate_limit(remaining=20)
             trees = installation.get_trees_for_org()
-            # Now that the rate limit is reset we should get files for foo
-            expected_trees[f"{gh_org}/foo"] = RepoTree(
-                Repo(f"{gh_org}/foo", "master"), ["src/sentry/api/endpoints/auth_login.py"]
-            )
-            assert trees == expected_trees
+            assert trees == {
+                f"{gh_org}/xyz": RepoTree(Repo(f"{gh_org}/xyz", "master"), ["src/foo.py"]),
+                # Now that the rate limit is reset we should get files for foo
+                f"{gh_org}/foo": RepoTree(
+                    Repo(f"{gh_org}/foo", "master"), ["src/sentry/api/endpoints/auth_login.py"]
+                ),
+            }