Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability for workspace service to request an address space #2902

Merged
merged 39 commits into from
Dec 25, 2022
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3b36858
Add ability for workspace service to request an address space
marrobi Nov 23, 2022
03f5a57
Increase API version
marrobi Nov 23, 2022
52fb385
Fix issue in prior PR that added array to an array.
marrobi Nov 23, 2022
4c44c64
remove blank lines
marrobi Nov 23, 2022
9b5fa48
Merge branch 'main' of github.com:microsoft/AzureTRE into marrobi/iss…
marrobi Nov 23, 2022
e3578a0
Public works, private fails 445
marrobi Nov 25, 2022
0659a06
Merge branch 'main' into marrobi/issue2810
tamirkamara Nov 28, 2022
47efdf5
Merge main
marrobi Dec 2, 2022
bf84bf3
Add comment.
marrobi Dec 2, 2022
e5bc1ec
Merge branch 'main' of github.com:microsoft/AzureTRE into marrobi/iss…
marrobi Dec 8, 2022
c7402c3
Add false for force update.
marrobi Dec 8, 2022
4bfb103
Update etag logic
marrobi Dec 9, 2022
c2654cf
Add docs and changelog
marrobi Dec 9, 2022
c816d20
Merge branch 'main' into marrobi/issue2810
marrobi Dec 9, 2022
5b7f541
tf linting issues
marrobi Dec 9, 2022
712491b
Merge branch 'marrobi/issue2810' of github.com:marrobi/AzureTRE into …
marrobi Dec 9, 2022
24edf34
Remove etag from tests
marrobi Dec 9, 2022
cef3700
Remove etag from tests
marrobi Dec 9, 2022
098d368
set etag in test
marrobi Dec 9, 2022
bcfeebd
update assignent
marrobi Dec 9, 2022
9479cbd
change return object for mock
marrobi Dec 9, 2022
959129e
Set etag on modified workspace
marrobi Dec 9, 2022
5c6f9c2
add template version to modified resource
marrobi Dec 9, 2022
1d3ccea
Update templates/workspaces/base/terraform/network/providers.tf
marrobi Dec 12, 2022
42868e4
Update api_app/_version.py
marrobi Dec 12, 2022
66f16db
Update lock file and providers as per comment.
marrobi Dec 12, 2022
727afca
Merge branch 'main' into marrobi/issue2810
marrobi Dec 12, 2022
529f52e
add missing dependancies on az login
marrobi Dec 12, 2022
53441fa
Merge branch 'marrobi/issue2810' of github.com:marrobi/AzureTRE into …
marrobi Dec 12, 2022
6dc6553
Merge branch 'main' into marrobi/issue2810
marrobi Dec 14, 2022
99e6ce2
Merge branch 'main' into marrobi/issue2810
tamirkamara Dec 19, 2022
fc5565f
Merge branch 'main' into marrobi/issue2810
tamirkamara Dec 19, 2022
0de176b
Merge branch 'main' into marrobi/issue2810
tamirkamara Dec 19, 2022
00fe0d1
Merge branch 'main' into marrobi/issue2810
tamirkamara Dec 20, 2022
42badb6
Merge branch 'main' into marrobi/issue2810
tamirkamara Dec 20, 2022
8f93a8c
fix unit tests failing by async cosmos client bug
anatbal Dec 21, 2022
d1ca5bf
Merge branch 'main' into marrobi/issue2810
anatbal Dec 25, 2022
46bc406
Merge branch 'main' into marrobi/issue2810
tamirkamara Dec 25, 2022
3e5e7f8
Merge branch 'main' into marrobi/issue2810
anatbal Dec 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove blank lines
  • Loading branch information
marrobi committed Nov 23, 2022
commit 4c44c648e0350094fd6ec745ed8e212d671a7e27
3 changes: 0 additions & 3 deletions api_app/tests_ma/test_api/test_routes/test_workspaces.py
Original file line number Diff line number Diff line change
@@ -564,7 +564,6 @@ async def test_post_workspace_services_creates_workspace_service(self, _, __, __
assert response.status_code == status.HTTP_202_ACCEPTED
assert response.json()["operation"]["resourceId"] == SERVICE_ID


# [POST] /workspaces/{workspace_id}/workspace-services
@ patch("api.routes.workspaces.save_and_deploy_resource", return_value=sample_resource_operation(resource_id=SERVICE_ID, operation_id=OPERATION_ID))
@ patch("api.routes.workspaces.WorkspaceRepository.get_timestamp", return_value=FAKE_UPDATE_TIMESTAMP)
@@ -598,7 +597,6 @@ async def test_post_workspace_services_creates_workspace_service_with_address_sp
assert response.status_code == status.HTTP_202_ACCEPTED
assert response.json()["operation"]["resourceId"] == SERVICE_ID


# [POST] /workspaces/{workspace_id}/workspace-services
@ patch("api.dependencies.workspaces.WorkspaceRepository.get_new_address_space", return_value="10.1.4.0/24")
@ patch("api.routes.workspaces.ResourceTemplateRepository.get_template_by_name_and_version")
@@ -618,7 +616,6 @@ async def test_post_workspace_services_creates_workspace_service_with_address_sp
assert response.status_code == status.HTTP_400_BAD_REQUEST
assert response.text == strings.WORKSPACE_DOES_NOT_HAVE_ADDRESS_SPACES_PROPERTY


# [POST] /workspaces/{workspace_id}/workspace-services
@ patch("api.dependencies.workspaces.WorkspaceRepository.get_workspace_by_id")
@ patch("api.routes.workspaces.OperationRepository.resource_has_deployed_operation", return_value=True)