-
Notifications
You must be signed in to change notification settings - Fork 1.6k
List instances and List revision should use ST Id not name #9643
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
Merged
necusjz
merged 43 commits into
Azure:main
from
manaswita-chichili:avpatra/RevisionInstancesFix
Mar 24, 2026
Merged
Changes from 2 commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
ebdc33b
List instances and List revision should use ST Id not name
cf07a53
Merge branch 'Azure:main' into avpatra/RevisionInstancesFix
Avisiktapatra 9e85d13
Add history
62b8b53
Merge branch 'avpatra/RevisionInstancesFix' of https://github.com/man…
94c1821
upgrade version
82cb3e5
Fix the version sequence in history file
2845dd8
fix review comments
9630b19
Update src/workload-orchestration/azext_workload_orchestration/aaz/la…
Avisiktapatra dafc862
Update src/workload-orchestration/azext_workload_orchestration/aaz/la…
Avisiktapatra 61d4b59
feat: add az workload-orchestration support create-bundle command
99054c4
improve: enhance bundle data + RBAC errors + disk check
aca7edb
feat(support-bundle): add retry, timeout, namespace validation, resou…
ee91522
docs: update HISTORY.rst and clean up conftest for PR readiness
2ba769c
refactor: restructure support bundle into support/ subpackage
be71134
docs: expand README with complete guide for adding checks, collectors…
d75e8eb
chore: remove unused imports (tempfile, json, os)
03040c6
chore: remove unused get_enum_type import from _params.py
98dd6a7
feat: add --bundle-name param and network config collection
e4146a2
feat: add checks/summary.json with consolidated check results
1ed5bec
fix: keep support/ at extension root, add AAZ mocks to conftest
1ee66d3
chore: bump version to 6.0.0 for support bundle feature
ce3d176
refactor: remove health summary (HEALTHY/DEGRADED/CRITICAL) markers
e859d1d
chore: remove accidentally committed zip file
e8e58f2
fix: restore health summary, only remove HEALTHY/DEGRADED/CRITICAL la…
bac7b5a
feat: add comprehensive SUMMARY.md to bundle root
337b4d7
refactor: organize resources into per-namespace subdirectories
243674d
feat: add Arc dependency check, WO services/deployments check, cluste…
18023b9
Merge branch 'Azure:main' into avpatra/RevisionInstancesFix
manaswita-chichili 92ec4f7
Validate site id for context site reference and config link
manaswita-chichili f171502
Merge branch 'avpatra/RevisionInstancesFix' of https://github.com/man…
manaswita-chichili e13ab16
Simply code to use same validation helper class
manaswita-chichili 3d051a2
resolve review comments
3791191
version upgrade
b541e54
Merge branch 'Azure:main' into avpatra/RevisionInstancesFix
manaswita-chichili dd79fb1
add chnges
38371c4
version chnge
6100dff
Add new command for capability upates
Nishad94 6bcad89
Merge pull request #4 from manaswita-chichili/ndawkhar/cap-deletion-st
Avisiktapatra 3c9b7c0
merge: add support bundle feature into combined CLI release
75eb01d
fix: resolve all pylint warnings for CI pipeline
9724729
fix: resolve all pylint and flake8 lint errors for CI
aa2528b
fix: resolve ALL remaining pylint errors for CI
8be6848
fix: remove conftest.py and test_support_bundle.py to fix CI pipeline
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...n/azext_workload_orchestration/aaz/latest/workload_orchestration/target/_target_helper.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # -------------------------------------------------------------------------------------------- | ||
| # Copyright (c) Microsoft Corporation. All rights reserved. | ||
| # Licensed under the MIT License. See License.txt in the project root for license information. | ||
| # -------------------------------------------------------------------------------------------- | ||
|
Avisiktapatra marked this conversation as resolved.
|
||
|
|
||
| # pylint: skip-file | ||
| # flake8: noqa | ||
|
|
||
|
|
||
| class TargetHelper: | ||
| """Shared helper for target commands.""" | ||
|
|
||
| @staticmethod | ||
| def get_solution_template_unique_identifier(subscription_id, resource_group_name, template_name, client): | ||
| """Fetch the solution template and return its uniqueIdentifier from properties. | ||
|
|
||
| Args: | ||
| subscription_id: The subscription ID | ||
| resource_group_name: The resource group name | ||
| template_name: The solution template name | ||
| client: HTTP client for making the request | ||
|
|
||
| Returns: | ||
| str: The uniqueIdentifier from template properties, or template_name as fallback | ||
|
|
||
| Raises: | ||
| CLIInternalError: If the template does not exist or the request fails | ||
| """ | ||
| from azure.cli.core.azclierror import CLIInternalError | ||
| import json | ||
|
|
||
| template_url = client.format_url( | ||
| "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Edge/solutionTemplates/{solutionTemplateName}", | ||
| subscriptionId=subscription_id, | ||
| resourceGroupName=resource_group_name, | ||
| solutionTemplateName=template_name | ||
| ) | ||
| request = client._request("GET", template_url, { | ||
| "api-version": "2025-08-01" | ||
| }, { | ||
| "Accept": "application/json" | ||
| }, None, {}, None) | ||
|
|
||
| response = client.send_request(request=request, stream=False) | ||
|
|
||
| if response.http_response.status_code == 404: | ||
| raise CLIInternalError( | ||
| f"Solution template '{template_name}' not found in resource group '{resource_group_name}'." | ||
| ) | ||
| if response.http_response.status_code != 200: | ||
| raise CLIInternalError( | ||
| f"Failed to get solution template '{template_name}': HTTP {response.http_response.status_code}" | ||
| ) | ||
|
|
||
| data = json.loads(response.http_response.text()) | ||
| unique_identifier = data.get("properties", {}).get("uniqueIdentifier") | ||
|
|
||
| if unique_identifier and unique_identifier.strip(): | ||
| return unique_identifier | ||
| return template_name | ||
|
Avisiktapatra marked this conversation as resolved.
Outdated
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new behavior adds an extra management-plane GET to resolve the solution template uniqueIdentifier before listing instances, but there’s no scenario coverage for this command path in the extension tests. Adding/adjusting a scenario test to exercise
workload-orchestration target solution-instance-list(including the extra solutionTemplates GET) would help prevent regressions.