region derivation logic consistent across primitives

Author: “Sundar”

src/bedrock_agentcore/memory/client.py

@@ -44,9 +44,9 @@ def __init__(self, region_name: Optional[str] = None):
         self.gmdp_client = boto3.client("bedrock-agentcore", region_name=region_name)
 
         # Store the region that was actually used
-        self.region_name = self.gmcp_client.meta.region_name
+        self.region_name = region_name if region_name else boto3.Session().region_name or "us-west-2"
 
-        logger.info("Initialized MemoryClient for %s", region_name)
+        logger.info("Initialized MemoryClient for %s", self.region_name)
 
     def create_memory(
         self,

tests/bedrock_agentcore/memory/test_client.py

@@ -30,24 +30,30 @@ def test_client_initialization_region_mismatch():
     """Test client initialization with region mismatch warning."""
 
     with patch("boto3.client") as mock_boto_client:
-        # First mock a default region when none is specified
-        mock_client_instance = MagicMock()
-        mock_client_instance.meta.region_name = "us-east-1"
-        mock_boto_client.return_value = mock_client_instance
-
-        # When region_name is not provided, it should use the boto3 default
-        client1 = MemoryClient()
-        assert client1.region_name == "us-east-1"
-
-        # Reset the mock to test with a specified region
-        mock_boto_client.reset_mock()
-        mock_client_instance = MagicMock()
-        mock_client_instance.meta.region_name = "us-west-2"
-        mock_boto_client.return_value = mock_client_instance
-
-        # When region_name is provided, it should use that value
-        client2 = MemoryClient(region_name="us-west-2")
-        assert client2.region_name == "us-west-2"
+        with patch("boto3.Session") as mock_session:
+            # Mock the session instance
+            mock_session_instance = MagicMock()
+            mock_session_instance.region_name = "us-east-1"
+            mock_session.return_value = mock_session_instance
+
+            # Mock the boto client
+            mock_client_instance = MagicMock()
+            mock_client_instance.meta.region_name = "us-east-1"
+            mock_boto_client.return_value = mock_client_instance
+
+            # When region_name is not provided, it should use the boto3 default
+            client1 = MemoryClient()
+            assert client1.region_name == "us-east-1"
+
+            # Reset the mock to test with a specified region
+            mock_boto_client.reset_mock()
+            mock_client_instance = MagicMock()
+            mock_client_instance.meta.region_name = "us-west-2"
+            mock_boto_client.return_value = mock_client_instance
+
+            # When region_name is provided, it should use that value
+            client2 = MemoryClient(region_name="us-west-2")
+            assert client2.region_name == "us-west-2"
 
 
 def test_namespace_defaults():