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

bumpo compose-go to v2.1.0

Browse Source 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
Guillaume Lours
2024-04-23 10:28:28 +02:00
parent 699fa43f7f
commit e3e16ad088
29 changed files with 146 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/compose-spec/compose-go/v2/transform/build.go generated vendored
View File

@ -22,10 +22,10 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformBuild(data any, p tree.Path) (any, error) {
func transformBuild(data any, p tree.Path, ignoreParseError bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return transformMapping(v, p)
return transformMapping(v, p, ignoreParseError)
case string:
return map[string]any{
"context": v,
@ -35,7 +35,7 @@ func transformBuild(data any, p tree.Path) (any, error) {
}
}
func defaultBuildContext(data any, _ tree.Path) (any, error) {
func defaultBuildContext(data any, _ tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
if _, ok := v["context"]; !ok {

22
vendor/github.com/compose-spec/compose-go/v2/transform/canonical.go generated vendored
View File

@ -20,7 +20,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
type transformFunc func(data any, p tree.Path) (any, error)
type transformFunc func(data any, p tree.Path, ignoreParseError bool) (any, error)
var transformers = map[tree.Path]transformFunc{}
@ -48,18 +48,18 @@ func init() {
}
// Canonical transforms a compose model into canonical syntax
func Canonical(yaml map[string]any) (map[string]any, error) {
canonical, err := transform(yaml, tree.NewPath())
func Canonical(yaml map[string]any, ignoreParseError bool) (map[string]any, error) {
canonical, err := transform(yaml, tree.NewPath(), ignoreParseError)
if err != nil {
return nil, err
}
return canonical.(map[string]any), nil
}
func transform(data any, p tree.Path) (any, error) {
func transform(data any, p tree.Path, ignoreParseError bool) (any, error) {
for pattern, transformer := range transformers {
if p.Matches(pattern) {
t, err := transformer(data, p)
t, err := transformer(data, p, ignoreParseError)
if err != nil {
return nil, err
}
@ -68,13 +68,13 @@ func transform(data any, p tree.Path) (any, error) {
}
switch v := data.(type) {
case map[string]any:
a, err := transformMapping(v, p)
a, err := transformMapping(v, p, ignoreParseError)
if err != nil {
return a, err
}
return v, nil
case []any:
a, err := transformSequence(v, p)
a, err := transformSequence(v, p, ignoreParseError)
if err != nil {
return a, err
}
@ -84,9 +84,9 @@ func transform(data any, p tree.Path) (any, error) {
}
}
func transformSequence(v []any, p tree.Path) ([]any, error) {
func transformSequence(v []any, p tree.Path, ignoreParseError bool) ([]any, error) {
for i, e := range v {
t, err := transform(e, p.Next("[]"))
t, err := transform(e, p.Next("[]"), ignoreParseError)
if err != nil {
return nil, err
}
@ -95,9 +95,9 @@ func transformSequence(v []any, p tree.Path) ([]any, error) {
return v, nil
}
func transformMapping(v map[string]any, p tree.Path) (map[string]any, error) {
func transformMapping(v map[string]any, p tree.Path, ignoreParseError bool) (map[string]any, error) {
for k, e := range v {
t, err := transform(e, p.Next(k))
t, err := transform(e, p.Next(k), ignoreParseError)
if err != nil {
return nil, err
}

2
vendor/github.com/compose-spec/compose-go/v2/transform/defaults.go generated vendored
View File

@ -39,7 +39,7 @@ func SetDefaultValues(yaml map[string]any) (map[string]any, error) {
func setDefaults(data any, p tree.Path) (any, error) {
for pattern, transformer := range defaultValues {
if p.Matches(pattern) {
t, err := transformer(data, p)
t, err := transformer(data, p, false)
if err != nil {
return nil, err
}

2
vendor/github.com/compose-spec/compose-go/v2/transform/dependson.go generated vendored
View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformDependsOn(data any, p tree.Path) (any, error) {
func transformDependsOn(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
for i, e := range v {

2
vendor/github.com/compose-spec/compose-go/v2/transform/envfile.go generated vendored
View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformEnvFile(data any, p tree.Path) (any, error) {
func transformEnvFile(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case string:
return []any{

4
vendor/github.com/compose-spec/compose-go/v2/transform/extends.go generated vendored
View File

@ -22,10 +22,10 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformExtends(data any, p tree.Path) (any, error) {
func transformExtends(data any, p tree.Path, ignoreParseError bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return transformMapping(v, p)
return transformMapping(v, p, ignoreParseError)
case string:
return map[string]any{
"service": v,

4
vendor/github.com/compose-spec/compose-go/v2/transform/external.go generated vendored
View File

@ -23,11 +23,11 @@ import (
"github.com/sirupsen/logrus"
)
func transformMaybeExternal(data any, p tree.Path) (any, error) {
func transformMaybeExternal(data any, p tree.Path, ignoreParseError bool) (any, error) {
if data == nil {
return nil, nil
}
resource, err := transformMapping(data.(map[string]any), p)
resource, err := transformMapping(data.(map[string]any), p, ignoreParseError)
if err != nil {
return nil, err
}

2
vendor/github.com/compose-spec/compose-go/v2/transform/include.go generated vendored
View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformInclude(data any, p tree.Path) (any, error) {
func transformInclude(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil

5
vendor/github.com/compose-spec/compose-go/v2/transform/mapping.go generated vendored
View File

@ -23,7 +23,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformKeyValue(data any, p tree.Path) (any, error) {
func transformKeyValue(data any, p tree.Path, ignoreParseError bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil
@ -32,6 +32,9 @@ func transformKeyValue(data any, p tree.Path) (any, error) {
for _, e := range v {
before, after, found := strings.Cut(e.(string), "=")
if !found {
if ignoreParseError {
return data, nil
}
return nil, fmt.Errorf("%s: invalid value %s, expected key=value", p, e)
}
mapping[before] = after

7
vendor/github.com/compose-spec/compose-go/v2/transform/ports.go generated vendored
View File

@ -24,7 +24,7 @@ import (
"github.com/mitchellh/mapstructure"
)
func transformPorts(data any, p tree.Path) (any, error) {
func transformPorts(data any, p tree.Path, ignoreParseError bool) (any, error) {
switch entries := data.(type) {
case []any:
// We process the list instead of individual items here.
@ -48,7 +48,10 @@ func transformPorts(data any, p tree.Path) (any, error) {
case string:
parsed, err := types.ParsePortConfig(value)
if err != nil {
return data, nil
if ignoreParseError {
return data, nil
}
return nil, err
}
if err != nil {
return nil, err

4
vendor/github.com/compose-spec/compose-go/v2/transform/secrets.go generated vendored
View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformFileMount(data any, p tree.Path) (any, error) {
func transformFileMount(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return data, nil
@ -35,7 +35,7 @@ func transformFileMount(data any, p tree.Path) (any, error) {
}
}
func defaultSecretMount(data any, p tree.Path) (any, error) {
func defaultSecretMount(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
source := v["source"]

6
vendor/github.com/compose-spec/compose-go/v2/transform/services.go generated vendored
View File

@ -20,16 +20,16 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformService(data any, p tree.Path) (any, error) {
func transformService(data any, p tree.Path, ignoreParseError bool) (any, error) {
switch value := data.(type) {
case map[string]any:
return transformMapping(value, p)
return transformMapping(value, p, ignoreParseError)
default:
return value, nil
}
}
func transformServiceNetworks(data any, _ tree.Path) (any, error) {
func transformServiceNetworks(data any, _ tree.Path, _ bool) (any, error) {
if slice, ok := data.([]any); ok {
networks := make(map[string]any, len(slice))
for _, net := range slice {

2
vendor/github.com/compose-spec/compose-go/v2/transform/ssh.go generated vendored
View File

@ -23,7 +23,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformSSH(data any, p tree.Path) (any, error) {
func transformSSH(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil

2
vendor/github.com/compose-spec/compose-go/v2/transform/ulimits.go generated vendored
View File

@ -22,7 +22,7 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformUlimits(data any, p tree.Path) (any, error) {
func transformUlimits(data any, p tree.Path, _ bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil

5
vendor/github.com/compose-spec/compose-go/v2/transform/volume.go generated vendored
View File

@ -24,13 +24,16 @@ import (
"github.com/compose-spec/compose-go/v2/tree"
)
func transformVolumeMount(data any, p tree.Path) (any, error) {
func transformVolumeMount(data any, p tree.Path, ignoreParseError bool) (any, error) {
switch v := data.(type) {
case map[string]any:
return v, nil
case string:
volume, err := format.ParseVolume(v) // TODO(ndeloof) ParseVolume should not rely on types and return map[string]
if err != nil {
if ignoreParseError {
return v, nil
}
return nil, err
}
volume.Target = cleanTarget(volume.Target)