Merge branch 'main' into e2e-tests

Author: Laure-di

scaleway-async/scaleway_async/product_catalog/v2alpha1/api.py

@@ -11,6 +11,7 @@
     ListPublicCatalogProductsRequestProductType,
     ListPublicCatalogProductsResponse,
     PublicCatalogProduct,
+    PublicCatalogProductLocality,
 )
 from .marshalling import (
     unmarshal_ListPublicCatalogProductsResponse,
@@ -28,13 +29,15 @@ async def list_public_catalog_products(
         product_types: Optional[
             List[ListPublicCatalogProductsRequestProductType]
         ] = None,
+        locality: Optional[PublicCatalogProductLocality] = None,
     ) -> ListPublicCatalogProductsResponse:
         """
         List all available products.
         List all available products in the Scaleway catalog. Returns a complete list of products with their corresponding description, locations, prices and properties. You can define the `page` number and `page_size` for your query in the request.
         :param page: Number of the page. Value must be greater or equal to 1.
         :param page_size: The number of products per page. Value must be greater or equal to 1.
         :param product_types: The list of filtered product categories.
+        :param locality: The locality of the products to filter by. If not set, all localities are returned.
         :return: :class:`ListPublicCatalogProductsResponse <ListPublicCatalogProductsResponse>`
 
         Usage:
@@ -47,6 +50,7 @@ async def list_public_catalog_products(
             "GET",
             "/product-catalog/v2alpha1/public-catalog/products",
             params={
+                "locality": locality,
                 "page": page,
                 "page_size": page_size or self.client.default_page_size,
                 "product_types": product_types,
@@ -64,13 +68,15 @@ async def list_public_catalog_products_all(
         product_types: Optional[
             List[ListPublicCatalogProductsRequestProductType]
         ] = None,
+        locality: Optional[PublicCatalogProductLocality] = None,
     ) -> List[PublicCatalogProduct]:
         """
         List all available products.
         List all available products in the Scaleway catalog. Returns a complete list of products with their corresponding description, locations, prices and properties. You can define the `page` number and `page_size` for your query in the request.
         :param page: Number of the page. Value must be greater or equal to 1.
         :param page_size: The number of products per page. Value must be greater or equal to 1.
         :param product_types: The list of filtered product categories.
+        :param locality: The locality of the products to filter by. If not set, all localities are returned.
         :return: :class:`List[PublicCatalogProduct] <List[PublicCatalogProduct]>`
 
         Usage:
@@ -87,5 +93,6 @@ async def list_public_catalog_products_all(
                 "page": page,
                 "page_size": page_size,
                 "product_types": product_types,
+                "locality": locality,
             },
         )

scaleway-async/scaleway_async/product_catalog/v2alpha1/types.py

@@ -432,3 +432,8 @@ class PublicCatalogApiListPublicCatalogProductsRequest:
     """
     The list of filtered product categories.
     """
+
+    locality: Optional[PublicCatalogProductLocality]
+    """
+    The locality of the products to filter by. If not set, all localities are returned.
+    """

scaleway/scaleway/product_catalog/v2alpha1/api.py

@@ -11,6 +11,7 @@
     ListPublicCatalogProductsRequestProductType,
     ListPublicCatalogProductsResponse,
     PublicCatalogProduct,
+    PublicCatalogProductLocality,
 )
 from .marshalling import (
     unmarshal_ListPublicCatalogProductsResponse,
@@ -28,13 +29,15 @@ def list_public_catalog_products(
         product_types: Optional[
             List[ListPublicCatalogProductsRequestProductType]
         ] = None,
+        locality: Optional[PublicCatalogProductLocality] = None,
     ) -> ListPublicCatalogProductsResponse:
         """
         List all available products.
         List all available products in the Scaleway catalog. Returns a complete list of products with their corresponding description, locations, prices and properties. You can define the `page` number and `page_size` for your query in the request.
         :param page: Number of the page. Value must be greater or equal to 1.
         :param page_size: The number of products per page. Value must be greater or equal to 1.
         :param product_types: The list of filtered product categories.
+        :param locality: The locality of the products to filter by. If not set, all localities are returned.
         :return: :class:`ListPublicCatalogProductsResponse <ListPublicCatalogProductsResponse>`
 
         Usage:
@@ -47,6 +50,7 @@ def list_public_catalog_products(
             "GET",
             "/product-catalog/v2alpha1/public-catalog/products",
             params={
+                "locality": locality,
                 "page": page,
                 "page_size": page_size or self.client.default_page_size,
                 "product_types": product_types,
@@ -64,13 +68,15 @@ def list_public_catalog_products_all(
         product_types: Optional[
             List[ListPublicCatalogProductsRequestProductType]
         ] = None,
+        locality: Optional[PublicCatalogProductLocality] = None,
     ) -> List[PublicCatalogProduct]:
         """
         List all available products.
         List all available products in the Scaleway catalog. Returns a complete list of products with their corresponding description, locations, prices and properties. You can define the `page` number and `page_size` for your query in the request.
         :param page: Number of the page. Value must be greater or equal to 1.
         :param page_size: The number of products per page. Value must be greater or equal to 1.
         :param product_types: The list of filtered product categories.
+        :param locality: The locality of the products to filter by. If not set, all localities are returned.
         :return: :class:`List[PublicCatalogProduct] <List[PublicCatalogProduct]>`
 
         Usage:
@@ -87,5 +93,6 @@ def list_public_catalog_products_all(
                 "page": page,
                 "page_size": page_size,
                 "product_types": product_types,
+                "locality": locality,
             },
         )

scaleway/scaleway/product_catalog/v2alpha1/types.py

@@ -432,3 +432,8 @@ class PublicCatalogApiListPublicCatalogProductsRequest:
     """
     The list of filtered product categories.
     """
+
+    locality: Optional[PublicCatalogProductLocality]
+    """
+    The locality of the products to filter by. If not set, all localities are returned.
+    """

scaleway/tests/test_test_v1.py

@@ -7,6 +7,7 @@
 from scaleway import Client, WaitForOptions
 from scaleway.test.v1 import EyeColors, Human, HumanStatus, TestV1API
 
+
 @unittest.skip("API test is not deploy")
 class TestTestV1(unittest.TestCase):
     def setUp(self) -> None:

scaleway/tests/test_test_v1_marshalling.py

@@ -20,6 +20,7 @@
 
 system_random = random.SystemRandom()
 
+
 def _mock_human_raw() -> Dict[str, Any]:
     altitude_in_meter = system_random.randint(0, 100)
     created_at = utils.random_date_string(
@@ -66,6 +67,8 @@ def _mock_human() -> Human:
         name=utils.random_name(),
         project_id=str(uuid.uuid4()),
     )
+
+
 @unittest.skip("API test is not deploy")
 class TestTestV1UnmarshallingHuman(unittest.TestCase):
     def _assert_raw_and_unmarshalled_human(
@@ -124,6 +127,7 @@ def test_unmarshal_ListHumansResponse(self) -> None:
                 humans[i], list_humans_response.humans[i]
             )
 
+
 def _mock_create_human_request() -> CreateHumanRequest:
     human = _mock_human()
 
@@ -141,6 +145,7 @@ def _mock_create_human_request() -> CreateHumanRequest:
         organization_id=human.organization_id,
     )
 
+
 @unittest.skip("API test is not deploy")
 class TestTestV1MarshallingCreateHumanRequest(unittest.TestCase):
     def _assert_create_human_request_and_raw(