Skip to content

Commit 9aab778

Browse files
odeimaizodeimaiz
authored
Merge branch 'master' into feature/storage-paginated
2 parents 5aca368 + a059026 commit 9aab778

File tree

43 files changed

+3159
-2141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+3159
-2141
lines changed

‎.github/CODEOWNERS‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,46 @@
44

55

66
# files and folders recursively
7-
.env-* @mrnicegyu11 @YuryHrytsuk
8-
Makefile @pcrespov @sanderegg
7+
.env-* @mrnicegyu11 @YuryHrytsuk
8+
Makefile @pcrespov @sanderegg
99

1010

1111
# NOTE: '/' denotes the root of the repository
12-
/.github/ @sanderegg @pcrespov
13-
/api/ @sanderegg @pcrespov @matusdrobuliak66
14-
/ci/ @sanderegg @pcrespov
15-
/docs/ @pcrespov
16-
/packages/common-library/ @giancarloromeo
17-
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66 @giancarloromeo
18-
/packages/postgres-database/ @matusdrobuliak66
19-
/packages/pytest-simcore/ @pcrespov @sanderegg
20-
/packages/service-integration/ @pcrespov @sanderegg @GitHK
21-
/packages/service-library/ @pcrespov
22-
/packages/settings-library/ @pcrespov @sanderegg
23-
/requirements/ @pcrespov @matusdrobuliak66
24-
/services/agent/ @GitHK
25-
/services/api-server/ @pcrespov
26-
/services/autoscaling/ @sanderegg
27-
/services/catalog/ @pcrespov @sanderegg
28-
/services/clusters-keeper/ @sanderegg
29-
/services/datcore-adapter/ @sanderegg
30-
/services/director*/ @sanderegg @pcrespov @GitHK
31-
/services/docker-compose*.yml @sanderegg @mrnicegyu11 @YuryHrytsuk
32-
/services/dynamic-sidecar/ @GitHK
33-
/services/efs-guardian/ @matusdrobuliak66
34-
/services/invitations/ @pcrespov
35-
/services/migration/ @pcrespov
36-
/services/payments/ @pcrespov @matusdrobuliak66
37-
/services/resource-usage-tracker/ @matusdrobuliak66
38-
/services/static-webserver/ @GitHK
39-
/services/static-webserver/client/ @odeimaiz
40-
/services/storage/ @sanderegg
41-
/services/web/server/ @pcrespov @sanderegg @GitHK @matusdrobuliak66
42-
/tests/e2e-frontend/ @odeimaiz
43-
/tests/e2e-playwright/ @matusdrobuliak66
44-
/tests/environment-setup/ @pcrespov
45-
/tests/performance/ @pcrespov @sanderegg
46-
/tests/public-api/ @pcrespov
47-
requirements/* @pcrespov
48-
tools/* @pcrespov
12+
/.github/ @sanderegg @pcrespov
13+
/api/ @sanderegg @pcrespov @matusdrobuliak66
14+
/ci/ @sanderegg @pcrespov
15+
/docs/ @pcrespov
16+
/packages/common-library/ @giancarloromeo
17+
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66 @giancarloromeo
18+
/packages/postgres-database/ @matusdrobuliak66
19+
/packages/pytest-simcore/ @pcrespov @sanderegg
20+
/packages/service-integration/ @pcrespov @sanderegg @GitHK
21+
/packages/service-library/ @pcrespov
22+
/packages/settings-library/ @pcrespov @sanderegg
23+
/requirements/ @pcrespov @matusdrobuliak66
24+
/services/agent/ @GitHK
25+
/services/api-server/ @pcrespov
26+
/services/api-server/tests/unit/pact_broker/ @matusdrobuliak66
27+
/services/autoscaling/ @sanderegg
28+
/services/catalog/ @pcrespov @sanderegg
29+
/services/clusters-keeper/ @sanderegg
30+
/services/datcore-adapter/ @sanderegg
31+
/services/director*/ @sanderegg @pcrespov @GitHK
32+
/services/docker-compose*.yml @sanderegg @mrnicegyu11 @YuryHrytsuk
33+
/services/dynamic-sidecar/ @GitHK
34+
/services/efs-guardian/ @matusdrobuliak66
35+
/services/invitations/ @pcrespov
36+
/services/migration/ @pcrespov
37+
/services/payments/ @pcrespov @matusdrobuliak66
38+
/services/resource-usage-tracker/ @matusdrobuliak66
39+
/services/static-webserver/ @GitHK
40+
/services/static-webserver/client/ @odeimaiz
41+
/services/storage/ @sanderegg
42+
/services/web/server/ @pcrespov @sanderegg @GitHK @matusdrobuliak66
43+
/tests/e2e-frontend/ @odeimaiz
44+
/tests/e2e-playwright/ @matusdrobuliak66
45+
/tests/environment-setup/ @pcrespov
46+
/tests/performance/ @pcrespov @sanderegg
47+
/tests/public-api/ @pcrespov
48+
requirements/* @pcrespov
49+
tools/* @pcrespov

‎.github/workflows/ci-pact-master.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This workflow holds jobs which are required to pass before merging into master
2+
3+
name: CI PACT Master
4+
on:
5+
push:
6+
branches:
7+
- "master"
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
pact-tests:
15+
timeout-minutes: 10
16+
name: "Run PACT tests"
17+
runs-on: ubuntu-latest
18+
env:
19+
# secrets can be set in settings/secrets on github
20+
PACT_BROKER_URL: ${{ secrets.PACT_BROKER_URL }}
21+
PACT_BROKER_USERNAME: ${{ secrets.PACT_BROKER_USERNAME }}
22+
PACT_BROKER_PASSWORD: ${{ secrets.PACT_BROKER_PASSWORD }}
23+
steps:
24+
- name: setup python environment
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.11"
28+
- name: install uv
29+
uses: astral-sh/setup-uv@v5
30+
with:
31+
version: "0.5.x"
32+
enable-cache: false
33+
- name: checkout source branch
34+
uses: actions/checkout@v4
35+
- name: Run pact tests
36+
run: |
37+
make devenv
38+
source .venv/bin/activate
39+
cd services/api-server
40+
make install-ci
41+
make test-pacts

‎api/specs/web-server/_auth_api_keys.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from models_library.generics import Envelope
1010
from models_library.rest_error import EnvelopedError
1111
from simcore_service_webserver._meta import API_VTAG
12+
from simcore_service_webserver.api_keys._controller_rest import ApiKeysPathParams
1213
from simcore_service_webserver.api_keys._exceptions_handlers import _TO_HTTP_ERROR_MAP
13-
from simcore_service_webserver.api_keys._rest import ApiKeysPathParams
1414

1515
router = APIRouter(
1616
prefix=f"/{API_VTAG}",

‎api/specs/web-server/_storage.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from uuid import UUID
99

1010
from fastapi import APIRouter, Depends, Query, status
11-
from fastapi_pagination.cursor import CursorPage
1211
from models_library.api_schemas_storage.storage_schemas import (
1312
FileLocation,
1413
FileMetaDataGet,
@@ -32,6 +31,7 @@
3231
from models_library.projects_nodes_io import LocationID
3332
from models_library.users import UserID
3433
from pydantic import AnyUrl, ByteSize
34+
from servicelib.fastapi.rest_pagination import CustomizedPathsCursorPage
3535
from simcore_service_webserver._meta import API_VTAG
3636
from simcore_service_webserver.storage.schemas import DatasetMetaData, FileMetaData
3737

@@ -59,7 +59,7 @@ async def list_storage_locations():
5959

6060
@router.get(
6161
"/storage/locations/{location_id}/paths",
62-
response_model=CursorPage[PathMetaDataGet],
62+
response_model=CustomizedPathsCursorPage[PathMetaDataGet],
6363
)
6464
async def list_storage_paths(
6565
_path: Annotated[StorageLocationPathParams, Depends()],

0 commit comments

Comments
 (0)