Fix stack v1beta2 does not need to marshal the Compose config.

Signed-off-by: Silvin Lubecki <[email protected]>

cli/command/stack/kubernetes/convert.go

@@ -5,12 +5,28 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/docker/cli/cli/compose/loader"
 	composeTypes "github.com/docker/cli/cli/compose/types"
+	composetypes "github.com/docker/cli/cli/compose/types"
 	"github.com/docker/cli/kubernetes/compose/v1beta1"
 	"github.com/docker/cli/kubernetes/compose/v1beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+func loadStackData(composefile string) (*composetypes.Config, error) {
+	parsed, err := loader.ParseYAML([]byte(composefile))
+	if err != nil {
+		return nil, err
+	}
+	return loader.Load(composetypes.ConfigDetails{
+		ConfigFiles: []composetypes.ConfigFile{
+			{
+				Config: parsed,
+			},
+		},
+	})
+}
+
 // Conversions from internal stack to different stack compose component versions.
 func stackFromV1beta1(in *v1beta1.Stack) (stack, error) {
 	cfg, err := loadStackData(in.Spec.ComposeFile)

cli/command/stack/kubernetes/deploy.go

@@ -16,25 +16,26 @@ func RunDeploy(dockerCli *KubeCli, opts options.Deploy) error {
 		return errors.Errorf("Please specify only one compose file (with --compose-file).")
 	}
 
-	// Parse the compose file
-	cfg, err := loader.LoadComposefile(dockerCli, opts)
+	// Initialize clients
+	stacks, err := dockerCli.stacks()
 	if err != nil {
 		return err
 	}
-	stack, err := loadStack(opts.Namespace, *cfg)
+	composeClient, err := dockerCli.composeClient()
 	if err != nil {
 		return err
 	}
 
-	// Initialize clients
-	stacks, err := dockerCli.stacks()
+	// Parse the compose file
+	cfg, err := loader.LoadComposefile(dockerCli, opts)
 	if err != nil {
 		return err
 	}
-	composeClient, err := dockerCli.composeClient()
+	stack, err := stacks.FromCompose(opts.Namespace, *cfg)
 	if err != nil {
 		return err
 	}
+
 	configMaps := composeClient.ConfigMaps()
 	secrets := composeClient.Secrets()
 	services := composeClient.Services()

cli/command/stack/kubernetes/stackclient.go

@@ -3,9 +3,11 @@ package kubernetes
 import (
 	"fmt"
 
+	composetypes "github.com/docker/cli/cli/compose/types"
 	composev1beta1 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta1"
 	composev1beta2 "github.com/docker/cli/kubernetes/client/clientset/typed/compose/v1beta2"
 	"github.com/docker/cli/kubernetes/labels"
+	yaml "gopkg.in/yaml.v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
@@ -18,6 +20,7 @@ type stackClient interface {
 	Get(name string) (stack, error)
 	List(opts metav1.ListOptions) ([]stack, error)
 	IsColliding(servicesClient corev1.ServiceInterface, s stack) error
+	FromCompose(name string, cfg composetypes.Config) (stack, error)
 }
 
 // stackV1Beta1 implements stackClient interface and talks to compose component v1beta1.
@@ -100,6 +103,18 @@ func verify(services corev1.ServiceInterface, stackName string, service string)
 	return nil
 }
 
+func (s *stackV1Beta1) FromCompose(name string, cfg composetypes.Config) (stack, error) {
+	res, err := yaml.Marshal(cfg)
+	if err != nil {
+		return stack{}, err
+	}
+	return stack{
+		name:        name,
+		composeFile: string(res),
+		spec:        fromComposeConfig(&cfg),
+	}, nil
+}
+
 // stackV1Beta2 implements stackClient interface and talks to compose component v1beta2.
 type stackV1Beta2 struct {
 	stacks composev1beta2.StackInterface
@@ -153,3 +168,10 @@ func (s *stackV1Beta2) List(opts metav1.ListOptions) ([]stack, error) {
 func (s *stackV1Beta2) IsColliding(servicesClient corev1.ServiceInterface, st stack) error {
 	return nil
 }
+
+func (s *stackV1Beta2) FromCompose(name string, cfg composetypes.Config) (stack, error) {
+	return stack{
+		name: name,
+		spec: fromComposeConfig(&cfg),
+	}, nil
+}

cli/command/stack/kubernetes/loader_test.go → cli/command/stack/kubernetes/stackclient_test.go

@@ -7,8 +7,9 @@ import (
 	"github.com/gotestyourself/gotestyourself/assert"
 )
 
-func TestLoadStack(t *testing.T) {
-	s, err := loadStack("foo", composetypes.Config{
+func TestFromCompose(t *testing.T) {
+	stackClient := &stackV1Beta1{}
+	s, err := stackClient.FromCompose("foo", composetypes.Config{
 		Version:  "3.1",
 		Filename: "banana",
 		Services: []composetypes.ServiceConfig{