docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

build: validate build args and labels

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2023-09-11 16:35:57 +02:00 committed by CrazyMax
parent 66e6dab26b
commit 73ea0826ca
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
commands/build.go
View File

@ -99,14 +99,25 @@ type buildOptions struct {
func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error) { func (o *buildOptions) toControllerOptions() (*controllerapi.BuildOptions, error) {
var err error var err error
buildArgs, err := listToMap(o.buildArgs, true)
if err != nil {
return nil, err
}
labels, err := listToMap(o.labels, false)
if err != nil {
return nil, err
}
opts := controllerapi.BuildOptions{ opts := controllerapi.BuildOptions{
Allow: o.allow, Allow: o.allow,
BuildArgs: listToMap(o.buildArgs, true), BuildArgs: buildArgs,
CgroupParent: o.cgroupParent, CgroupParent: o.cgroupParent,
ContextPath: o.contextPath, ContextPath: o.contextPath,
DockerfileName: o.dockerfileName, DockerfileName: o.dockerfileName,
ExtraHosts: o.extraHosts, ExtraHosts: o.extraHosts,
Labels: listToMap(o.labels, false), Labels: labels,
NetworkMode: o.networkMode, NetworkMode: o.networkMode,
NoCacheFilter: o.noCacheFilter, NoCacheFilter: o.noCacheFilter,
Platforms: o.platforms, Platforms: o.platforms,
@ -782,24 +793,24 @@ func maybeJSONArray(v string) []string {
return []string{v} return []string{v}
} }
func listToMap(values []string, defaultEnv bool) map[string]string { func listToMap(values []string, defaultEnv bool) (map[string]string, error) {
result := make(map[string]string, len(values)) result := make(map[string]string, len(values))
for _, value := range values { for _, value := range values {
kv := strings.SplitN(value, "=", 2) k, v, hasValue := strings.Cut(value, "=")
if len(kv) == 1 { if k == "" {
if defaultEnv { return nil, errors.Errorf("invalid key-value pair %q: empty key", value)
v, ok := os.LookupEnv(kv[0]) }
if ok { if hasValue {
result[kv[0]] = v result[k] = v
} } else if defaultEnv {
} else { if envVal, ok := os.LookupEnv(k); ok {
result[kv[0]] = "" result[k] = envVal
} }
} else { } else {
result[kv[0]] = kv[1] result[k] = ""
} }
} }
return result return result, nil
} }
func dockerUlimitToControllerUlimit(u *dockeropts.UlimitOpt) *controllerapi.UlimitOpt { func dockerUlimitToControllerUlimit(u *dockeropts.UlimitOpt) *controllerapi.UlimitOpt {

18
tests/build.go
View File

@ -42,6 +42,8 @@ var buildTests = []func(t *testing.T, sb integration.Sandbox){
testBuildDetailsLink, testBuildDetailsLink,
testBuildProgress, testBuildProgress,
testBuildAnnotations, testBuildAnnotations,
testBuildBuildArgNoKey,
testBuildLabelNoKey,
} }
func testBuild(t *testing.T, sb integration.Sandbox) { func testBuild(t *testing.T, sb integration.Sandbox) {
@ -358,3 +360,19 @@ func testBuildAnnotations(t *testing.T, sb integration.Sandbox) {
require.NotNil(t, img.Desc) require.NotNil(t, img.Desc)
assert.Equal(t, "zzz", img.Desc.Annotations["example4"]) assert.Equal(t, "zzz", img.Desc.Annotations["example4"])
} }
func testBuildBuildArgNoKey(t *testing.T, sb integration.Sandbox) {
dir := createTestProject(t)
cmd := buildxCmd(sb, withArgs("build", "--build-arg", "=TEST_STRING", dir))
out, err := cmd.CombinedOutput()
require.Error(t, err, string(out))
require.Equal(t, strings.TrimSpace(string(out)), `ERROR: invalid key-value pair "=TEST_STRING": empty key`)
}
func testBuildLabelNoKey(t *testing.T, sb integration.Sandbox) {
dir := createTestProject(t)
cmd := buildxCmd(sb, withArgs("build", "--label", "=TEST_STRING", dir))
out, err := cmd.CombinedOutput()
require.Error(t, err, string(out))
require.Equal(t, strings.TrimSpace(string(out)), `ERROR: invalid key-value pair "=TEST_STRING": empty key`)
}