Create and delete Airlock Review VMs #2740

tanya-borisova · 2022-10-16T18:12:38Z

Resolves #2737

What is being addressed

Add endpoints for creating an Airlock Review user resources.
Add cleaning up of these user resources in /review method.
For details on the design, please see the parent issue #2735

The methods can be used so long as the workspace configuration is set up appropriately.

Additionally, made changes to tre-service-guacamole-import-reviewvm and tre-service-guacamole-export-reviewvm to make the correct configuration the default one.

This reverts commit 29e069e.

…up-vms-used-to-review-airlock-requests

github-actions · 2022-10-16T18:15:22Z

Unit Test Results

518 tests +516 518 ✔️ +517 13s ⏱️ - 1h 5m 39s
    1 suites ±    0     0 💤 ±    0
    1 files ±    0     0 ❌ -     1

Results for commit 94fe0c6. ± Comparison against base commit d08fec3.

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

test_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_cleans_up_review_user_resources
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_review_user_resource_returns_200
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_review_user_resource_returns_400_if_request_is_not_in_review
tests_ma.test_api.test_routes.test_airlock.TestAirlockRoutesThatRequireAirlockManagerRights ‑ test_post_create_review_user_resource_returns_422_if_cannot_find_workspace_service
…

♻️ This comment has been updated with latest results.

api_app/api/routes/airlock_resource_helpers.py

tanya-borisova · 2022-10-16T22:58:55Z

/test-extended

github-actions · 2022-10-16T22:59:06Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3261246018 (with refid bfc08187)

(in response to this comment from @tanya-borisova)

tanya-borisova · 2022-10-17T08:17:59Z

@marrobi @damoodamoo This is how creation of the workspace screen looks like now, possibly something here is broken as the description text repeats twice. However it doesn't currently ask for any inputs (maybe that also is a bug?)

tanya-borisova · 2022-10-17T09:33:47Z

/test-destroy-env

github-actions · 2022-10-17T09:34:26Z

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

github-actions · 2022-10-17T09:34:28Z

Destroying branch test environment (RG: rg-treac2051d6)... (run: https://github.com/microsoft/AzureTRE/actions/runs/3263995310)

github-actions · 2022-10-17T09:34:31Z

Branch test environment destroy complete (RG: rg-treac2051d6)

github-actions · 2022-10-17T09:52:52Z

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

tanya-borisova · 2022-10-17T09:57:16Z

/test-extended

github-actions · 2022-10-17T09:57:30Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3264145051 (with refid bfc08187)

(in response to this comment from @tanya-borisova)

jjgriff93

Really great work! Just some minor suggestions etc., up to you which you want to look at/ignore

api_app/api/routes/airlock.py

tanya-borisova · 2022-10-17T15:44:50Z

/test-extended

github-actions · 2022-10-17T15:45:11Z

🤖 pr-bot 🤖

🏃 Running extended tests: https://github.com/microsoft/AzureTRE/actions/runs/3266580473 (with refid bfc08187)

(in response to this comment from @tanya-borisova)

tanya-borisova · 2022-10-17T18:49:33Z

/test-force-approve

Successful test run in a comment above

github-actions · 2022-10-17T18:49:47Z

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit 94fe0c6)

(in response to this comment from @tanya-borisova)

tanya-borisova added 19 commits October 6, 2022 16:12

WIP: started working on cleanup trigger

29e069e

Revert "WIP: started working on cleanup trigger"

1b9eac7

This reverts commit 29e069e.

WIP: doing some renames, created a file for review VMs

abd22da

WIP: just comments

e08d14f

wip

01486d3

wip: first sketch of VM cleanup

5040a5a

Merge remote-tracking branch 'origin/main' into tborisova/2507-clean-…

f41e113

…up-vms-used-to-review-airlock-requests

wip: method for creating VMs

30f6231

Merge remote-tracking branch 'origin/main' into tborisova/2507-clean-…

4ef7801

…up-vms-used-to-review-airlock-requests

wip: fix defaults

800bc64

WIP: create review vms is working

daafd0f

delete VMs working

b12d335

fix comments

b076c39

remove comments

5aa8db3

Fix existing tests

b5922ca

Update tests to cover deleting of review VMs

8655ce2

Move things back to airlock_resource_helpers.py

1edb146

Add test for happy path

9db3c77

beef up tests and error handling

94aa122

tanya-borisova commented Oct 16, 2022

View reviewed changes

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

tanya-borisova added 2 commits October 16, 2022 19:20

nits

a21ebf8

Add schema for airlock review user resources

1cfd614

tanya-borisova marked this pull request as ready for review October 16, 2022 22:59

tanya-borisova added 2 commits October 17, 2022 14:49

Fix the template_schema.json and resource_template.py

6a37b53

reorder blocks in template_schema.json

527ae67

jjgriff93 approved these changes Oct 17, 2022

View reviewed changes

Apply comments

43c4b8d

spelling

94fe0c6

tanya-borisova enabled auto-merge (squash) October 17, 2022 15:47

tanya-borisova merged commit 0d64b67 into main Oct 17, 2022

tanya-borisova deleted the tborisova/2735-create-delete-review-vms branch October 17, 2022 18:49

This was referenced Oct 18, 2022

Clean up VMs used to review Airlock requests #2507

Closed

Temporarily revert changes in template_schema base #2750

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create and delete Airlock Review VMs #2740

Create and delete Airlock Review VMs #2740

tanya-borisova commented Oct 16, 2022 •

edited

Loading

github-actions bot commented Oct 16, 2022 •

edited

Loading

tanya-borisova commented Oct 16, 2022

github-actions bot commented Oct 16, 2022

tanya-borisova commented Oct 17, 2022

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

jjgriff93 left a comment

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

Create and delete Airlock Review VMs #2740

Create and delete Airlock Review VMs #2740

Conversation

tanya-borisova commented Oct 16, 2022 • edited Loading

Resolves #2737

What is being addressed

github-actions bot commented Oct 16, 2022 • edited Loading

Unit Test Results

tanya-borisova commented Oct 16, 2022

github-actions bot commented Oct 16, 2022

tanya-borisova commented Oct 17, 2022

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

jjgriff93 left a comment

Choose a reason for hiding this comment

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

tanya-borisova commented Oct 17, 2022

github-actions bot commented Oct 17, 2022

tanya-borisova commented Oct 16, 2022 •

edited

Loading

github-actions bot commented Oct 16, 2022 •

edited

Loading