Skip to content

Include python.resources in bundle debug refschema output #7333

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

Open
pietern wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Include python.resources in bundle debug refschema output #7333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions acceptance/bundle/refschema/output/root.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ experimental.pydabs.enabled bool INPUT
experimental.python config.Python INPUT
experimental.python.mutators []string INPUT
experimental.python.mutators[*] string INPUT
experimental.python.resources []string INPUT
experimental.python.resources[*] string INPUT
experimental.python.venv_path string INPUT
experimental.python_wheel_wrapper bool INPUT
experimental.scripts map[config.ScriptHook]config.Command INPUT
Expand Down Expand Up @@ -249,6 +251,8 @@ presets.trigger_pause_status string INPUT
python config.Python INPUT
python.mutators []string INPUT
python.mutators[*] string INPUT
python.resources []string INPUT
python.resources[*] string INPUT
python.venv_path string INPUT
run_as *jobs.JobRunAs INPUT
run_as.group_name string INPUT
Expand Down
8 changes: 6 additions & 2 deletions cmd/bundle/debug/refschema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,19 @@ func dumpRemoteSchemas(out io.Writer) error {
// dumpRootSchema dumps fields of the bundle config outside of resources.
// Resource fields are dumped per resource type by dumpRemoteSchemas.
func dumpRootSchema(out io.Writer) error {
resourcesType := reflect.TypeFor[config.Resources]()
var lines []string
err := structwalk.WalkType(reflect.TypeFor[config.Root](), func(path *structpath.PatternNode, typ reflect.Type, field *reflect.StructField) bool {
if path == nil {
return true
}
p := path.String()
if p == "resources" || strings.HasSuffix(p, ".resources") {
// Match on type rather than field name: python.resources is a []string
// that belongs here, while root resources are dumped per type and target
// resources only override them.
if typ == resourcesType || typ == reflect.PointerTo(resourcesType) {
return false
}
p := path.String()
t := strings.ReplaceAll(fmt.Sprint(typ), "interface {}", "any")
lines = append(lines, fmt.Sprintf("%s\t%s\tINPUT\n", p, t))
return true
Expand Down
Loading