Skip to content

Commit 32d5bda

Browse files
committed
Fix regression with additional_context short syntax
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 332fbaf commit 32d5bda

File tree

2 files changed

+44
-0
lines changed

2 files changed

+44
-0
lines changed

transform/canonical.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var transformers = map[tree.Path]transformFunc{}
2727
func init() {
2828
transformers["services.*"] = transformService
2929
transformers["services.*.build.secrets.*"] = transformFileMount
30+
transformers["services.*.build.additional_contexts"] = transformKeyValue
3031
transformers["services.*.depends_on"] = transformDependsOn
3132
transformers["services.*.env_file"] = transformEnvFile
3233
transformers["services.*.extends"] = transformExtends

transform/mapping.go

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
Copyright 2020 The Compose Specification Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package transform
18+
19+
import (
20+
"strings"
21+
22+
"github.com/compose-spec/compose-go/v2/tree"
23+
"github.com/pkg/errors"
24+
)
25+
26+
func transformKeyValue(data any, p tree.Path) (any, error) {
27+
switch v := data.(type) {
28+
case map[string]any:
29+
return v, nil
30+
case []any:
31+
mapping := map[string]any{}
32+
for _, e := range v {
33+
before, after, found := strings.Cut(e.(string), "=")
34+
if !found {
35+
return nil, errors.Errorf("%s: invalid value %s, expected key=value", p, e)
36+
}
37+
mapping[before] = after
38+
}
39+
return mapping, nil
40+
default:
41+
return nil, errors.Errorf("%s: invalid type %T", p, v)
42+
}
43+
}

0 commit comments

Comments
 (0)