Skip to content

Commit

Permalink
squashme: minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
olevski committed Dec 26, 2024
1 parent 2ee8fcd commit 5f84116
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion components/renku_data_services/notebooks/core_sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import base64
import os
from collections.abc import AsyncIterator
from json import dumps
from pathlib import PurePosixPath
from typing import cast
from urllib.parse import urljoin, urlparse

import httpx
from kubernetes.client import V1ObjectMeta, V1Secret
from sanic import Request
from toml import dumps
from yaml import safe_dump

from renku_data_services.base_models.core import AnonymousAPIUser, AuthenticatedAPIUser
Expand Down
12 changes: 9 additions & 3 deletions components/renku_data_services/notebooks/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,24 @@ class ExtraSecret:

def key_ref(self, key: str) -> SecretRef:
"""Get an amalthea secret key reference."""
secret_name = getattr(self.secret, "metadata", {}).get("name")
meta = self.secret.metadata
if not meta:
raise ProgrammingError(message="Cannot get reference to a secret that does not have metadata.")
secret_name = meta.name
if not secret_name:
raise ProgrammingError(message="Cannot get reference to a secret that does not have a name.")
data = self.secret.data or {}
string_data = self.secret.string_data or {}
if key not in data and key not in string_data:
raise KeyError(f"Cannot find the key {key} in the secret with name {secret_name}")
return SecretRef(key=key, name=self.secret.metadata["name"], adopt=self.adopt)
return SecretRef(key=key, name=secret_name, adopt=self.adopt)

def ref(self) -> SecretRefWhole:
"""Get an amalthea reference to the whole secret."""
secret_name = getattr(self.secret, "metadata", {}).get("name")
meta = self.secret.metadata
if not meta:
raise ProgrammingError(message="Cannot get reference to a secret that does not have metadata.")
secret_name = meta.name
if not secret_name:
raise ProgrammingError(message="Cannot get reference to a secret that does not have a name.")
return SecretRefWhole(name=secret_name, adopt=self.adopt)

0 comments on commit 5f84116

Please sign in to comment.