laniakea-api-server 0.2.0__tar.gz → 0.2.2__tar.gz

{laniakea_api_server-0.2.0 → laniakea_api_server-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: laniakea-api-server
-Version: 0.2.0
+Version: 0.2.2
 Summary: Laniakea Queue API — OIDC-authenticated gateway for cloud deployment orchestration
 Project-URL: Homepage, https://github.com/laniakea/laniakea-api
 Project-URL: Issues, https://github.com/laniakea/laniakea-api/issues

{laniakea_api_server-0.2.0 → laniakea_api_server-0.2.2}/laniakea_api/__init__.py

@@ -2,4 +2,4 @@
 OIDC-authenticated gateway for enqueuing cloud deployment jobs.
 """
 
-__version__ = "0.1.4"
+__version__ = "0.2.2"

{laniakea_api_server-0.2.0 → laniakea_api_server-0.2.2}/laniakea_api/main.py

@@ -15,7 +15,7 @@ app = FastAPI(
     title="Laniakea Queue API",
     description="OIDC-authenticated gateway for enqueuing cloud deployment jobs.",
     # FIXME: automatizza versione
-    version="0.1.4",
+    version="0.2.2",
 )
 
 # NOTE: CHANGE HERE for path

{laniakea_api_server-0.2.0 → laniakea_api_server-0.2.2}/laniakea_api/models.py

@@ -35,6 +35,7 @@ class UserCredentials(BaseModel):
     """
     # NOTE: now no credentials is essential. Consider changing this logic
     # OpenStack
+    ssh_private_key: Optional[str] = None
     openstack_ssh_key:               Optional[str] = None
     openstack_app_credential_id:     Optional[str] = None
     openstack_app_credential_secret: Optional[str] = None
@@ -62,6 +63,7 @@ class DeploymentRequest(BaseModel):
     auth:              dict   # { aai_token, sub, group }
     orchestrator:      dict   # target_provider, desired_orchestrator, endpoint
     selected_provider: str    # OpenStack | AWS
+    service_type:      Optional[str] = "galaxy"
     cloud_providers:   dict
 
 

{laniakea_api_server-0.2.0 → laniakea_api_server-0.2.2}/laniakea_api/queue.py

@@ -65,16 +65,35 @@ vault_client = hvac.Client(
     verify=VAULT_TLS_VERIFY,
 )
 
+
 def vault_write_credentials(user_sub: str, creds: dict) -> str:
     """
     Write user credentials to Vault under secret/data/<sub>/credentials.
+
+    MERGE semantics: the existing secret is read first and only the fields
+    provided in `creds` are overwritten. Fields already in Vault but not in
+    this request are preserved (e.g. ssh_private_key must survive a
+    GARR-only app-credentials update).
+
     Returns the vault path on success; raises HTTP 502 on failure.
     """
     vault_path = f"{user_sub}/credentials"
     try:
+        # Read existing secret (if any) to merge with incoming fields
+        try:
+            existing = vault_client.secrets.kv.v2.read_secret_version(
+                path=vault_path,
+                mount_point=VAULT_MOUNT,
+                raise_on_deleted_version=True,
+            )["data"]["data"]
+        except Exception:
+            existing = {}
+
+        merged = {**existing, **creds}
+
         vault_client.secrets.kv.v2.create_or_update_secret(
             path=vault_path,
-            secret=creds,
+            secret=merged,
             mount_point=VAULT_MOUNT,
         )
     except Exception as exc:
@@ -84,7 +103,6 @@ def vault_write_credentials(user_sub: str, creds: dict) -> str:
         )
     return vault_path
 
-
 def check_vault() -> str:
     """
     Returns 'authenticated' or an error string.

{laniakea_api_server-0.2.0 → laniakea_api_server-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "laniakea-api-server"
-version = "0.2.0"
+version = "0.2.2"
 description = "Laniakea Queue API — OIDC-authenticated gateway for cloud deployment orchestration"
 readme = "README.md"
 license = { text = "MIT" }