Update the buildflags cty code to handle unknown values. When hcl
decodes a value with an invalid variable name, it appends a diagnostic
for the error and then returns an unknown value so it can continue
processing the file and finding more errors.
The iteration code has now been changed to use a rangefunc from go 1.23
and it skips empty or unknown values. Empty values are valid when they
are skipped and unknown values will have a diagnostic for itself.
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
Before this patch, both "usage" and shell-completion scripts would preserve
the path of the invoked command, which was especially problematic for the
completion-scripts, because Cobra's completion depends on Command.Name()
for this (see [1], [2]);
./bin/build/buildx --help | head -n 5
Extended build capabilities with BuildKit
Usage:
./bin/build/buildx
./bin/build/buildx [command]
./bin/build/buildx completion bash | head -n 3
# bash completion V2 for ./bin/build/buildx -*- shell-script -*-
__./bin/build/buildx_debug()
This would also be problematic if the path contained a space, for example;
ln -s $(pwd)/bin/build $(pwd)/bin/Program\ Files
./bin/Program\ Files/buildx completion bash | head -n 3
# bash completion V2 for ./bin/Program -*- shell-script -*-
__./bin/Program_debug()
With this patch, the path is stripped to prevent this issue;
./bin/build/buildx --help | head -n 5
Extended build capabilities with BuildKit
Usage:
buildx
buildx [command]
./bin/build/buildx completion bash | head -n 3
# bash completion V2 for buildx -*- shell-script -*-
__buildx_debug()
./bin/Program\ Files/buildx completion bash | head -n 3
# bash completion V2 for buildx -*- shell-script -*-
__buildx_debug()
It's worth noting that this patch only fixes these basic issues. Other cases
are not yet addressed, and may need fixes in Cobra because (especially for
the completion scripts) it should likely not conflate "Name" with "executable".
For example, command.Name() does not handle situations where the executable
itself has a space in its name:
ln -s $(pwd)/bin/build/buildx $(pwd)/bin/build/hello\ world
./bin/build/hello\ world completion bash | head -n 3
# bash completion V2 for hello -*- shell-script -*-
__hello_debug()
Other, less problematic, issues to address are case-insensitive filesystems,
where the binary can be invoked with any case;
./bin/build/bUiLdX --help | head -n 5
Extended build capabilities with BuildKit
Usage:
bUiLdX
bUiLdX [command]
./bin/build/bUiLdX completion bash | head -n 3
# bash completion V2 for bUiLdX -*- shell-script -*-
__bUiLdX_debug()
[1]: https://github.com/spf13/cobra/blob/v1.8.1/bash_completionsV2.go#L24-L39
[2]: https://github.com/spf13/cobra/blob/v1.8.1/command.go#L1502-L1510
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
`MarshalJSON` would not include the extra attributes because it iterated
over the target map rather than the source map.
Also fixes JSON unmarshaling for SSH and secrets. The intention was to
unmarshal into the struct, but `UnmarshalText` takes priority over the
default struct unmarshaling so it didn't work as intended.
Tests have been added for all marshaling and unmarshaling methods.
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
