fix(free-tier): replace regionID with provider_region

Author: Pedro Rodrigues

singlestoredb/management/cluster.py

@@ -390,7 +390,7 @@ def create_cluster(
         :class:`Cluster`
 
         """
-        if isinstance(region, Region):
+        if isinstance(region, Region) and region.id:
             region = region.id
         res = self._post(
             'clusters', json=dict(

singlestoredb/management/region.py

@@ -21,9 +21,12 @@ class Region(object):
 
     """
 
-    def __init__(self, id: str, name: str, provider: str):
+    def __init__(
+        self, name: str, provider: str, id: Optional[str] = None,
+        provider_region: Optional[str] = None,
+    ) -> None:
         """Use :attr:`WorkspaceManager.regions` instead."""
-        #: Unique ID of the region
+        #: Unique identifier of the region
         self.id = id
 
         #: Name of the region
@@ -32,6 +35,9 @@ def __init__(self, id: str, name: str, provider: str):
         #: Name of the cloud provider
         self.provider = provider
 
+        #: Name of the provider region
+        self.provider_region = provider_region
+
         self._manager: Optional[Manager] = None
 
     def __str__(self) -> str:
@@ -59,10 +65,14 @@ def from_dict(cls, obj: Dict[str, str], manager: Manager) -> 'Region':
         :class:`Region`
 
         """
+        id = obj.get('regionID', None)
+        provider_region = obj.get('regionName', None)
+
         out = cls(
-            id=obj['regionID'],
+            id=id,
             name=obj['region'],
             provider=obj['provider'],
+            provider_region=provider_region,
         )
         out._manager = manager
         return out

singlestoredb/management/workspace.py

@@ -1715,7 +1715,7 @@ def create_workspace_group(
         :class:`WorkspaceGroup`
 
         """
-        if isinstance(region, Region):
+        if isinstance(region, Region) and region.id:
             region = region.id
         res = self._post(
             'workspaceGroups', json=dict(

singlestoredb/tests/test_management.py

@@ -1528,14 +1528,6 @@ def test_list_regions(self):
         providers = {x.provider for x in regions}
         assert 'Azure' in providers or 'GCP' in providers or 'AWS' in providers
 
-        # Verify region can be accessed by name or ID
-        region_by_name = regions[region.name]
-        region_by_id = regions[region.id]
-        assert region_by_name == region_by_id
-        assert region_by_name.id == region.id
-        assert region_by_name.name == region.name
-        assert region_by_name.provider == region.provider
-
     def test_list_shared_tier_regions(self):
         """Test listing shared tier regions."""
         regions = self.manager.list_shared_tier_regions()
@@ -1547,22 +1539,14 @@ def test_list_shared_tier_regions(self):
         if regions:
             region = regions[0]
             assert isinstance(region, Region)
-            assert hasattr(region, 'id')
             assert hasattr(region, 'name')
             assert hasattr(region, 'provider')
+            assert hasattr(region, 'provider_region')
 
             # Verify provider values
             providers = {x.provider for x in regions}
             assert any(p in providers for p in ['Azure', 'GCP', 'AWS'])
 
-            # Verify region can be accessed by name or ID
-            region_by_name = regions[region.name]
-            region_by_id = regions[region.id]
-            assert region_by_name == region_by_id
-            assert region_by_name.id == region.id
-            assert region_by_name.name == region.name
-            assert region_by_name.provider == region.provider
-
     def test_str_repr(self):
         """Test string representation of regions."""
         regions = self.manager.list_regions()