Refactor sub fallback #1228
Draft
Refactor sub fallback #1228
Conversation
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
Comment on lines
+50
to
+66
| string subscriptionId; | ||
| try | ||
| { | ||
| // Get the subscription ID first, whether the input is a name or ID | ||
| subscriptionId = await GetSubscriptionId(subscription, tenant, retryPolicy, cancellationToken); | ||
| } | ||
| catch | ||
| { | ||
| // If the subscription lookup failed, try environment variable as fallback | ||
| var envSubscription = Core.Helpers.EnvironmentHelpers.GetAzureSubscriptionId(); | ||
| if (string.IsNullOrEmpty(envSubscription)) | ||
| { | ||
| throw; // Re-throw the original exception if no environment variable is available | ||
| } | ||
|
|
||
| subscriptionId = await GetSubscriptionId(envSubscription, tenant, retryPolicy, cancellationToken); | ||
| } |
Contributor
There was a problem hiding this comment.
By the time we reach this point, didn't we already go through the logic in CommandHelper which checks for --subscription being passed, and if it wasn't falling back to the environment variable AZURE_SUBSCRIPTION_ID? So, wouldn't this be more confusing as if I pass --subscription invalid but have AZURE_SUBSCRIPTION_ID=valid I now have a complicated to understand flow with my --subscription input being ignored and --subscription valid was used.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
[Provide a clear, concise description of the changes]Refactor the subscription fallback logic. Attempt env var only when the provided one does not exist.
[Any additional context, screenshots, or information that helps reviewers]GitHub issue number?
[Link to the GitHub issue this PR addresses]Pre-merge Checklist
servers/Azure.Mcp.Server/CHANGELOG.mdand/orservers/Fabric.Mcp.Server/CHANGELOG.mdfor product changes (features, bug fixes, UI/UX, updated dependencies)servers/Azure.Mcp.Server/README.mdand/orservers/Fabric.Mcp.Server/README.mddocumentationeng/scripts/Process-PackageReadMe.ps1. See Package README/servers/Azure.Mcp.Server/docs/azmcp-commands.mdand/or/docs/fabric-commands.md.\eng\scripts\Update-AzCommandsMetadata.ps1to update tool metadata in azmcp-commands.md (required for CI)ToolDescriptionEvaluatorand obtained a score of0.4or more and a top 3 ranking for all related test promptsconsolidated-tools.json/servers/Azure.Mcp.Server/docs/e2eTestPrompts.mdcrypto mining, spam, data exfiltration, etc.)/azp run mcp - pullrequest - liveto run Live Test Pipeline