vendor: update compose-go to v2.0.0-rc.3

bake/bake.go

@@ -13,7 +13,7 @@ import (
  "strings"
  "time"
 
- composecli "github.com/compose-spec/compose-go/cli"
+ composecli "github.com/compose-spec/compose-go/v2/cli"
  "github.com/docker/buildx/bake/hclparser"
  "github.com/docker/buildx/build"
  controllerapi "github.com/docker/buildx/controller/pb"

bake/bake_test.go

@@ -297,9 +297,6 @@ services:
 
  ctx := context.TODO()
 
- cwd, err := os.Getwd()
- require.NoError(t, err)
-
  m, g, err := ReadTargets(ctx, []File{fp, fp2, fp3}, []string{"default"}, nil, nil)
  require.NoError(t, err)
 
@@ -308,7 +305,7 @@ services:
 
  require.True(t, ok)
  require.Equal(t, "Dockerfile.webapp", *m["webapp"].Dockerfile)
- require.Equal(t, cwd, *m["webapp"].Context)
+ require.Equal(t, ".", *m["webapp"].Context)
  require.Equal(t, ptrstr("1"), m["webapp"].Args["buildno"])
  require.Equal(t, ptrstr("12"), m["webapp"].Args["buildno2"])
 
@@ -347,9 +344,6 @@ services:
 
  ctx := context.TODO()
 
- cwd, err := os.Getwd()
- require.NoError(t, err)
-
  m, _, err := ReadTargets(ctx, []File{fp}, []string{"web.app"}, nil, nil)
  require.NoError(t, err)
  require.Equal(t, 1, len(m))
@@ -372,7 +366,7 @@ services:
  _, ok = m["web_app"]
  require.True(t, ok)
  require.Equal(t, "Dockerfile.webapp", *m["web_app"].Dockerfile)
- require.Equal(t, cwd, *m["web_app"].Context)
+ require.Equal(t, ".", *m["web_app"].Context)
  require.Equal(t, ptrstr("1"), m["web_app"].Args["buildno"])
  require.Equal(t, ptrstr("12"), m["web_app"].Args["buildno2"])
 
@@ -581,9 +575,6 @@ services:
 
  ctx := context.TODO()
 
- cwd, err := os.Getwd()
- require.NoError(t, err)
-
  m, _, err := ReadTargets(ctx, []File{fp, fp2}, []string{"app1", "app2"}, nil, nil)
  require.NoError(t, err)
 
@@ -596,7 +587,7 @@ services:
  require.Equal(t, "Dockerfile", *m["app1"].Dockerfile)
  require.Equal(t, ".", *m["app1"].Context)
  require.Equal(t, "Dockerfile", *m["app2"].Dockerfile)
- require.Equal(t, cwd, *m["app2"].Context)
+ require.Equal(t, ".", *m["app2"].Context)
 }
 
 func TestReadContextFromTargetChain(t *testing.T) {

bake/compose.go

@@ -6,9 +6,9 @@ import (
  "path/filepath"
  "strings"
 
- "github.com/compose-spec/compose-go/dotenv"
- "github.com/compose-spec/compose-go/loader"
- compose "github.com/compose-spec/compose-go/types"
+ "github.com/compose-spec/compose-go/v2/dotenv"
+ "github.com/compose-spec/compose-go/v2/loader"
+ composetypes "github.com/compose-spec/compose-go/v2/types"
  "github.com/pkg/errors"
  "gopkg.in/yaml.v3"
 )
@@ -18,21 +18,21 @@ func ParseComposeFiles(fs []File) (*Config, error) {
  if err != nil {
  return nil, err
  }
- var cfgs []compose.ConfigFile
+ var cfgs []composetypes.ConfigFile
  for _, f := range fs {
- cfgs = append(cfgs, compose.ConfigFile{
+ cfgs = append(cfgs, composetypes.ConfigFile{
  Filename: f.Name,
  Content: f.Data,
  })
  }
  return ParseCompose(cfgs, envs)
 }
 
-func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, error) {
+func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Config, error) {
  if envs == nil {
  envs = make(map[string]string)
  }
- cfg, err := loader.LoadWithContext(context.Background(), compose.ConfigDetails{
+ cfg, err := loader.LoadWithContext(context.Background(), composetypes.ConfigDetails{
  ConfigFiles: cfgs,
  Environment: envs,
  }, func(options *loader.Options) {
@@ -159,8 +159,8 @@ func validateComposeFile(dt []byte, fn string) (bool, error) {
 }
 
 func validateCompose(dt []byte, envs map[string]string) error {
- _, err := loader.Load(compose.ConfigDetails{
- ConfigFiles: []compose.ConfigFile{
+ _, err := loader.Load(composetypes.ConfigDetails{
+ ConfigFiles: []composetypes.ConfigFile{
  {
  Content: dt,
  },
@@ -223,7 +223,7 @@ func loadDotEnv(curenv map[string]string, workingDir string) (map[string]string,
  return curenv, nil
 }
 
-func flatten(in compose.MappingWithEquals) map[string]*string {
+func flatten(in composetypes.MappingWithEquals) map[string]*string {
  if len(in) == 0 {
  return nil
  }
@@ -327,8 +327,8 @@ func (t *Target) composeExtTarget(exts map[string]interface{}) error {
 
 // composeToBuildkitSecret converts secret from compose format to buildkit's
 // csv format.
-func composeToBuildkitSecret(inp compose.ServiceSecretConfig, psecret compose.SecretConfig) (string, error) {
- if psecret.External.External {
+func composeToBuildkitSecret(inp composetypes.ServiceSecretConfig, psecret composetypes.SecretConfig) (string, error) {
+ if psecret.External {
  return "", errors.Errorf("unsupported external secret %s", psecret.Name)
  }
 

bake/compose_test.go

@@ -6,7 +6,7 @@ import (
  "sort"
  "testing"
 
- compose "github.com/compose-spec/compose-go/types"
+ composetypes "github.com/compose-spec/compose-go/v2/types"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
 )
@@ -49,10 +49,7 @@ secrets:
  file: /root/.aws/credentials
 `)
 
- cwd, err := os.Getwd()
- require.NoError(t, err)
-
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 
  require.Equal(t, 1, len(c.Groups))
@@ -65,12 +62,12 @@ secrets:
  return c.Targets[i].Name < c.Targets[j].Name
  })
  require.Equal(t, "db", c.Targets[0].Name)
- require.Equal(t, filepath.Join(cwd, "db"), *c.Targets[0].Context)
+ require.Equal(t, "db", *c.Targets[0].Context)
  require.Equal(t, []string{"docker.io/tonistiigi/db"}, c.Targets[0].Tags)
 
  require.Equal(t, "webapp", c.Targets[1].Name)
- require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[1].Context)
- require.Equal(t, map[string]string{"foo": filepath.Join(cwd, "bar")}, c.Targets[1].Contexts)
+ require.Equal(t, "dir", *c.Targets[1].Context)
+ require.Equal(t, map[string]string{"foo": "bar"}, c.Targets[1].Contexts)
  require.Equal(t, "Dockerfile-alternate", *c.Targets[1].Dockerfile)
  require.Equal(t, 1, len(c.Targets[1].Args))
  require.Equal(t, ptrstr("123"), c.Targets[1].Args["buildno"])
@@ -83,7 +80,7 @@ secrets:
  }, c.Targets[1].Secrets)
 
  require.Equal(t, "webapp2", c.Targets[2].Name)
- require.Equal(t, filepath.Join(cwd, "dir"), *c.Targets[2].Context)
+ require.Equal(t, "dir", *c.Targets[2].Context)
  require.Equal(t, "FROM alpine\n", *c.Targets[2].DockerfileInline)
 }
 
@@ -95,7 +92,7 @@ services:
  webapp:
  build: ./db
 `)
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, 1, len(c.Groups))
  require.Equal(t, 1, len(c.Targets))
@@ -114,7 +111,7 @@ services:
  target: webapp
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 
  require.Equal(t, 2, len(c.Targets))
@@ -139,7 +136,7 @@ services:
  target: webapp
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, 2, len(c.Targets))
  sort.Slice(c.Targets, func(i, j int) bool {
@@ -170,7 +167,7 @@ services:
  t.Setenv("BAR", "foo")
  t.Setenv("ZZZ_BAR", "zzz_foo")
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, sliceToMap(os.Environ()))
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, sliceToMap(os.Environ()))
  require.NoError(t, err)
  require.Equal(t, ptrstr("bar"), c.Targets[0].Args["FOO"])
  require.Equal(t, ptrstr("zzz_foo"), c.Targets[0].Args["BAR"])
@@ -184,7 +181,7 @@ services:
  entrypoint: echo 1
 `)
 
- _, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.Error(t, err)
 }
 
@@ -209,7 +206,7 @@ networks:
  gateway: 10.5.0.254
 `)
 
- _, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 }
 
@@ -226,7 +223,7 @@ services:
  - bar
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, []string{"foo", "bar"}, c.Targets[0].Tags)
 }
@@ -263,7 +260,7 @@ networks:
  name: test-net
 `)
 
- _, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 }
 
@@ -316,7 +313,7 @@ services:
  no-cache: true
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, 2, len(c.Targets))
  sort.Slice(c.Targets, func(i, j int) bool {
@@ -360,7 +357,7 @@ services:
  - type=local,dest=path/to/cache
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, 1, len(c.Targets))
  require.Equal(t, []string{"ct-addon:foo", "ct-addon:baz"}, c.Targets[0].Tags)
@@ -393,7 +390,7 @@ services:
  - ` + envf.Name() + `
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, map[string]*string{"CT_ECR": ptrstr("foo"), "FOO": ptrstr("bsdf -csdf"), "NODE_ENV": ptrstr("test")}, c.Targets[0].Args)
 }
@@ -439,7 +436,7 @@ services:
  published: "3306"
  protocol: tcp
 `)
- _, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 }
 
@@ -485,7 +482,7 @@ func TestServiceName(t *testing.T) {
  for _, tt := range cases {
  tt := tt
  t.Run(tt.svc, func(t *testing.T) {
- _, err := ParseCompose([]compose.ConfigFile{{Content: []byte(`
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: []byte(`
 services:
  ` + tt.svc + `:
  build:
@@ -556,7 +553,7 @@ services:
  for _, tt := range cases {
  tt := tt
  t.Run(tt.name, func(t *testing.T) {
- _, err := ParseCompose([]compose.ConfigFile{{Content: tt.dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: tt.dt}}, nil)
  if tt.wantErr {
  require.Error(t, err)
  } else {
@@ -654,7 +651,7 @@ services:
  bar: "baz"
 `)
 
- c, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
  require.Equal(t, map[string]*string{"bar": ptrstr("baz")}, c.Targets[0].Args)
 }
@@ -673,7 +670,7 @@ services:
  build:
  context: .
 `)
- _, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 }
 
@@ -704,7 +701,7 @@ services:
 
  chdir(t, tmpdir)
  c, err := ParseComposeFiles([]File{{
- Name: "compose.yml",
+ Name: "composetypes.yml",
  Data: dt,
  }})
  require.NoError(t, err)
@@ -734,7 +731,7 @@ services:
  - node_modules/
 `)
 
- _, err := ParseCompose([]compose.ConfigFile{{Content: dt}}, nil)
+ _, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
  require.NoError(t, err)
 }
 

go.mod

@@ -5,7 +5,7 @@ go 1.21
 require (
  github.com/Masterminds/semver/v3 v3.2.1
  github.com/aws/aws-sdk-go-v2/config v1.18.16
- github.com/compose-spec/compose-go v1.20.0
+ github.com/compose-spec/compose-go/v2 v2.0.0-rc.3
  github.com/containerd/console v1.0.3
  github.com/containerd/containerd v1.7.12
  github.com/containerd/continuity v0.4.2
@@ -113,8 +113,10 @@ require (
  github.com/mattn/go-shellwords v1.0.12 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/miekg/pkcs11 v1.1.1 // indirect
+ github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/moby/locker v1.0.1 // indirect
  github.com/moby/patternmatcher v0.6.0 // indirect
  github.com/moby/spdystream v0.2.0 // indirect

go.sum

@@ -86,8 +86,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+g
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
-github.com/compose-spec/compose-go v1.20.0 h1:h4ZKOst1EF/DwZp7dWkb+wbTVE4nEyT9Lc89to84Ol4=
-github.com/compose-spec/compose-go v1.20.0/go.mod h1:+MdqXV4RA7wdFsahh/Kb8U0pAJqkg7mr4PM9tFKU8RM=
+github.com/compose-spec/compose-go/v2 v2.0.0-rc.3 h1:t0qajSNkH3zR4HEN2CM+GVU7GBx5AwqiYJk5w800M7w=
+github.com/compose-spec/compose-go/v2 v2.0.0-rc.3/go.mod h1:r7CJHU0GaLtRVLm2ch8RCNkJh3GHyaqqc2rSti7VP44=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
 github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
@@ -311,12 +311,16 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr
 github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
 github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
 github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/buildkit v0.13.0-beta1.0.20240126101002-6bd81372ad6f h1:weCt2sfZGVAeThzpVyv4ibC0oFfvSxtbiTE7W77wXpc=
 github.com/moby/buildkit v0.13.0-beta1.0.20240126101002-6bd81372ad6f/go.mod h1:vEcIVw63dZyhTgbcyQWXlZrtrKnvFoSI8LhfV+Vj0Jg=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=