Merge pull request #851 from containerd/dependabot/go_modules/github.…

…com/compose-spec/compose-go-1.1.0 Bump github.com/compose-spec/compose-go from 1.0.9 to 1.1.0
containerd · Mar 3, 2022 · af4278f · af4278f
2 parents f03838c + e8f7b6a
commit af4278f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/Microsoft/go-winio v0.5.2
-	github.com/compose-spec/compose-go v1.0.9
+	github.com/compose-spec/compose-go v1.1.0
 	github.com/containerd/cgroups v1.0.3
 	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd v1.6.1

diff --git a/go.sum b/go.sum
@@ -252,8 +252,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/compose-spec/compose-go v1.0.9 h1:mLEdaXkxgO7rUJEa+WoFjwl08LuoW7PeYwey74Z3jao=
-github.com/compose-spec/compose-go v1.0.9/go.mod h1:rHEHEY6CRqTAsRy+qvxWSr5GmqzgLWspRD0zloT9GOk=
+github.com/compose-spec/compose-go v1.1.0 h1:n/0O7Fl90doi5AG9bfF0SOSLXtveXxLkGXblSrxVC5Q=
+github.com/compose-spec/compose-go v1.1.0/go.mod h1:pAy7Mikpeft4pxkFU565/DRHEbDfR84G6AQuiL+Hdg8=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
 github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=

diff --git a/pkg/composer/projectloader/projectloader.go b/pkg/composer/projectloader/projectloader.go
@@ -25,6 +25,9 @@ import (
 )
 
 func Load(fileName, projectName string, envMap map[string]string) (*compose.Project, error) {
+	if envMap == nil {
+		envMap = make(map[string]string)
+	}
 	b, err := os.ReadFile(fileName)
 	if err != nil {
 		return nil, err
@@ -45,6 +48,6 @@ func Load(fileName, projectName string, envMap map[string]string) (*compose.Proj
 
 func withProjectName(name string) func(*loader.Options) {
 	return func(lOpts *loader.Options) {
-		lOpts.Name = name
+		lOpts.SetProjectName(name, true)
 	}
 }
diff --git a/pkg/composer/serviceparser/serviceparser.go b/pkg/composer/serviceparser/serviceparser.go
@@ -632,13 +632,13 @@ func servicePortConfigToFlagP(c types.ServicePortConfig) (string, error) {
 	default:
 		return "", fmt.Errorf("unsupported port mode: %s", c.Mode)
 	}
-	if c.Published <= 0 {
-		return "", fmt.Errorf("unsupported port number: %d", c.Published)
+	if c.Published == "" {
+		return "", fmt.Errorf("unsupported port number: %q", c.Published)
 	}
 	if c.Target <= 0 {
 		return "", fmt.Errorf("unsupported port number: %d", c.Target)
 	}
-	s := fmt.Sprintf("%d:%d", c.Published, c.Target)
+	s := fmt.Sprintf("%s:%d", c.Published, c.Target)
 	if c.HostIP != "" {
 		if strings.Contains(c.HostIP, ":") {
 			s = fmt.Sprintf("[%s]:%s", c.HostIP, s)

diff --git a/pkg/composer/serviceparser/serviceparser_test.go b/pkg/composer/serviceparser/serviceparser_test.go
@@ -40,7 +40,7 @@ func TestServicePortConfigToFlagP(t *testing.T) {
 			ServicePortConfig: types.ServicePortConfig{
 				Mode:      "ingress",
 				Target:    80,
-				Published: 8080,
+				Published: "8080",
 				Protocol:  "tcp",
 			},
 			expected: "8080:80/tcp",
@@ -49,7 +49,7 @@ func TestServicePortConfigToFlagP(t *testing.T) {
 			ServicePortConfig: types.ServicePortConfig{
 				HostIP:    "127.0.0.1",
 				Target:    80,
-				Published: 8080,
+				Published: "8080",
 			},
 			expected: "127.0.0.1:8080:80",
 		},