Add filtering to list Airlock requests #2433

yuvalyaron · 2022-08-09T15:57:37Z

Resolves #2332

What is being addressed

Added the following filters to the "get all Airlock requests" endpoint:
- initiator - ID of the user that created the request
- type - Airlock request type
- status - Airlock request status
- awaiting_my_review - when sent, will return requests that are pending the user's review
Added a list of allowed actions (out of 'cancel' and 'review') that the user can do on the request, to every request in the response.

How is this addressed

Added the specified filters to the endpoint as query parameters
Attached a list with the allowed actions to every request. The values in the list are affected by the requesting user and the state of the request - for instance, a user might be able to cancel a 'draft' request, but not review it, even if their role allows reviewing

…specify which actions the requesting user can make on each request

…alyaron-feature/2271-add-filtering-to-list-airlock-requests

github-actions · 2022-08-09T15:58:27Z

Unit Test Results

500 tests +498 498 ✔️ +498 11s ⏱️ -11s
    1 suites ±    0     2 💤 +    2
    1 files ±    0     0 ❌ -     2

Results for commit 118b7b2. ± Comparison against base commit 22545c4.

This pull request removes 2 and adds 500 tests. Note that renamed tests count towards both.

test_workspace_airlock ‑ test_airlock_import_flow
test_workspace_services ‑ test_create_guacamole_service_into_base_workspace

tests_ma.test_api.test_errors.test_422_error ‑ test_frw_validation_error_format
tests_ma.test_api.test_errors.test_error ‑ test_frw_validation_error_format
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_airlock_review_approves_airlock_request_returns_200
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_airlock_review_input_is_malformed_returns_400
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_airlock_review_with_event_grid_not_responding_returns_503
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_airlock_review_with_illegal_status_change_returns_400
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_airlock_review_with_state_store_endpoint_not_responding_returns_503
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireOwnerOrResearcherRights ‑ test_get_airlock_container_link_cancelled_request_returns_400
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireOwnerOrResearcherRights ‑ test_get_airlock_container_link_in_progress_request_returns_400
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireOwnerOrResearcherRights ‑ test_get_airlock_container_link_no_airlock_request_found_returns_404
…

♻️ This comment has been updated with latest results.

…t can also send 'awaiting_my_review' parameter to 'get_airlock_requests_by_user_and_workspace'

…alyaron-feature/2271-add-filtering-to-list-airlock-requests

api_app/api/routes/airlock_resource_helpers.py

anatbal

I think maybe it's a little too complicated - I am not following we we need to add that much new models and modify existing ones...

api_app/api/routes/airlock.py

api_app/api/routes/airlock_resource_helpers.py

api_app/api/routes/airlock.py

api_app/api/routes/airlock_resource_helpers.py

api_app/models/schemas/airlock_request.py

…alyaron-feature/2271-add-filtering-to-list-airlock-requests � Conflicts: � CHANGELOG.md � api_app/_version.py

…List

…alyaron-feature/2271-add-filtering-to-list-airlock-requests � Conflicts: � CHANGELOG.md

api_app/models/domain/airlock_request.py

api_app/models/schemas/airlock_request.py

guybartal

LGTM

yuvalyaron · 2022-08-14T14:57:08Z

/test

github-actions · 2022-08-14T14:57:22Z

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/2856171128 (with refid 551bb0b6)

(in response to this comment from @yuvalyaron)

github-actions · 2022-08-14T15:45:49Z

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/2856171128 (with refid 551bb0b6)

(in response to this comment from @yuvalyaron)

yuvalyaron · 2022-08-15T07:25:56Z

/test

github-actions · 2022-08-15T07:26:09Z

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/2859122482 (with refid 551bb0b6)

(in response to this comment from @yuvalyaron)

yuvalyaron · 2022-08-15T09:48:58Z

/help

github-actions · 2022-08-15T09:49:16Z

🤖 pr-bot 🤖

Hello!

You can use the following commands:
    /test - build, deploy and run smoke tests on a PR
    /test-extended - build, deploy and run smoke & extended tests on a PR
    /test-extended-aad - build, deploy and run smoke & extended AAD tests on a PR
    /test-shared-services - test the deployment of shared services on a PR build
    /test-force-approve - force approval of the PR tests (i.e. skip the deployment checks)
    /test-destroy-env - delete the validation environment for a PR (e.g. to enable testing a deployment from a clean start after previous tests)
    /help - show this help

(in response to this comment from @yuvalyaron)

yuvalyaron · 2022-08-15T09:49:37Z

/test-destroy-env

github-actions · 2022-08-15T09:50:27Z

Destroying PR test environment (RG: rg-tre551bb0b6)... (run: https://github.com/microsoft/AzureTRE/actions/runs/2859834075)

github-actions · 2022-08-15T10:07:40Z

PR test environment destroy complete (RG: rg-tre551bb0b6)

yuvalyaron · 2022-08-15T11:31:45Z

/test

github-actions · 2022-08-15T11:32:02Z

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/2860336725 (with refid 551bb0b6)

(in response to this comment from @yuvalyaron)

yuvalyaron added 3 commits August 9, 2022 15:54

add query parameters to 'get all airlock requests' endpoint

32bf4db

add allowed_user_actions to 'get all airlock requests' endpoint that …

f879e8e

…specify which actions the requesting user can make on each request

Merge branch 'main' of https://github.com/microsoft/AzureTRE into yuv…

928985e

…alyaron-feature/2271-add-filtering-to-list-airlock-requests

yuvalyaron added 2 commits August 10, 2022 10:36

fix tests

dcd279b

move logic from endpoint to helper service and add tests

14bda58

tamirkamara added the airlock label Aug 10, 2022

yuvalyaron added 5 commits August 10, 2022 17:00

add test to verify that any role that can access the 'review' endpoin…

da95172

…t can also send 'awaiting_my_review' parameter to 'get_airlock_requests_by_user_and_workspace'

add tests for get_allowed_actions

4cb8fcf

Merge branch 'main' of https://github.com/microsoft/AzureTRE into yuv…

cde5a00

…alyaron-feature/2271-add-filtering-to-list-airlock-requests

update api version

d1a584a

fix typo and rename method

5efcb14

yuvalyaron commented Aug 10, 2022

View reviewed changes

api_app/api/routes/airlock_resource_helpers.py Outdated Show resolved Hide resolved

yuvalyaron marked this pull request as ready for review August 10, 2022 15:12

yuvalyaron requested review from ross-p-smith, jjgriff93 and anatbal and removed request for ross-p-smith August 10, 2022 15:13

anatbal requested changes Aug 11, 2022

View reviewed changes

api_app/api/routes/airlock.py Outdated Show resolved Hide resolved

api_app/api/routes/airlock_resource_helpers.py Outdated Show resolved Hide resolved

api_app/api/routes/airlock.py Outdated Show resolved Hide resolved

api_app/api/routes/airlock.py Show resolved Hide resolved

guybartal requested review from anatbal and guybartal August 11, 2022 10:20

update changelog

1f7cc7b

guybartal requested changes Aug 14, 2022

View reviewed changes

api_app/api/routes/airlock_resource_helpers.py Outdated Show resolved Hide resolved

api_app/models/schemas/airlock_request.py Outdated Show resolved Hide resolved

yuvalyaron added 7 commits August 14, 2022 11:33

Merge branch 'main' of https://github.com/microsoft/AzureTRE into yuv…

cd3b67f

…alyaron-feature/2271-add-filtering-to-list-airlock-requests � Conflicts: � CHANGELOG.md � api_app/_version.py

rename AirlockRequestInList to AirlockRequestWithAllowedUserActionsIn…

e6b987d

…List

rename get_airlock_requests_by_workspace_id to get_airlock_requests

abf1df4

rename variables

ede57f0

Merge branch 'main' of https://github.com/microsoft/AzureTRE into yuv…

a39c191

…alyaron-feature/2271-add-filtering-to-list-airlock-requests � Conflicts: � CHANGELOG.md

update api version

1f93593

change endpoint permissions to allow airlock manager to access it

4064243

add role dependency to dependencies

3a88367

yuvalyaron requested a review from guybartal August 14, 2022 13:26

anatbal requested changes Aug 14, 2022

View reviewed changes

api_app/models/domain/airlock_request.py Show resolved Hide resolved

api_app/models/schemas/airlock_request.py Show resolved Hide resolved

api_app/models/schemas/airlock_request.py Outdated Show resolved Hide resolved

add get_sample_airlock_request_with_allowed_user_actions method

2d4572a

guybartal approved these changes Aug 14, 2022

View reviewed changes

anatbal approved these changes Aug 14, 2022

View reviewed changes

yuvalyaron added 2 commits August 15, 2022 11:19

add 'submit' airlock actions

ecf7ae1

combine airlock action tests

118b7b2

yuvalyaron merged commit 2eeab96 into microsoft:main Aug 15, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add filtering to list Airlock requests #2433

Add filtering to list Airlock requests #2433

yuvalyaron commented Aug 9, 2022 •

edited

Loading

github-actions bot commented Aug 9, 2022 •

edited

Loading

anatbal left a comment

guybartal left a comment

yuvalyaron commented Aug 14, 2022

github-actions bot commented Aug 14, 2022

github-actions bot commented Aug 14, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

Add filtering to list Airlock requests #2433

Add filtering to list Airlock requests #2433

Conversation

yuvalyaron commented Aug 9, 2022 • edited Loading

Resolves #2332

What is being addressed

How is this addressed

github-actions bot commented Aug 9, 2022 • edited Loading

Unit Test Results

anatbal left a comment

Choose a reason for hiding this comment

guybartal left a comment

Choose a reason for hiding this comment

yuvalyaron commented Aug 14, 2022

github-actions bot commented Aug 14, 2022

github-actions bot commented Aug 14, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 15, 2022

github-actions bot commented Aug 15, 2022

yuvalyaron commented Aug 9, 2022 •

edited

Loading

github-actions bot commented Aug 9, 2022 •

edited

Loading