Skip to content

Conversation

@JamesNK
Copy link
Member

@JamesNK JamesNK commented Nov 11, 2025

Description

PR #12172 added a new tenant ID option. However, if there is no subscription ID then the choice input is left enabled.

PR changes:

  • Subscription ID is disabled until a tenant is selected
  • Removes unnessessary dynamic load options whe subscription ID is a disabled textbox

Fixes #12882

Checklist

  • Is this feature complete?
    • Yes. Ready to ship.
    • No. Follow-up changes expected.
  • Are you including unit tests for the changes and scenario tests if relevant?
    • Yes
    • No
  • Did you add public API?
    • Yes
      • If yes, did you have an API Review for it?
        • Yes
        • No
      • Did you add <remarks /> and <code /> elements on your triple slash comments?
        • Yes
        • No
    • No
  • Does the change make any security assumptions or guarantees?
    • Yes
      • If yes, have you done a threat model and had a security review?
        • Yes
        • No
    • No
  • Does the change require an update in our Aspire docs?

@JamesNK JamesNK requested a review from davidfowl November 11, 2025 09:15
@JamesNK JamesNK added the area-integrations Issues pertaining to Aspire Integrations packages label Nov 11, 2025
Copilot AI review requested due to automatic review settings November 11, 2025 09:15
@github-actions
Copy link
Contributor

github-actions bot commented Nov 11, 2025

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 12888

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 12888"

Copilot finished reviewing on behalf of JamesNK November 11, 2025 09:16
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR fixes a bug where the subscription ID input field was not properly disabled when there's no pre-configured subscription ID. The issue was introduced in PR #12172 which added tenant ID selection.

Key changes:

  • Conditional creation of InputLoadOptions for subscription ID (only when not pre-configured)
  • Always initialize subscription ID input as disabled
  • Removed redundant null check inside the LoadCallback

@davidfowl
Copy link
Member

Does this preserve when the subscription is already set from config? (Which means the tenant isn’t required)

@JamesNK
Copy link
Member Author

JamesNK commented Nov 11, 2025

I think so. The changes are minor (listed in PR body).

I would test, but I don't know how to get just a SubscriptionId preset but still have the dialog pop up.

@davidfowl
Copy link
Member

Set Azure:SubscriptionId in your config

@JamesNK
Copy link
Member Author

JamesNK commented Nov 11, 2025

It's already broken on main.

image

Location input is disabled and is never enabled when there is an Azure:SubscriptionId in the config.

@JamesNK
Copy link
Member Author

JamesNK commented Nov 11, 2025

I believe I've fixed both scenarios. Please double check.

.interaction-input-dialog .interaction-input ::deep fluent-select,
.interaction-input-dialog .interaction-input ::deep fluent-combobox {
.interaction-input-dialog .interaction-input ::deep fluent-combobox,
.interaction-input-dialog .interaction-input ::deep label {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated. Label width not being the same as input has bugged me

@davidfowl davidfowl merged commit 1d5ab36 into main Nov 11, 2025
296 checks passed
@davidfowl davidfowl deleted the jamesnk/azure-provisioning-fixes branch November 11, 2025 15:11
@dotnet-policy-service dotnet-policy-service bot added this to the 13.1 milestone Nov 11, 2025
@JamesNK
Copy link
Member Author

JamesNK commented Nov 11, 2025

/backport to release/13.0

@github-actions
Copy link
Contributor

Started backporting to release/13.0: https://github.com/dotnet/aspire/actions/runs/19281772994

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-integrations Issues pertaining to Aspire Integrations packages

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Azure provisioning Subscription ID input not disabled

3 participants