Skip to content

fix(extensions): use UserTenantId for credential resolution across all extensions #7080

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.

Sign up for GitHub

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
rajeshkamal5050 merged 2 commits into from
Mar 12, 2026
Merged

fix(extensions): use UserTenantId for credential resolution across all extensions #7080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70df4bf
fix(extensions): apply same UserTenantId fix to all affected extensions
vhvb1989 Mar 12, 2026
9cb1f46
chore: add Copilot review instruction for extension tenant usage
vhvb1989 Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/instructions/extensions.instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
applyTo:
- cli/azd/extensions/**
---
- When accessing a `Subscription` from `PromptSubscription()`, always use
`Subscription.UserTenantId` (user access tenant) for credential creation,
NOT `Subscription.TenantId` (resource tenant). For multi-tenant/guest users
these differ, and using `TenantId` causes authentication failures.
The `LookupTenant()` API already returns the correct user access tenant.
2 changes: 1 addition & 1 deletion cli/azd/extensions/azure.ai.agents/internal/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ func ensureAzureContext(
}

azureContext.Scope.SubscriptionId = subscriptionResponse.Subscription.Id
azureContext.Scope.TenantId = subscriptionResponse.Subscription.TenantId
azureContext.Scope.TenantId = subscriptionResponse.Subscription.UserTenantId

// Set the subscription ID in the environment
_, err = azdClient.Environment().SetValue(ctx, &azdext.SetEnvRequest{
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ func (a *InitFromCodeAction) ensureSubscription(ctx context.Context) error {
}

a.azureContext.Scope.SubscriptionId = subscriptionResponse.Subscription.Id
a.azureContext.Scope.TenantId = subscriptionResponse.Subscription.TenantId
a.azureContext.Scope.TenantId = subscriptionResponse.Subscription.UserTenantId
} else {
tenantResponse, err := a.azdClient.Account().LookupTenant(ctx, &azdext.LookupTenantRequest{
SubscriptionId: a.azureContext.Scope.SubscriptionId,
Expand Down
4 changes: 2 additions & 2 deletions cli/azd/extensions/azure.ai.finetune/internal/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func ensureEnvironment(ctx context.Context, flags *initFlags, azdClient *azdext.
return nil, fmt.Errorf("failed to prompt for subscription: %w", err)
}
subscriptionId = subscriptionResponse.Subscription.Id
tenantId = subscriptionResponse.Subscription.TenantId
tenantId = subscriptionResponse.Subscription.UserTenantId
} else {
// Get tenant ID from subscription
tenantResponse, err := azdClient.Account().LookupTenant(ctx, &azdext.LookupTenantRequest{
Expand Down Expand Up @@ -598,7 +598,7 @@ func ensureAzureContext(
}

azureContext.Scope.SubscriptionId = subscriptionResponse.Subscription.Id
azureContext.Scope.TenantId = subscriptionResponse.Subscription.TenantId
azureContext.Scope.TenantId = subscriptionResponse.Subscription.UserTenantId

// Set the subscription ID in the environment
_, err = azdClient.Environment().SetValue(ctx, &azdext.SetEnvRequest{
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/extensions/azure.ai.models/internal/cmd/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func promptForProject(ctx context.Context, flags *customFlags, azdClient *azdext
return fmt.Errorf("failed to prompt for subscription: %w", err)
}
subscriptionId = resp.Subscription.Id
tenantId = resp.Subscription.TenantId
tenantId = resp.Subscription.UserTenantId
} else {
tenantResp, err := azdClient.Account().LookupTenant(ctx, &azdext.LookupTenantRequest{
SubscriptionId: subscriptionId,
Expand Down
4 changes: 2 additions & 2 deletions cli/azd/extensions/azure.ai.models/internal/cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func ensureEnvironment(ctx context.Context, flags *initFlags, azdClient *azdext.
return nil, fmt.Errorf("failed to prompt for subscription: %w", err)
}
subscriptionId = resp.Subscription.Id
tenantId = resp.Subscription.TenantId
tenantId = resp.Subscription.UserTenantId
} else {
tenantResp, err := azdClient.Account().LookupTenant(ctx, &azdext.LookupTenantRequest{
SubscriptionId: subscriptionId,
Expand Down Expand Up @@ -365,7 +365,7 @@ func ensureAzureContext(
}

azureContext.Scope.SubscriptionId = resp.Subscription.Id
azureContext.Scope.TenantId = resp.Subscription.TenantId
azureContext.Scope.TenantId = resp.Subscription.UserTenantId

if err := setEnvValue(ctx, azdClient, env.Name, "AZURE_TENANT_ID", azureContext.Scope.TenantId); err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/extensions/microsoft.azd.ai.builder/internal/cmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ func ensureAzureContext(
}

azureContext.Scope.SubscriptionId = subscriptionResponse.Subscription.Id
azureContext.Scope.TenantId = subscriptionResponse.Subscription.TenantId
azureContext.Scope.TenantId = subscriptionResponse.Subscription.UserTenantId

// Set the subscription ID in the environment
_, err = azdClient.Environment().SetValue(ctx, &azdext.SetEnvRequest{
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/extensions/microsoft.azd.demo/internal/cmd/prompt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func newPromptCommand() *cobra.Command {
}

azureContext.Scope.SubscriptionId = selectedSubscription.Subscription.Id
azureContext.Scope.TenantId = selectedSubscription.Subscription.TenantId
azureContext.Scope.TenantId = selectedSubscription.Subscription.UserTenantId

filterByResourceTypeResponse, err := azdClient.
Prompt().
Expand Down
Loading