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

Conversation

marrobi
Copy link
Member

@marrobi marrobi commented Nov 23, 2022

Resolves #2810

What is being addressed

  • If workspace service template requires an address_space then add one to the workspace
  • Fix error in prior PR (test was failing) as was adding a property to a property, rather than just its value
  • Update documentation
  • Update CHANGELOG.md

Note:

I have done the logic bit in the route - not sure if this is the best place but was easiest for me to implement.

The update of the workspace itself is down to the workspace service bundle such as:

  "pipeline": {
    "install": [
      {
        "stepId": "12ba0dad-ea6c-4d0d-9255-d316212f5ffa",
        "stepTitle": "Upgrade to ensure aware of address space",
        "resourceType": "workspace",
        "resourceAction": "upgrade",
        "properties": [
        ]
      },
      {
        "stepId": "main"
      },

@marrobi marrobi enabled auto-merge (squash) November 23, 2022 10:47
@github-actions
Copy link

github-actions bot commented Nov 23, 2022

Unit Test Results

538 tests   538 ✔️  14s ⏱️
    1 suites      0 💤
    1 files        0

Results for commit 3e5e7f8.

♻️ This comment has been updated with latest results.

@marrobi marrobi requested a review from tamirkamara November 23, 2022 11:02
@marrobi
Copy link
Member Author

marrobi commented Nov 23, 2022

/test

@github-actions
Copy link

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/3531698480 (with refid d044883e)

(in response to this comment from @marrobi)

api_app/api/routes/workspaces.py Show resolved Hide resolved
api_app/schemas/workspace.json Show resolved Hide resolved
api_app/api/routes/workspaces.py Outdated Show resolved Hide resolved
@LizaShak
Copy link
Collaborator

/test-extended

@github-actions
Copy link

🤖 pr-bot 🤖

⚠️ Cannot run tests as PR is not mergeable. Ensure that the PR is open and doesn't have any conflicts.

(in response to this comment from @LizaShak)

@tamirkamara
Copy link
Collaborator

/test-extended

@github-actions
Copy link

🤖 pr-bot 🤖

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

(in response to this comment from @tamirkamara)

@tamirkamara
Copy link
Collaborator

/test-extended-aad

@github-actions
Copy link

🤖 pr-bot 🤖

🏃 Running extended AAD tests: https://github.com/microsoft/AzureTRE/actions/runs/3571764439 (with refid d044883e)

(in response to this comment from @tamirkamara)

marrobi added a commit that referenced this pull request Nov 30, 2022
…spaces

Workspace upgrade commands currently fail. This fix is included in #2902 but we might want to merge this sooner.
@marrobi
Copy link
Member Author

marrobi commented Dec 8, 2022

Have an issue with etags on this, works through swagger, not the UI.

@marrobi
Copy link
Member Author

marrobi commented Dec 9, 2022

Sorted the etag issue.

@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 12:59 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 12:59 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 12:59 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 12:59 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:03 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:05 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:05 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:05 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:05 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:05 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:25 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 13:25 — with GitHub Actions Inactive
@tamirkamara tamirkamara temporarily deployed to CICD December 25, 2022 14:10 — with GitHub Actions Inactive
@anatbal
Copy link
Contributor

anatbal commented Dec 25, 2022

This extended e2e passed on this run https://github.com/microsoft/AzureTRE/actions/runs/3775797437
was not automatically merged since there was a conflict with api version

@anatbal
Copy link
Contributor

anatbal commented Dec 25, 2022

/test-force-approve

@github-actions
Copy link

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit f710638c9ddffeb54ff156977358871d4a91498c)

(in response to this comment from @anatbal)

@anatbal
Copy link
Contributor

anatbal commented Dec 25, 2022

/test-force-approve

@github-actions
Copy link

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit 3e5e7f8)

(in response to this comment from @anatbal)

@marrobi marrobi merged commit 713b72a into microsoft:main Dec 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

modify workspace service item creation to get an address space if specified
4 participants