Skip to content

Commit 5c8a98e

Browse files
committed
fixme reminder
1 parent 8d4211c commit 5c8a98e

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

services/catalog/src/simcore_service_catalog/core/background_tasks.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ def _by_version(t: tuple[ServiceKey, ServiceVersion]) -> Version:
7070
(service_key, service_version)
7171
]
7272
try:
73-
## Set deprecation date to null (is valid date value for postgres)
74-
75-
# DEFAULT policies
73+
# 1. Evaluate DEFAULT ownership and access rights
7674
(
7775
owner_gid,
7876
service_access_rights,
@@ -82,12 +80,13 @@ def _by_version(t: tuple[ServiceKey, ServiceVersion]) -> Version:
8280
product_name=app.state.default_product_name,
8381
)
8482

85-
# AUTO-UPGRADE PATCH policy
86-
inherited_data = await access_rights.inherit_from_previous_release(
83+
# 2. Inherit access rights from the latest compatible release
84+
inherited_data = await access_rights.inherit_from_latest_compatible_release(
8785
service_metadata=service_metadata,
8886
services_repo=services_repo,
8987
)
9088

89+
# 3. Aggregates access rights and metadata updates
9190
service_access_rights += inherited_data["access_rights"]
9291
service_access_rights = access_rights.reduce_access_rights(
9392
service_access_rights
@@ -98,7 +97,7 @@ def _by_version(t: tuple[ServiceKey, ServiceVersion]) -> Version:
9897
**inherited_data["metadata_updates"],
9998
}
10099

101-
# set the service in the DB
100+
# 4. Create or update the service in the database
102101
await services_repo.create_or_update_service(
103102
ServiceMetaDataDBCreate(**metadata_updates, owner=owner_gid),
104103
service_access_rights,

services/catalog/src/simcore_service_catalog/service/access_rights.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,11 @@ async def _find_previous_compatible_release(
144144
service_metadata.key,
145145
major=new_version.major,
146146
minor=new_version.minor,
147+
limit_count=5,
147148
)
148149

150+
# FIXME: deprecated versions hsould not coutn!!!
151+
149152
# latest_releases is sorted from newer to older
150153
for release in latest_releases:
151154
# COMPATIBILITY RULE:
@@ -156,7 +159,7 @@ async def _find_previous_compatible_release(
156159
return None
157160

158161

159-
async def inherit_from_previous_release(
162+
async def inherit_from_latest_compatible_release(
160163
services_repo: ServicesRepository, *, service_metadata: ServiceMetaDataPublished
161164
) -> InheritedData:
162165
"""

services/catalog/tests/unit/with_dbs/test_service_access_rights.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from simcore_service_catalog.repository.services import ServicesRepository
1717
from simcore_service_catalog.service.access_rights import (
1818
evaluate_default_service_ownership_and_rights,
19-
inherit_from_previous_release,
19+
inherit_from_latest_compatible_release,
2020
reduce_access_rights,
2121
)
2222
from sqlalchemy.ext.asyncio import AsyncEngine
@@ -205,7 +205,7 @@ async def test_auto_upgrade_policy(
205205
assert service_access_rights[0].product_name == target_product
206206

207207
# Inheritance policy (both access rights and metadata)
208-
inherited_data = await inherit_from_previous_release(
208+
inherited_data = await inherit_from_latest_compatible_release(
209209
services_repo, service_metadata=new_service_metadata
210210
)
211211

0 commit comments

Comments
 (0)