ref(hybrid-cloud): fix monitor urls using organization_slug (#42825)

Author: cathteng

src/sentry/api/urls.py

@@ -695,18 +695,26 @@
                     MonitorStatsEndpoint.as_view(),
                     name="sentry-api-0-monitor-stats",
                 ),
+            ]
+        ),
+    ),
+    # TODO: include in the /organizations/ route tree + remove old dupes once hybrid cloud launches
+    url(
+        r"^organizations/(?P<organization_slug>[^\/]+)/monitors/",
+        include(
+            [
                 url(
-                    r"^(?P<organization_slug>[^\/]+)/(?P<monitor_id>[^\/]+)/$",
+                    r"^(?P<monitor_id>[^\/]+)/$",
                     MonitorDetailsEndpoint.as_view(),
                     name="sentry-api-0-monitor-details-with-org",
                 ),
                 url(
-                    r"^(?P<organization_slug>[^\/]+)/(?P<monitor_id>[^\/]+)/checkins/$",
+                    r"^(?P<monitor_id>[^\/]+)/checkins/$",
                     MonitorCheckInsEndpoint.as_view(),
                     name="sentry-api-0-monitor-check-in-index-with-org",
                 ),
                 url(
-                    r"^(?P<organization_slug>[^\/]+)/(?P<monitor_id>[^\/]+)/stats/$",
+                    r"^(?P<monitor_id>[^\/]+)/stats/$",
                     MonitorStatsEndpoint.as_view(),
                     name="sentry-api-0-monitor-stats-with-org",
                 ),

tests/sentry/api/endpoints/test_monitor_checkins.py

@@ -174,7 +174,7 @@ def test_with_dsn_auth_invalid_project(self):
 
     def test_mismatched_org_slugs(self):
         monitor = self._create_monitor()
-        path = f"/api/0/monitors/asdf/{monitor.guid}/checkins/"
+        path = f"/api/0/organizations/asdf/monitors/{monitor.guid}/checkins/"
         self.login_as(user=self.user)
 
         resp = self.client.post(path)

tests/sentry/api/endpoints/test_monitor_details.py

@@ -24,7 +24,7 @@ def test_simple(self):
 
     def test_mismatched_org_slugs(self):
         monitor = self._create_monitor()
-        path = f"/api/0/monitors/asdf/{monitor.guid}/"
+        path = f"/api/0/organizations/asdf/monitors/{monitor.guid}/"
         self.login_as(user=self.user)
 
         resp = self.client.get(path)
@@ -230,7 +230,7 @@ def test_cronjob_interval_invalid_inteval(self):
 
     def test_mismatched_org_slugs(self):
         monitor = self._create_monitor()
-        path = f"/api/0/monitors/asdf/{monitor.guid}/"
+        path = f"/api/0/organizations/asdf/monitors/{monitor.guid}/"
         self.login_as(user=self.user)
 
         resp = self.client.put(
@@ -267,7 +267,7 @@ def test_simple(self):
 
     def test_mismatched_org_slugs(self):
         monitor = self._create_monitor()
-        path = f"/api/0/monitors/asdf/{monitor.guid}/"
+        path = f"/api/0/organizations/asdf/monitors/{monitor.guid}/"
         self.login_as(user=self.user)
 
         resp = self.client.delete(path)