Skip to content

fix: run interactive Azure context setup in unified azure.yaml adoption path #8933

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
trangevi merged 9 commits into from
Jul 2, 2026
Merged

fix: run interactive Azure context setup in unified azure.yaml adoption path #8933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
11f7878
fix: run interactive Azure context setup in unified azure.yaml adopti…
trangevi Jul 1, 2026
4f96496
feat: verify model deployments in unified azure.yaml against Foundry …
trangevi Jul 1, 2026
70db77b
test: add unit tests for foundryDeployments parser and helpers
trangevi Jul 1, 2026
47428df
refactor: use typed YAML unmarshal in foundryDeployments
trangevi Jul 1, 2026
f230f01
chore: add yaml struct tags to project.Deployment types
trangevi Jul 1, 2026
71a3d7c
fix: resolve cspell spelling issue
trangevi Jul 1, 2026
858b0bb
feat: wire --model-deployment and --model flags into azure.yaml adopt…
trangevi Jul 1, 2026
13d3f67
fix: address PR review feedback for deployment verification
trangevi Jul 2, 2026
c48df52
fix: improve model deployment verification UX for new project path
trangevi Jul 2, 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
158 changes: 9 additions & 149 deletions 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 @@ -2026,157 +2026,17 @@ func (a *InitAction) configureModelChoice(
// When --project-id is provided, use the existing project to derive location
// and configure Foundry env vars (ACR, AppInsights, etc.) instead of prompting.
if !hasModelResources {
if a.flags.projectResourceId != "" {
newCred, err := ensureSubscription(
ctx, a.azdClient, a.azureContext, a.environment.Name,
"Select an Azure subscription to provision your agent and Foundry project resources.",
)
if err != nil {
return nil, err
}
a.credential = newCred

selectedProject, err := selectFoundryProject(
ctx, a.azdClient, a.credential, a.azureContext, a.environment.Name,
a.azureContext.Scope.SubscriptionId, a.flags.projectResourceId,
a.skipACR(),
true, // bicepless
)
if err != nil {
return nil, err
}
a.selectedFoundryProject = selectedProject

if selectedProject == nil {
return nil, fmt.Errorf("specified foundry project was not found or is not eligible for the current configuration: %s", a.flags.projectResourceId)
}

// Signal Bicep to skip project/role/connection provisioning for this existing project
if err := setEnvValue(
ctx, a.azdClient, a.environment.Name, "USE_EXISTING_AI_PROJECT", "true",
); err != nil {
return nil, fmt.Errorf("failed to set USE_EXISTING_AI_PROJECT: %w", err)
}
if err := updatePendingProjectSignal(
ctx, a.azdClient, a.environment.Name, true,
); err != nil {
log.Printf("warning: failed to update project provision signal: %v", err)
}
} else if a.flags.noPrompt {
newCred, err := configureNewProjectForNoPrompt(
ctx, a.azdClient, a.environment.Name, a.azureContext,
"Select an Azure subscription to provision your agent and Foundry project resources.",
)
if err != nil {
return nil, err
}
a.credential = newCred
} else {
// Prompt user to pick an existing Foundry project or create new resources
projectChoices := []*azdext.SelectChoice{
{Label: "Use an existing Foundry project", Value: "existing"},
{Label: "Create a new Foundry project", Value: "new"},
}

defaultIdx := int32(0)
projectResp, err := a.azdClient.Prompt().Select(ctx, &azdext.SelectRequest{
Options: &azdext.SelectOptions{
Message: "Select a Foundry project to host your agent and any models or tools it uses.",
Choices: projectChoices,
SelectedIndex: &defaultIdx,
},
})
if err != nil {
if exterrors.IsCancellation(err) {
return nil, exterrors.Cancelled("project selection was cancelled")
}
return nil, exterrors.FromPrompt(err, "failed to prompt for Foundry project configuration choice")
}

switch projectChoices[*projectResp.Value].Value {
case "existing":
newCred, err := ensureSubscription(
ctx, a.azdClient, a.azureContext, a.environment.Name,
"Select an Azure subscription to find existing Foundry projects.",
)
if err != nil {
return nil, err
}
a.credential = newCred

selectedProject, err := selectFoundryProject(
ctx, a.azdClient, a.credential, a.azureContext, a.environment.Name,
a.azureContext.Scope.SubscriptionId, "",
a.skipACR(),
true, // bicepless
)
if err != nil {
return nil, err
}
a.selectedFoundryProject = selectedProject

if selectedProject == nil {
// No existing project selected → fall back to "create new" path
_, _ = color.New(color.Faint).Println(
"No existing Foundry project was selected. Falling back to creating new resources.",
)
if err := setEnvValue(
ctx, a.azdClient, a.environment.Name, "USE_EXISTING_AI_PROJECT", "false",
); err != nil {
return nil, fmt.Errorf("failed to set USE_EXISTING_AI_PROJECT: %w", err)
}
if err := updatePendingProjectSignal(
ctx, a.azdClient, a.environment.Name, false,
); err != nil {
log.Printf("warning: failed to update project provision signal: %v", err)
}
if err := ensureLocation(ctx, a.azdClient, a.azureContext, a.environment.Name); err != nil {
return nil, err
}
} else {
// Signal Bicep to skip project/role/connection provisioning for this existing project
if err := setEnvValue(
ctx, a.azdClient, a.environment.Name, "USE_EXISTING_AI_PROJECT", "true",
); err != nil {
return nil, fmt.Errorf("failed to set USE_EXISTING_AI_PROJECT: %w", err)
}
if err := updatePendingProjectSignal(
ctx, a.azdClient, a.environment.Name, true,
); err != nil {
log.Printf("warning: failed to update project provision signal: %v", err)
}
}
default:
newCred, err := ensureSubscriptionAndLocation(
ctx, a.azdClient, a.azureContext, a.environment.Name,
"Select an Azure subscription to provision your agent and Foundry project resources.",
)
if err != nil {
return nil, err
}
a.credential = newCred

// Creating new resources — clear any stale existing-project flag
if err := setEnvValue(
ctx, a.azdClient, a.environment.Name, "USE_EXISTING_AI_PROJECT", "false",
); err != nil {
return nil, fmt.Errorf("failed to set USE_EXISTING_AI_PROJECT: %w", err)
}
if err := updatePendingProjectSignal(
ctx, a.azdClient, a.environment.Name, false,
); err != nil {
log.Printf("warning: failed to update project provision signal: %v", err)
}
}
}

// Persist the ACR-skip signal for the no-model-resources path too.
// The deferred-headless and main model-config paths set this, but a
// completing no-model flow (e.g. a pre-built --image agent) otherwise
// would not, leaving Bicep to provision an ACR the user doesn't need.
if err := setACREnvVar(ctx, a.azdClient, a.environment.Name, a.skipACR()); err != nil {
result, err := configureFoundryProject(
ctx, a.azdClient, a.azureContext, a.environment.Name,
a.flags.projectResourceId, a.flags.noPrompt, a.skipACR(),
)
if err != nil {
return nil, err
}
if result.Credential != nil {
a.credential = result.Credential
}
a.selectedFoundryProject = result.FoundryProject

return agentManifest, nil
}
Expand Down
Loading
Loading