Merge remote-tracking branch 'upstream/master' into js-model-builder-fast-follow

Author: EC2 Default User

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v2.200.1 (2023-12-14)
+
+### Bug Fixes and Other Changes
+
+ * Merge branch 'master-rba' into local_merge
+ * Fix user agent tag issue
+ * update image_uri_configs  12-13-2023 14:04:54 PST
+ * update image_uri_configs  12-13-2023 12:23:06 PST
+
 ## v2.200.0 (2023-12-13)
 
 ### Deprecations and Removals

VERSION

@@ -1 +1 @@
-2.200.1.dev0
+2.200.2.dev0

src/sagemaker/estimator.py

@@ -578,6 +578,17 @@ def __init__(
         self.dependencies = dependencies or []
         self.uploaded_code: Optional[UploadedCode] = None
 
+        # Check that the user properly sets both subnet and secutiry_groupe_ids
+        if (
+            subnets is not None
+            and security_group_ids is None
+            or security_group_ids is not None
+            and subnets is None
+        ):
+            raise RuntimeError(
+                "When setting up custom VPC, both subnets and security_group_ids must be set"
+            )
+
         if self.instance_type in ("local", "local_gpu"):
             if self.instance_type == "local_gpu" and self.instance_count > 1:
                 raise RuntimeError("Distributed Training in Local GPU is not supported")