fix: cant deploy to same namespace if organization_id incorrectly set

Author: cyclimse

scw_serverless/deploy/backends/scaleway_api_backend.py

@@ -42,7 +42,7 @@ def _get_or_create_function(self, function: Function, namespace_id: str) -> str:
                 namespace_id=namespace_id,
                 runtime=function.runtime,
                 privacy=function.privacy or sdk.FunctionPrivacy.PUBLIC,
-                http_option=sdk.FunctionHttpOption.REDIRECTED,
+                http_option=function.http_option or sdk.FunctionHttpOption.REDIRECTED,
                 name=function.name,
                 environment_variables=function.environment_variables,
                 min_scale=function.min_scale,
@@ -59,7 +59,7 @@ def _get_or_create_function(self, function: Function, namespace_id: str) -> str:
                 function_id=created_function.id,
                 runtime=function.runtime,
                 privacy=function.privacy or sdk.FunctionPrivacy.PUBLIC,
-                http_option=sdk.FunctionHttpOption.REDIRECTED,
+                http_option=function.http_option or sdk.FunctionHttpOption.REDIRECTED,
                 environment_variables=function.environment_variables,
                 min_scale=function.min_scale,
                 max_scale=function.max_scale,

scw_serverless/utils/credentials.py

@@ -18,6 +18,7 @@ def get_scw_client(
     """Attempts to load the profile. Will raise on invalid profiles."""
     client = Client.from_config_file_and_env(profile_name)
     _update_client_from_cli(client, secret_key, project_id, region)
+
     return _validate_client(client)
 
 
@@ -47,3 +48,7 @@ def _update_client_from_cli(
     if not client.default_region:
         get_logger().info(f"No region was configured, using {DEFAULT_REGION}")
         client.default_region = DEFAULT_REGION
+
+    # Not used by the API framework
+    # Can lead to issues if project_id does not belong to organization
+    client.default_organization_id = None