fix a couple more spots

Author: laurenyu

src/sagemaker/model_monitor/model_monitoring.py

@@ -324,7 +324,7 @@ def create_monitoring_schedule(
             max_runtime_in_seconds=self.max_runtime_in_seconds,
             environment=self.env,
             network_config=network_config_dict,
-            role_arn=self.role,
+            role_arn=self.sagemaker_session.expand_role(self.role),
             tags=self.tags,
         )
 
@@ -445,7 +445,7 @@ def update_monitoring_schedule(
             self.network_config = network_config
 
         if role is not None:
-            self.role = self.sagemaker_session.expand_role(role)
+            self.role = role
 
         if image_uri is not None:
             self.image_uri = image_uri
@@ -471,7 +471,7 @@ def update_monitoring_schedule(
             max_runtime_in_seconds=max_runtime_in_seconds,
             environment=env,
             network_config=network_config_dict,
-            role_arn=role,
+            role_arn=self.sagemaker_session.expand_role(role),
         )
 
         self._wait_for_schedule_changes_to_apply()
@@ -1285,7 +1285,7 @@ def create_monitoring_schedule(
             max_runtime_in_seconds=self.max_runtime_in_seconds,
             environment=normalized_env,
             network_config=network_config_dict,
-            role_arn=self.role,
+            role_arn=self.sagemaker_session.expand_role(self.role),
             tags=self.tags,
         )
 
@@ -1424,7 +1424,7 @@ def update_monitoring_schedule(
             network_config_dict = self.network_config._to_request_dict()
 
         if role is not None:
-            self.role = self.sagemaker_session.expand_role(role)
+            self.role = role
 
         self.sagemaker_session.update_monitoring_schedule(
             monitoring_schedule_name=self.monitoring_schedule_name,
@@ -1442,7 +1442,7 @@ def update_monitoring_schedule(
             max_runtime_in_seconds=max_runtime_in_seconds,
             environment=normalized_env,
             network_config=network_config_dict,
-            role_arn=role,
+            role_arn=self.sagemaker_session.expand_role(role),
         )
 
         self._wait_for_schedule_changes_to_apply()

tests/integ/test_model_monitor.py

@@ -319,7 +319,7 @@ def test_default_monitor_suggest_baseline_and_create_monitoring_schedule_with_cu
         == volume_kms_key
     )
     assert DEFAULT_IMAGE_SUFFIX in baselining_job_description["AppSpecification"]["ImageUri"]
-    assert baselining_job_description["RoleArn"] == ROLE
+    assert ROLE in baselining_job_description["RoleArn"]
     assert (
         baselining_job_description["ProcessingInputs"][0]["InputName"] == "baseline_dataset_input"
     )
@@ -496,7 +496,7 @@ def test_default_monitor_suggest_baseline_and_create_monitoring_schedule_without
         is None
     )
     assert DEFAULT_IMAGE_SUFFIX in baselining_job_description["AppSpecification"]["ImageUri"]
-    assert baselining_job_description["RoleArn"] == ROLE
+    assert ROLE in baselining_job_description["RoleArn"]
     assert (
         baselining_job_description["ProcessingInputs"][0]["InputName"] == "baseline_dataset_input"
     )
@@ -1528,7 +1528,7 @@ def test_byoc_monitor_suggest_baseline_and_create_monitoring_schedule_with_custo
         == volume_kms_key
     )
     assert DEFAULT_IMAGE_SUFFIX in baselining_job_description["AppSpecification"]["ImageUri"]
-    assert baselining_job_description["RoleArn"] == ROLE
+    assert ROLE in baselining_job_description["RoleArn"]
     assert baselining_job_description["ProcessingInputs"][0]["InputName"] == "input-1"
     assert (
         baselining_job_description["ProcessingOutputConfig"]["Outputs"][0]["OutputName"]
@@ -1727,7 +1727,7 @@ def test_byoc_monitor_suggest_baseline_and_create_monitoring_schedule_without_cu
         is None
     )
     assert DEFAULT_IMAGE_SUFFIX in baselining_job_description["AppSpecification"]["ImageUri"]
-    assert baselining_job_description["RoleArn"] == ROLE
+    assert ROLE in baselining_job_description["RoleArn"]
     assert baselining_job_description["ProcessingInputs"][0]["InputName"] == "input-1"
     assert (
         baselining_job_description["ProcessingOutputConfig"]["Outputs"][0]["OutputName"]
@@ -2185,7 +2185,7 @@ def test_byoc_monitor_attach_followed_by_baseline_and_update_monitoring_schedule
         == volume_kms_key
     )
     assert DEFAULT_IMAGE_SUFFIX in baselining_job_description["AppSpecification"]["ImageUri"]
-    assert baselining_job_description["RoleArn"] == ROLE
+    assert ROLE in baselining_job_description["RoleArn"]
     assert baselining_job_description["ProcessingInputs"][0]["InputName"] == "input-1"
     assert (
         baselining_job_description["ProcessingOutputConfig"]["Outputs"][0]["OutputName"]