fix(crons): allow team and user names to be used in checkin payload

Author: klochek

src/sentry/types/actor.py

@@ -166,18 +166,23 @@ def from_identifier(cls, id: None) -> None: ...
     def from_identifier(cls, id: int | str) -> "Actor": ...
 
     @classmethod
-    def from_identifier(cls, id: str | int | None) -> "Actor | None":
+    def from_identifier(
+        cls, id: str | int | None, organization_id: int | None = None
+    ) -> "Actor | None":
         """
         Parse an actor identifier into an Actor
 
         Forms `id` can take:
             1231 -> look up User by id
             "1231" -> look up User by id
             "user:1231" -> look up User by id
+            "user:maiseythedog" -> look up user by username
             "team:1231" -> look up Team by id
+            "team:team-name" -> look up Team by name (must provide organization_id)
             "maiseythedog" -> look up User by username
             "[email protected]" -> look up User by primary email
         """
+        from sentry.models.team import Team
         from sentry.users.services.user.service import user_service
 
         if not id:
@@ -192,10 +197,23 @@ def from_identifier(cls, id: str | int | None) -> "Actor | None":
             return cls(id=int(id), actor_type=ActorType.USER)
 
         if id.startswith("user:"):
-            return cls(id=int(id[5:]), actor_type=ActorType.USER)
+            remainder = id[5:]
+            if remainder.isdigit():
+                return cls(id=int(remainder), actor_type=ActorType.USER)
+            # pass this on to get to the user lookup below
+            id = remainder
 
         if id.startswith("team:"):
-            return cls(id=int(id[5:]), actor_type=ActorType.TEAM)
+            remainder = id[5:]
+            if remainder.isnumeric():
+                return cls(id=int(remainder), actor_type=ActorType.TEAM)
+
+            if organization_id is not None:
+                team = Team.objects.filter(name=remainder, organization_id=organization_id)
+                if team.exists():
+                    return cls(id=team.first().id, actor_type=ActorType.TEAM)
+
+            raise cls.InvalidActor(f"Unable to resolve team name: {remainder}")
 
         try:
             user = user_service.get_by_username(username=id)[0]
@@ -280,7 +298,7 @@ def parse_and_validate_actor(actor_identifier: str | None, organization_id: int)
         return None
 
     try:
-        actor = Actor.from_identifier(actor_identifier)
+        actor = Actor.from_identifier(actor_identifier, organization_id)
     except Exception:
         raise serializers.ValidationError(
             "Could not parse actor. Format should be `type:id` where type is `team` or `user`."

tests/sentry/monitors/consumers/test_monitor_consumer.py

@@ -940,6 +940,49 @@ def test_monitor_upsert_empty_timezone(self):
         assert monitor is not None
         assert "timezone" not in monitor.config
 
+    def test_team_name_as_owner(self):
+        monitor = self._create_monitor(slug="my-monitor", owner_user_id=self.user.id)
+        self.send_checkin(
+            "my-monitor",
+            monitor_config={
+                "schedule": {"type": "crontab", "value": "13 * * * *"},
+                "owner": f"team:{self.team.name}",
+            },
+        )
+        checkin = MonitorCheckIn.objects.get(guid=self.guid)
+        assert checkin.status == CheckInStatus.OK
+
+        monitor_environment = MonitorEnvironment.objects.get(id=checkin.monitor_environment.id)
+        assert monitor_environment.status == MonitorStatus.OK
+        monitor.refresh_from_db()
+        assert monitor.owner_user_id is None
+        assert monitor.owner_team_id == self.team.id
+
+    def test_user_name_as_owner(self):
+        named_user = self.create_user(
+            "admin2@localhost",
+            username="test_user",
+            is_superuser=True,
+            is_staff=True,
+            is_sentry_app=False,
+        )
+        monitor = self._create_monitor(slug="my-monitor", owner_user_id=named_user.id)
+
+        self.send_checkin(
+            "my-monitor",
+            monitor_config={
+                "schedule": {"type": "crontab", "value": "13 * * * *"},
+                "owner": f"user:{named_user.username}",
+            },
+        )
+        checkin = MonitorCheckIn.objects.get(guid=self.guid)
+        assert checkin.status == CheckInStatus.OK
+
+        monitor_environment = MonitorEnvironment.objects.get(id=checkin.monitor_environment.id)
+        assert monitor_environment.status == MonitorStatus.OK
+        assert monitor.owner_user_id == named_user.id
+        assert monitor.owner_team_id is None
+
     def test_monitor_upsert_invalid_slug(self):
         self.send_checkin(
             "some/slug@with-weird|stuff",