Skip to content

Commit 5ea1874

Browse files
soapy1marcelovillapre-commit-ci[bot]viniciusdc
authored
Update conda-store-server image + use public auth_schema module for AuthenticationToken (#2931)
Co-authored-by: Marcelo Villa <mvilla@quansight.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com>
1 parent 7e757c5 commit 5ea1874

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/_nebari/constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
DEFAULT_NEBARI_IMAGE_TAG = CURRENT_RELEASE
1717
DEFAULT_NEBARI_WORKFLOW_CONTROLLER_IMAGE_TAG = CURRENT_RELEASE
1818

19-
DEFAULT_CONDA_STORE_IMAGE_TAG = "2024.11.2"
19+
DEFAULT_CONDA_STORE_IMAGE_TAG = "2025.2.1"
2020

2121
LATEST_SUPPORTED_PYTHON_VERSION = "3.10"
2222

src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/conda-store/config/conda_store_config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import requests
1313
from conda_store_server import api
14-
from conda_store_server._internal import schema
1514
from conda_store_server._internal.server.dependencies import get_conda_store
15+
from conda_store_server.server import schema as auth_schema
1616
from conda_store_server.server.auth import GenericOAuthAuthentication
1717
from conda_store_server.storage import S3Storage
1818

@@ -357,7 +357,7 @@ def _get_conda_store_client_roles_for_user(
357357
return client_roles_rich
358358

359359
def _get_current_entity_bindings(self, username):
360-
entity = schema.AuthenticationToken(
360+
entity = auth_schema.AuthenticationToken(
361361
primary_namespace=username, role_bindings={}
362362
)
363363
self.log.info(f"entity: {entity}")
@@ -387,7 +387,7 @@ async def authenticate(self, request):
387387

388388
# superadmin gets access to everything
389389
if "conda_store_superadmin" in user_data.get("roles", []):
390-
return schema.AuthenticationToken(
390+
return auth_schema.AuthenticationToken(
391391
primary_namespace=username,
392392
role_bindings={"*/*": {"admin"}},
393393
)
@@ -425,7 +425,7 @@ async def authenticate(self, request):
425425
if _namespace is None:
426426
api.ensure_namespace(db, name=namespace)
427427

428-
return schema.AuthenticationToken(
428+
return auth_schema.AuthenticationToken(
429429
primary_namespace=username,
430430
role_bindings=role_bindings,
431431
)

0 commit comments

Comments
 (0)