Skip to content

WO Release/april2026#9799

Open
atharvau wants to merge 93 commits intoAzure:mainfrom
manaswita-chichili:release/april2026
Open

WO Release/april2026#9799
atharvau wants to merge 93 commits intoAzure:mainfrom
manaswita-chichili:release/april2026

Conversation

@atharvau
Copy link
Copy Markdown
Member

@atharvau atharvau commented Apr 20, 2026

This checklist is used to make sure that common guidelines for a pull request are followed.

Related command

General Guidelines

  • Have you run azdev style <YOUR_EXT> locally? (pip install azdev required)
  • Have you run python scripts/ci/test_index.py -q locally? (pip install wheel==0.30.0 required)
  • My extension version conforms to the Extension version schema

For new extensions:

About Extension Publish

There is a pipeline to automatically build, upload and publish extension wheels.
Once your pull request is merged into main branch, a new pull request will be created to update src/index.json automatically.
You only need to update the version information in file setup.py and historical information in file HISTORY.rst in your PR but do not modify src/index.json.

Atharva and others added 30 commits April 14, 2026 11:03
feat: enhanced target create with onboarding simplification flags
139d152 
Add --init-extended-location, --init-context, --init-hierarchy, --service-group,
and --release-train flags to 'az workload-orchestration target create' to reduce
onboarding from 15+ manual steps to a single command.

New commands:
- target prepare: Prepares Arc cluster (cert-mgr, trust-mgr, extension, CL)
- hierarchy create: Creates site hierarchy (SG, Site, Config, SiteRef)

Pre-operation hooks in target create:
1. --init-extended-location: calls target_prepare to set up cluster + CL
2. --init-context: discovers/creates WO context with capability injection
3. --init-hierarchy: creates site hierarchy linked to context
4. Default target-specification: injects Helm v3 in-cluster if not provided

Post-operation hook:
5. --service-group: links target to a service group after creation

8 flag combinations supported (from vanilla to full onboarding).
Includes unit tests for hierarchy, SG link, utils, and target prepare.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: extract onboarding handlers into focused modules
5d9fb5a 
- Extract _handle_init_context (150 lines) → context_init.py
- Extract _handle_init_hierarchy (100 lines) → hierarchy_init.py
- Add parse_arm_id() to utils.py (replaces 6 inline ARM ID parsers)
- Add invoke_silent() to utils.py (replaces 4 stdout suppression blocks)
- Use DEFAULT_TARGET_SPECIFICATION from consts.py
- _create.py custom code: 400 lines → 60 lines (orchestration only)
- Each onboarding module now has a single clear responsibility

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: resolve context_id before init-hierarchy and fix sub_id lookup
5374406 
- Move context_id config resolution before --init-hierarchy (hierarchy
  needs context_id for site-reference linking)
- Extract _resolve_context_id_from_config() for clarity
- Fix hierarchy_init.py sub_id: parse from context_id ARM ID or fall
  back to CLI Profile instead of cli_ctx.data (which returns None)

Tested: all 7 flag combinations pass on live AKS cluster

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove standalone 'target prepare' command
cc808d4 
The cluster preparation logic is now only accessible via
'target create --init-extended-location'. The underlying target_prepare
module is retained as an internal dependency.

Removed from: commands.py, _params.py, _help.py, custom.py

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove standalone 'hierarchy create' command
be0e419 
Hierarchy creation is now only accessible via 'target create --init-hierarchy'.
The underlying modules are retained as internal dependencies.

Removed from: commands.py, _params.py, _help.py, custom.py

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: address PR review comments from Copilot
9b5c319 
- Fix --release-train help text: 'dev' -> 'stable' to match DEFAULT_RELEASE_TRAIN
- Remove unused imports: PropertyMock from test_target_prepare, json/call from test_sg_link_and_utils
- Fix hierarchy_create.py docstring: remove claim about updating capabilities
- Preserve tags in target_sg_link refresh PUT to avoid dropping metadata

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: align with team feedback - separate target init, remove ini…
bc354b4 
…t flags from target create

- Remove --init-extended-location, --init-context, --init-hierarchy, --release-train from target create
- Add 'target init' as standalone command (wraps target_prepare)
- Keep --service-group and default target-spec on target create
- Aligns with team decision: cluster setup and hierarchy as separate commands

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: add target deploy command (review → publish → install)
a927395 
Implements 'az workload-orchestration target deploy' that chains
review, publish, and install into a single command with LRO polling.

- Supports --skip-review and --skip-install flags
- Supports --config-file for pre-review configuration
- Uses send_raw_request with ARM resource auth
- Polls LRO via Location/Azure-AsyncOperation headers

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: enhance target deploy with friendly name, resume-from, config-set
3bb524c 
- Add --solution-template-name + --solution-template-version (friendly name)
  as alternative to --solution-template-version-id (ARM ID)
- Add --solution-template-rg for cross-RG templates
- Add --resume-from publish|install with --solution-version-id
- Add --solution-dependencies pass-through to review
- Add --config for pre-review configuration set
- Proper mutual exclusivity validation between ARM ID and friendly name
- Dynamic step counter adjusts based on active steps

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: extract solutionVersionId from properties.id in LRO response
d88dc65 
The review LRO response nests the solution version ARM ID at
properties.id, not properties.properties.id or the top-level id.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: add --solution flag to config-set and improve logging
3ca0b77 
- Config set needs --solution flag to use solution templates (not config templates)
- Improved solutionVersionId extraction debug logging

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove skip flags, fix linter errors, add short aliases
066689c 
- Remove --skip-review, --skip-install, --no-wait from target deploy
- Fix disallowed HTML tags in help (wrap placeholders in backticks)
- Add short aliases: --stv-id, --stv, --ct-version for long options
- Remove --no-wait example from help

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
cleanup: remove duplicate output from target init
e5e330c 
- Remove 'Next steps' and 'Extended Location JSON' print lines
- Keep diagnostic summary and success message
- CLI framework already prints the return dict as JSON

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
cleanup: remove preview tags from target and support command groups
84a10dc 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: step counter display in target deploy
d81f4bc 
Counter now increments only on step start, not on status update.
Shows [1/3]...[1/3] OK, [2/3]...[2/3] OK, [3/3]...[3/3] OK.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: return install LRO result matching native target install format
230ea5c 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
cleanup: remove diagnostic summary from target init success output
fa2bc60 
Keep it only on error paths for debugging.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: context create accepts --site-id to auto-create site reference
51e988e 
When --site-id is provided, automatically creates a site-reference
linking the site to the context after creation. Site reference name
is derived from the site name (e.g., mySite -> mySite-ref).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove --resume-from and --solution-version-id from target …
45ad448 
…deploy

Users can use individual commands (target review/publish/install) for
partial operations. Deploy is now always a full chain.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: merge deploy into target install, remove standalone deploy command
bca3b13 
target install now supports two flows:
1. Full deploy: --solution-template-name + --stv (or --stv-id)
   Runs: config-set (opt) → review → publish → install
2. Direct install: --solution-version-id (old flow)
   Runs: install only

Removed: target deploy command, _params, _help, commands.py registration.
Kept: target_deploy.py module (used internally by install pre_operations).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove config-template args, auto-derive from solution temp…
c5e06bb 
…late

Config-set now auto-derives template info from solution template args:
  config-template-rg → solution-template-rg or --resource-group
  config-template-name → solution-template-name
  config-template-version → solution-template-version

Usage simplified to:
  az wo target install -g rg -n target --solution-template-name X --stv 1.0.0 --configuration values.yaml

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: rename 'target init' to 'cluster init'
ba7bd26 
Better reflects the command's purpose - it prepares the cluster,
not a specific target.

Command: az workload-orchestration cluster init -c cluster -g rg -l region

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove default target-specification auto-injection
d98e2aa 
Per Shubham's feedback: don't touch --target-specification.
Upcoming non-K8s workloads may change this, marked as future work.
Users must provide --target-specification explicitly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove --solution-template-rg per Shubham's feedback
7250fe9 
Solution templates can be in any RG, so friendly name resolution
uses the target's --resource-group. For cross-RG templates, use
the full ARM ID via --solution-template-version-id.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
cleanup: remove short aliases, use full option names only
24992eb 
Removed --stv-id and --stv aliases. Use full names:
  --solution-template-version-id
  --solution-template-version

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: remove leftover solution_template_rg reference in config path
7927663 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove skip, kube, and reinstall options from cluster init
e600c9a 
Removed:
- --skip-cert-manager, --skip-trust-manager
- --kube-config, --kube-context
- Failed extension auto-reinstall logic

Kept args: -c, -g, -l, --release-train, --extension-version,
--extension-name, --custom-location-name

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: add hierarchy create command (ResourceGroup + ServiceGroup)
4642f2d 
Creates full resource stack in one command:
  1. Site (with level label)
  2. Configuration (in specified region)
  3. ConfigurationReference (links site to config)

Supports:
  - ResourceGroup: single site via --resource-group + shorthand/YAML
  - ServiceGroup: nested hierarchy up to 3 levels via YAML file

Usage:
  az wo hierarchy create -g rg --configuration-location eastus2euap --hierarchy-spec 'name=X level=factory'
  az wo hierarchy create --configuration-location eastus2euap --hierarchy-spec hierarchy.yaml

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: hierarchy create with SG support, RBAC propagation, RG-scoped c…
e735464 
…onfigs

- ResourceGroup flow: Site + Config + ConfigRef (3 resources)
- ServiceGroup flow: recursive SG + Site + Config + ConfigRef (up to 3 levels, 12 resources)
- Configs are always RG-scoped (--resource-group required)
- RBAC propagation wait after each SG creation (polls site list)
- Removed old hierarchy_create.py, using clean v2

E2E tested: 3-level SG hierarchy created successfully.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
refactor: remove --solution-instance-name and --solution-dependencies…
5014bb0 
… from target install

These are review-specific args. Users can use standalone 'target review'
for advanced scenarios. Keeps target install clean.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Atharva and others added 4 commits April 28, 2026 22:58
feat(wo): hierarchy create - if existing Site has a ConfigRef, leave …
eafcff6 
…whole chain alone

Per design discussion: when reusing an existing Site, the
ConfigurationReference attached to it is what hierarchy resolution
and config-set follow. If a ConfigRef already exists, treat the
Configuration + ConfigRef chain as canonical and do nothing — even
if its target Configuration name doesn't match what we'd construct.

- Existing Site + existing ConfigRef -> single GET, zero PUTs.
- Existing Site, no ConfigRef -> ensure Configuration (skip-if-exists),
  then create ConfigRef pointing to it.
- Fresh Site -> create Site + Configuration (skip-if-exists) + ConfigRef.
- Returned configurationId reflects the actually-wired Configuration
  (the ConfigRef target when reused, otherwise our constructed id).
- Same flow applies to RG and SG paths.
fix(wo): hierarchy create SG path - parse JSON from regional ARM GET
8c54ed0 
Bug: '_arm_get_regional' was returning the raw 'Response' object instead
of parsed JSON, so the existing-ConfigRef reuse check on the SG path
crashed with:

  AttributeError: 'Response' object has no attribute 'get'

Fix: mirror '_arm_get' behavior - call .json() (with json.loads fallback),
return None on 404, log+None on other GET failures.

The RBAC propagation waiter was the only other caller and it relied
on send_raw_request raising for any non-2xx. Refactored it to call
send_raw_request directly so it still distinguishes 'RBAC ready'
(2xx) from 'not ready' (4xx -> raise -> retry).
context create: drop manual run hint on site-ref failure
eeb45b2 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
target create: simplify service-group link log messages
4359ddf 
Drop tree-style (└──) prefixes — just print plain status lines.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@atharvau atharvau force-pushed the release/april2026 branch 2 times, most recently from 244d3b2 to 7e6b0df Compare April 29, 2026 05:48
target install: remove step progress output, keep only JSON
bda5d2a 
- Remove Config Set/Review/Publish progress messages from install output
- Remove Deployment complete banner and Install tick message
- Install now outputs only the final JSON response (clean for customers)
- Keep --solution-template-rg as-is (CLI linter rejects longer names)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@atharvau atharvau force-pushed the release/april2026 branch 7 times, most recently from 4d800b0 to 1734daf Compare April 29, 2026 07:17
refactor: rename onboarding/ to common/, consolidate by resource type
0d90f44 
- Renamed onboarding package to common (better reflects purpose)
- Consolidated files by resource type per review feedback:
  context_init.py + context_capability.py -> context.py
  hierarchy_init.py + hierarchy_create.py -> hierarchy.py
  target_prepare.py + target_deploy.py + target_sg_link.py -> target.py
- Kept consts.py and utils.py as shared utilities
- Updated all import references across 20+ files
- Removed unused _eprint and _short_id from target_deploy
- No logic changes - pure structural refactor

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@atharvau atharvau force-pushed the release/april2026 branch from 1734daf to 0d90f44 Compare April 29, 2026 07:18
Atharva and others added 3 commits April 29, 2026 13:11
chore(common): remove dead code, deduplicate helpers, trim unused con…
48b60d4 
…stants

- Remove target_deploy() and _do_install() (never imported)
- Remove handle_init_context() + 4 helper functions (feature removed)
- Remove print_success() and print_detail() (unused)
- Replace duplicate _eprint in hierarchy.py with import from utils
- Remove 6 unused constants from consts.py
- Net: -397 lines of dead code

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix(target): handle HTTPError from send_raw_request in config-set
7ee26fc 
send_raw_request raises HTTPError on non-2xx responses instead of
returning the response object. The _handle_config_set function expected
to check .status_code == 404 to detect first-time dynamic config
creation, but the exception was raised before reaching that check.

Fix: wrap the GET in try/except HTTPError so the 404 (expected for
first-time config-set) triggers the create-new branch correctly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
chore(hierarchy): remove '✅ Hierarchy created' log message
33bf253 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@necusjz
Copy link
Copy Markdown
Member

necusjz commented Apr 30, 2026

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Apr 30, 2026

Azure Pipelines successfully started running 2 pipeline(s).

Atharva and others added 3 commits April 30, 2026 09:03
fix: add --solution-template-resource-group alias and license header
3757e6e 
- Add --solution-template-resource-group as alias for --solution-template-rg in target install
- Add missing license header to context/capability/__init__.py

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
style: fix E303 too many blank lines in hierarchy.py
ae7bf2d 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
feat: make --target-specification required on target create
5264f9e 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@necusjz
Copy link
Copy Markdown
Member

necusjz commented Apr 30, 2026

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented Apr 30, 2026

Azure Pipelines successfully started running 2 pipeline(s).

Atharva and others added 4 commits April 30, 2026 16:16
fix: cluster init CL validation, hierarchy bugs, output format
f75ca1a 
- Custom Location: validate hostResourceId before skipping creation
  (prevents silent skip when CL name exists for a different cluster)
- Custom Location: remove extended-location.json file creation
- Custom Location: remove Custom Location ID print
- Hierarchy: validate sibling nodes have consistent level names
- Hierarchy: patch existing site with updated labels on reuse
- Hierarchy: increase RBAC propagation timeout to 150s
- Output: simplify cluster init output format (no tree characters)
- Help: update cluster init help text

Fixes: #37753265, #37752999, #37753271

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
style: fix E303 too many blank lines
05edcf3 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fix: let ValidationError propagate from CL check in cluster init
da6558c 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
style: add tree characters to cluster init output
452fede 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@necusjz necusjz Awaiting requested review from necusjz

At least 1 approving review is required to merge this pull request.

Assignees

@necusjz necusjz

Labels

None yet

Projects

None yet

Milestone

May 2026 (2026-05-05)

Development

Successfully merging this pull request may close these issues.

5 participants

@atharvau @yonzhan @necusjz @guptahars