feat(crons): Allow specifying checkin environment (#1599)

src/api.rs

@@ -2490,11 +2490,13 @@ pub struct MonitorCheckIn {
     pub id: Uuid,
     pub status: Option<MonitorCheckinStatus>,
     pub duration: Option<u64>,
+    pub environment: Option<String>,
 }
 
 #[derive(Debug, Serialize)]
 pub struct CreateMonitorCheckIn {
     pub status: MonitorCheckinStatus,
+    pub environment: String,
 }
 
 #[derive(Debug, Serialize, Default)]
@@ -2503,6 +2505,8 @@ pub struct UpdateMonitorCheckIn {
     pub status: Option<MonitorCheckinStatus>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub duration: Option<u64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub environment: Option<String>,
 }
 
 #[derive(Deserialize, Debug)]

src/commands/monitors/run.rs

@@ -19,6 +19,12 @@ pub fn make_command(command: Command) -> Command {
                 .help("The monitor slug.")
                 .required(true),
         )
+        .arg(
+            Arg::new("environment")
+                .short('e')
+                .default_value("production")
+                .help("Specify the environment of the monitor."),
+        )
         .arg(
             Arg::new("allow_failure")
                 .short('f')
@@ -47,6 +53,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     }
 
     let monitor_slug = matches.get_one::<String>("monitor_slug").unwrap();
+    let environment = matches.get_one::<String>("environment").unwrap();
 
     let allow_failure = matches.get_flag("allow_failure");
     let args: Vec<_> = matches.get_many::<String>("args").unwrap().collect();
@@ -56,6 +63,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         monitor_slug,
         &CreateMonitorCheckIn {
             status: MonitorCheckinStatus::InProgress,
+            environment: environment.to_string(),
         },
     );
 
@@ -93,6 +101,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                         let elapsed = started.elapsed();
                         elapsed.as_secs() * 1000 + u64::from(elapsed.subsec_millis())
                     }),
+                    environment: Some(environment.to_string()),
                 },
             )
             .ok();

tests/integration/_cases/monitors/monitors-run-environment.trycmd

@@ -0,0 +1,6 @@
+```
+$ sentry-cli monitors run -e dev-env foo-monitor -- echo 123
+? success
+123
+
+```

tests/integration/_cases/monitors/monitors-run-help.trycmd

@@ -10,6 +10,7 @@ Arguments:
   <ARGS>...       
 
 Options:
+  -e <environment>               Specify the environment of the monitor. [default: production]
   -f, --allow-failure            Run provided command even when Sentry reports an error.
       --header <KEY:VALUE>       Custom headers that should be attached to all requests
                                  in key:value format.

tests/integration/_responses/monitors/post-monitors-environment.json

@@ -0,0 +1,6 @@
+{
+  "id": "85a34e5a-c0b6-11ec-9d64-0242ac120002",
+  "duration": 1337,
+  "environment": "dev-env",
+  "status": "in_progress"
+}

tests/integration/_responses/monitors/post-monitors.json

@@ -1,5 +1,6 @@
 {
   "id": "85a34e5a-c0b6-11ec-9d64-0242ac120002",
   "duration": 1337,
+  "environment": "production",
   "status": "in_progress"
 }

tests/integration/monitors/run.rs

@@ -28,12 +28,21 @@ fn command_monitors_run_token_auth() {
 }
 
 #[test]
-fn command_monitors_run_env() {
+fn command_monitors_run_osenv() {
     let _server = mock_endpoint(
         EndpointOptions::new("POST", "/api/0/monitors/foo-monitor/checkins/", 200)
             .with_response_file("monitors/post-monitors.json"),
     );
-    register_test("monitors/monitors-run-env.trycmd");
+    register_test("monitors/monitors-run-osenv.trycmd");
+}
+
+#[test]
+fn command_monitors_run_environment() {
+    let _server = mock_endpoint(
+        EndpointOptions::new("POST", "/api/0/monitors/foo-monitor/checkins/", 200)
+            .with_response_file("monitors/post-monitors-environment.json"),
+    );
+    register_test("monitors/monitors-run-environment.trycmd");
 }
 
 #[test]