Skip to content

Fix azd ai agent init --infra on an existing project without an agent service #9407

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
Travis Angevine (trangevi) merged 3 commits into from
Aug 5, 2026
Merged

Fix azd ai agent init --infra on an existing project without an agent service #9407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6db56f
Fix `azd ai agent init --infra` on an existing project without an age…
glharper Aug 3, 2026
b4ad415
Refuse eject on a custom infra.path and cover the init fall-through
glharper Aug 4, 2026
521392f
fix(agents): reject unsupported infra eject configuration
glharper Aug 5, 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
30 changes: 18 additions & 12 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 @@ -1123,23 +1123,28 @@ from code-deploy ZIP packaging (uses .gitignore syntax).`,
infraProvider = p
}

// `--infra` within an existing azd agent project is a standalone
// eject: synthesize infra (Bicep or Terraform) from
// `--infra` inside a project that already declares a Foundry service
// is a standalone eject: synthesize infra (Bicep or Terraform) from
// the existing azure.yaml, write ./infra/, and return without
// prompting.
//
// Any other project — including one azd already manages that has no
// Foundry service yet — has nothing to eject, so `--infra` falls
// through to the normal init flow and ejects afterwards via
// ejectInfraAfterInit. See resolveInfraGate.
if infraProvider != "" {
projectRoot, projectRootErr := azdext.GetProjectDir()
if projectRootErr != nil && !errors.Is(projectRootErr, azdext.ErrProjectNotFound) {
return fmt.Errorf("resolve azd project directory: %w", projectRootErr)
gate, gateErr := resolveInfraGate(infraProvider)
if gateErr != nil {
return gateErr
}
if projectRootErr == nil {
// Reject inputs the eject path would silently ignore (a
// positional arg, -m, or --src) instead of pretending they
// were honored.
if err := validateStandaloneEjectArgs(args, flags); err != nil {
if gate.standaloneEject {
// Reject init inputs the eject path would silently ignore
// instead of pretending they were honored. They stay valid
// on the init fall-through, where they do drive the flow.
if err := validateStandaloneEjectArgs(cmd, args); err != nil {
return err
}
return ejectInfra(projectRoot, infraProvider)
return ejectInfra(gate.projectRoot, infraProvider)
}
}

Expand Down Expand Up @@ -1575,7 +1580,8 @@ from code-deploy ZIP packaging (uses .gitignore syntax).`,
"Eject infrastructure-as-code from azure.yaml into ./infra/. "+
"A bare --infra ejects Bicep; --infra=terraform ejects Terraform and sets "+
"infra.provider: terraform; --infra=bicep is explicit Bicep. "+
"When azure.yaml already exists, runs as a standalone eject and skips the init prompts.")
"When azure.yaml already declares a Foundry project service, runs as a standalone "+
"eject and skips the init prompts; otherwise init runs first and the eject follows it.")
// NoOptDefVal makes a bare `--infra` resolve to "bicep" while still allowing
// `--infra=terraform` / `--infra=bicep`. Absent flag stays "" (no eject).
cmd.Flags().Lookup("infra").NoOptDefVal = project.BicepProviderName
Expand Down
Loading
Loading