YAML Configuration Refactor

This commit is contained in:
2026-05-07 13:44:46 +02:00
parent 7abcbf1a38
commit 000d31ad24
8 changed files with 860 additions and 87 deletions
+21 -15
View File
@@ -255,7 +255,7 @@ func newContext() (context, error) {
}
func runBuild(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -281,7 +281,7 @@ func runBuild(ctx context) error {
}
func runBuildModule(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -514,7 +514,7 @@ func formatCount(value int) string {
}
func runBuildHAKs(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -618,7 +618,7 @@ func parseInlineFlagValue(arg, name string) (string, bool) {
}
func runExtract(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -645,7 +645,7 @@ func runExtract(ctx context) error {
}
func runValidate(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -697,7 +697,7 @@ func emitSummaryLines(w io.Writer, lines []string, maxLines int, label string) {
}
func runCompare(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -718,7 +718,7 @@ func runCompare(ctx context) error {
}
func runApplyHAKManifest(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -744,7 +744,7 @@ func runApplyHAKManifest(ctx context) error {
}
func runValidateTopData(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -768,7 +768,7 @@ func runValidateTopData(ctx context) error {
}
func runBuildTopData(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -804,7 +804,7 @@ func runBuildTopData(ctx context) error {
}
func runBuildTopPackage(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -861,7 +861,7 @@ func parseBuildTopDataArgs(commandName string, args []string) (topdata.BuildAndP
}
func runCompareTopData(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -892,7 +892,7 @@ func runConvertTopData(ctx context) error {
}
func runBuildWiki(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -932,7 +932,7 @@ func parseBuildWikiArgs(commandName string, args []string) (topdata.BuildWikiOpt
}
func runDeployWiki(ctx context) error {
p, err := loadProject(ctx.cwd)
p, err := loadProject(ctx)
if err != nil {
return err
}
@@ -1200,8 +1200,8 @@ func parseWikiCategoryArg(raw string, target map[string]int) error {
return nil
}
func loadProject(cwd string) (*project.Project, error) {
root, err := project.FindRoot(cwd)
func loadProject(ctx context) (*project.Project, error) {
root, err := project.FindRoot(ctx.cwd)
if err != nil {
return nil, err
}
@@ -1210,6 +1210,12 @@ func loadProject(cwd string) (*project.Project, error) {
if err != nil {
return nil, err
}
if ctx.stderr != nil {
fmt.Fprintf(ctx.stderr, "Loaded config: %s\n", p.ConfigSource.Name)
if p.ConfigSource.Legacy {
fmt.Fprintf(ctx.stderr, "Warning: %s is legacy repository configuration; migrate to %s.\n", project.LegacyConfigFile, project.ConfigFile)
}
}
var failures []error
if err := p.ValidateLayout(); err != nil {