fixes from review

Author: cathteng

src/sentry/api/endpoints/integrations/organization_integrations/details.py

@@ -118,9 +118,7 @@ def post(
         )
         try:
             installation.update_organization_config(request.data)
-        except IntegrationError as e:
-            return self.respond({"detail": [str(e)]}, status=400)
-        except ApiError as e:
+        except (IntegrationError, ApiError) as e:
             return self.respond({"detail": [str(e)]}, status=400)
 
         return self.respond(status=200)

src/sentry/integrations/opsgenie/client.py

@@ -32,8 +32,8 @@ def metadata(self):
     def _get_auth_headers(self):
         return {"Authorization": f"GenieKey {self.integration_key}"}
 
-    def get_teams(self) -> BaseApiResponseX:
-        path = "/teams"
+    def get_alerts(self, limit: int | None = 1) -> BaseApiResponseX:
+        path = f"/alerts?limit={limit}"
         return self.get(path=path, headers=self._get_auth_headers())
 
     def authorize_integration(self, type: str) -> BaseApiResponseX:

src/sentry/integrations/opsgenie/integration.py

@@ -179,6 +179,7 @@ def update_organization_config(self, data: MutableMapping[str, Any]) -> None:
                 raise ValidationError({"duplicate_name": ["Duplicate team name."]})
             team["id"] = str(self.org_integration.id) + "-" + team["team"]
 
+        invalid_keys = []
         for team in teams:
             # skip if team, key pair already exist in config
             if (team["team"], team["integration_key"]) in existing_team_key_pairs:
@@ -193,7 +194,7 @@ def update_organization_config(self, data: MutableMapping[str, Any]) -> None:
             )
             # call an API to test the integration key
             try:
-                client.get_teams()
+                client.get_alerts()
             except ApiError as e:
                 logger.info(
                     "opsgenie.authorization_error",
@@ -204,11 +205,15 @@ def update_organization_config(self, data: MutableMapping[str, Any]) -> None:
                         "Too many requests. Please try updating one team/key at a time."
                     )
                 elif e.code == 401:
-                    raise ApiUnauthorized(f"Invalid integration key {integration_key}")
-
-                if e.json and e.json.get("message"):
+                    invalid_keys.append(integration_key)
+                    pass
+                elif e.json and e.json.get("message"):
                     raise ApiError(e.json["message"])
-                raise
+                else:
+                    raise
+
+        if invalid_keys:
+            raise ApiUnauthorized(f"Invalid integration key: {str(invalid_keys)}")
 
         return super().update_organization_config(data)
 

tests/sentry/integrations/opsgenie/test_integration.py

@@ -135,7 +135,9 @@ def test_update_config_valid(self):
         integration = Integration.objects.get(provider=self.provider.key)
         org_integration = OrganizationIntegration.objects.get(integration_id=integration.id)
 
-        responses.add(responses.GET, url="https://api.opsgenie.com/v2/teams", status=200, json={})
+        responses.add(
+            responses.GET, url="https://api.opsgenie.com/v2/alerts?limit=1", status=200, json={}
+        )
 
         data = {"team_table": [{"id": "", "team": "cool-team", "integration_key": "1234-5678"}]}
         installation.update_organization_config(data)
@@ -156,7 +158,9 @@ def test_update_config_invalid(self):
         org_integration = OrganizationIntegration.objects.get(integration_id=integration.id)
         team_id = str(org_integration.id) + "-" + "cool-team"
 
-        responses.add(responses.GET, url="https://api.opsgenie.com/v2/teams", status=200, json={})
+        responses.add(
+            responses.GET, url="https://api.opsgenie.com/v2/alerts?limit=1", status=200, json={}
+        )
 
         # valid
         data = {"team_table": [{"id": "", "team": "cool-team", "integration_key": "1234"}]}
@@ -192,7 +196,7 @@ def test_update_config_invalid_rate_limited(self):
                 {"id": "cool-team", "team": "cool-team", "integration_key": "1234"},
             ]
         }
-        responses.add(responses.GET, url="https://api.opsgenie.com/v2/teams", status=429)
+        responses.add(responses.GET, url="https://api.opsgenie.com/v2/alerts?limit=1", status=429)
 
         with pytest.raises(ApiRateLimitedError):
             installation.update_organization_config(data)
@@ -211,7 +215,7 @@ def test_update_config_invalid_integration_key(self):
                 {"id": "", "team": "rad-team", "integration_key": "4321"},
             ]
         }
-        responses.add(responses.GET, url="https://api.opsgenie.com/v2/teams", status=401)
+        responses.add(responses.GET, url="https://api.opsgenie.com/v2/alerts?limit=1", status=401)
 
         with pytest.raises(ApiUnauthorized):
             installation.update_organization_config(data)