chore: address comments

Author: olevski

components/renku_data_services/session/api.spec.yaml

@@ -547,7 +547,9 @@ components:
       type: integer
       minimum: 0
       exclusiveMinimum: true
-      maximum: 65535
+      exclusiveMaximum: true
+      # NOTE: we reserve 65400 - 65535 for usage of Renku sidecars and services
+      maximum: 65400
       description: The TCP port (on any container in the session) where user requests will be routed to from the ingress
     EnvironmentUid:
       type: integer

components/renku_data_services/session/apispec.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2024-08-02T12:32:41+00:00
+#   timestamp: 2024-08-12T14:34:54+00:00
 
 from __future__ import annotations
 
@@ -82,7 +82,7 @@ class Environment(BaseAPISpec):
         ...,
         description="The TCP port (on any container in the session) where user requests will be routed to from the ingress",
         gt=0,
-        le=65535,
+        lt=65400,
     )
 
 
@@ -133,7 +133,7 @@ class EnvironmentPost(BaseAPISpec):
         8080,
         description="The TCP port (on any container in the session) where user requests will be routed to from the ingress",
         gt=0,
-        le=65535,
+        lt=65400,
     )
 
 
@@ -181,7 +181,7 @@ class EnvironmentPatch(BaseAPISpec):
         None,
         description="The TCP port (on any container in the session) where user requests will be routed to from the ingress",
         gt=0,
-        le=65535,
+        lt=65400,
     )
 
 

components/renku_data_services/session/models.py

@@ -80,15 +80,6 @@ class BaseSessionLauncher:
     environment: str | UnsavedEnvironment | Environment
     resource_class_id: int | None
 
-    @property
-    def environment_id(self) -> str | None:
-        """The environment ID."""
-        if isinstance(self.environment, str):
-            return self.environment
-        elif isinstance(self.environment, Environment):
-            return self.environment.id
-        return None
-
 
 @dataclass(frozen=True, eq=True, kw_only=True)
 class UnsavedSessionLauncher(BaseSessionLauncher):
@@ -106,8 +97,3 @@ class SessionLauncher(BaseSessionLauncher):
     creation_date: datetime
     created_by: str
     environment: Environment
-
-    @property
-    def environment_id(self) -> str:
-        """The environment ID."""
-        return self.environment.id