fix: change instance type endpoint (#174)

* change instance type endpoint

* remove old url

Author: stepansergeevitch

src/firebolt/service/instance_type.py

@@ -3,7 +3,7 @@
 from firebolt.model.instance_type import InstanceType, InstanceTypeKey
 from firebolt.model.region import Region
 from firebolt.service.base import BaseService
-from firebolt.utils.urls import INSTANCE_TYPES_URL
+from firebolt.utils.urls import ACCOUNT_INSTANCE_TYPES_URL
 from firebolt.utils.util import cached_property
 
 
@@ -19,7 +19,10 @@ class InstanceTypeService(BaseService):
     def instance_types(self) -> List[InstanceType]:
         """List of instance types available on Firebolt."""
 
-        response = self.client.get(url=INSTANCE_TYPES_URL, params={"page.first": 5000})
+        response = self.client.get(
+            url=ACCOUNT_INSTANCE_TYPES_URL.format(account_id=self.account_id),
+            params={"page.first": 5000},
+        )
         return [InstanceType.parse_obj(i["node"]) for i in response.json()["edges"]]
 
     @cached_property
@@ -46,7 +49,7 @@ def get_instance_types_per_region(self, region: Region) -> List[InstanceType]:
         """List of instance types available on Firebolt in specified region."""
 
         response = self.client.get(
-            url=INSTANCE_TYPES_URL,
+            url=ACCOUNT_INSTANCE_TYPES_URL.format(account_id=self.account_id),
             params={"page.first": 5000, "filter.id_region_id_eq": region.key.region_id},
         )
 

src/firebolt/utils/urls.py

@@ -24,6 +24,7 @@
 
 ACCOUNT_BINDINGS_URL = "/core/v1/accounts/{account_id}/bindings"
 
+ACCOUNT_INSTANCE_TYPES_URL = "/aws/v2/accounts/{account_id}/instanceTypes"
+
 PROVIDERS_URL = "/compute/v1/providers"
 REGIONS_URL = "/compute/v1/regions"
-INSTANCE_TYPES_URL = "/compute/v1/instanceTypes"

tests/unit/service/conftest.py

@@ -24,7 +24,7 @@
     ACCOUNT_DATABASES_URL,
     ACCOUNT_ENGINE_URL,
     ACCOUNT_ENGINES_URL,
-    INSTANCE_TYPES_URL,
+    ACCOUNT_INSTANCE_TYPES_URL,
     PROVIDERS_URL,
     REGIONS_URL,
 )
@@ -214,23 +214,33 @@ def do_mock(
 
 
 @pytest.fixture
-def instance_type_url(settings: Settings) -> str:
-    return f"https://{settings.server}{INSTANCE_TYPES_URL}?page.first=5000"
+def instance_type_url(settings: Settings, account_id: str) -> str:
+    return (
+        f"https://{settings.server}"
+        + ACCOUNT_INSTANCE_TYPES_URL.format(account_id=account_id)
+        + "?page.first=5000"
+    )
 
 
 @pytest.fixture
-def instance_type_region_1_url(settings: Settings, region_1: Region) -> str:
+def instance_type_region_1_url(
+    settings: Settings, region_1: Region, account_id: str
+) -> str:
     return (
-        f"https://{settings.server}{INSTANCE_TYPES_URL}?page.first=5000&"
-        f"filter.id_region_id_eq={region_1.key.region_id}"
+        f"https://{settings.server}"
+        + ACCOUNT_INSTANCE_TYPES_URL.format(account_id=account_id)
+        + f"?page.first=5000&filter.id_region_id_eq={region_1.key.region_id}"
     )
 
 
 @pytest.fixture
-def instance_type_region_2_url(settings: Settings, region_2: Region) -> str:
+def instance_type_region_2_url(
+    settings: Settings, region_2: Region, account_id: str
+) -> str:
     return (
-        f"https://{settings.server}{INSTANCE_TYPES_URL}?page.first=5000&"
-        f"filter.id_region_id_eq={region_2.key.region_id}"
+        f"https://{settings.server}"
+        + ACCOUNT_INSTANCE_TYPES_URL.format(account_id=account_id)
+        + f"?page.first=5000&filter.id_region_id_eq={region_2.key.region_id}"
     )