fix(init): consolidate scaffold templates and gitignore .astro/*.local.{yml,yaml}#2126
Merged
Conversation
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Coverage Report for CI Build 6Coverage remained the same at 39.746%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsNo coverage regressions found. Coverage Stats
💛 - Coveralls |
`astro dev init` (and astro-desktop) both scaffold projects via
`pkg/airflowrt.Scaffold`. The `airflow/include/airflow{2,3}/gitignore`
files are dead — their `Af{2,3}Gitignore` embed vars in
`airflow/airflow.go` have no consumers. Move the
`.astro/*.local.{yml,yaml}` additions to `pkg/airflowrt/include/gitignore`
so they actually take effect.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The `airflow/include/airflow{2,3}/` tree contained stale duplicates of
the scaffolding templates that live in `pkg/airflowrt/include/`. Their
backing `Af{2,3}*` embed vars in `airflow/airflow.go` had no consumers
— `astro dev init` already routes through `airflowrt.Scaffold`, and
those templates had silently drifted (e.g. `airflow3/dockerfile`
hardcoded the registry while airflowrt's uses configurable %s
placeholders).
Drop the dead embeds and template files. The remaining live embeds
are kept:
- `Af2MonitoringDag` — used by `cloud/deploy/deploy.go`
- `Af{2,3}Composeyml` — used by `airflow/container.go`
After this, `pkg/airflowrt/include` is the single source of truth for
project scaffolding templates.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
schnie
approved these changes
May 6, 2026
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
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.
Summary
The original two-line gitignore change in this PR was a no-op:
astro dev init(and astro-desktop, which scaffolds via the same module) both go throughpkg/airflowrt.Scaffold, not throughairflow/include/airflow{2,3}/gitignore. TheAf{2,3}Gitignoreembed vars inairflow/airflow.gohad no consumers — so the new lines never reached scaffolded projects.This PR fixes that and removes the dead duplicate template tree so the same kind of drift can't happen again.
Commits
fix(init): apply gitignore additions to airflowrt source-of-truth— moves the.astro/*.local.yml/.astro/*.local.yamladditions topkg/airflowrt/include/gitignore, which is whatastro dev initactually reads. Reverts the no-op additions inairflow/include/airflow{2,3}/gitignore.chore(airflow): remove duplicate scaffold templates— deletes the deadAf{2,3}*embeds inairflow/airflow.goand the corresponding files inairflow/include/airflow{2,3}/. After this, the only remaining live embeds areAf2MonitoringDag(used bycloud/deploy) andAf{2,3}Composeyml(used byairflow/container.go); everything else routes throughpkg/airflowrt. ~900 lines of stale duplicate templates removed.After this,
pkg/airflowrt/includeis the single source of truth for project scaffolding, shared byastro-cliand external consumers like astro-desktop.Notes for review
airflow/include/airflow3/dockerfilehad hardcoded theastrocrpublic.azurecr.io/registry; airflowrt's uses configurable%splaceholders. No behavior change since cli's was unread, but worth flagging — the airflowrt version is the live one.airflow/airflow.Init(...)already callsairflowrt.Scaffold(...)(since thepkg/airflowrtextraction); this PR just removes the now-unused embedded copies.Test plan
go build ./...passesgo vetpasses for./airflow/...,./cloud/deploy/...,./cmd/...,./pkg/airflowrt/...go test ./pkg/airflowrt/...passesgo test ./cmd/...passesgo test ./cloud/deploy/...passesgo test ./airflow/...— pre-existing podman/docker env-detection failures on main are unchanged; not introduced by this PRastro dev initin an empty dir and confirm.astro/*.local.ymland.astro/*.local.yamlappear in the generated.gitignore.astro/foo.local.ymland verifygit statusignores it🤖 Generated with Claude Code