Add legacy marshaling and support old-style command line backends.

yext · Mar 8, 2018 · 5ae5de0 · 5ae5de0
1 parent 2e9e228
commit 5ae5de0
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 33 deletions.
diff --git a/backend_registry.go b/backend_registry.go
@@ -8,6 +8,7 @@ import (
 
 // RegisterBackends configures all supported service backends.
 func RegisterBackends() {
-	services.RegisterDefaultBackend(&commandline.Loader{})
+	services.RegisterLegacyMarshaler(&commandline.LegacyUnmarshaler{})
+	services.RegisterBackend(&commandline.Loader{})
 	services.RegisterBackend(&docker.Loader{})
 }
diff --git a/config/config_test.go b/config/config_test.go
@@ -15,7 +15,8 @@ import (
 
 func TestMain(m *testing.M) {
 	// Register necessary backends
-	services.RegisterDefaultBackend(&commandline.Loader{})
+	services.RegisterLegacyMarshaler(&commandline.LegacyUnmarshaler{})
+	services.RegisterBackend(&commandline.Loader{})
 
 	os.Exit(m.Run())
 }
@@ -27,7 +28,6 @@ var service1 = services.ServiceConfig{
 	RequiresSudo: true,
 	Backends: []*services.BackendConfig{
 		{
-			Name: "backend1",
 			Type: "commandline",
 			Config: &commandline.Backend{
 				Commands: commandline.ServiceConfigCommands{
@@ -51,7 +51,6 @@ var service1alias = services.ServiceConfig{
 	RequiresSudo: true,
 	Backends: []*services.BackendConfig{
 		{
-			Name: "backend1",
 			Type: "commandline",
 			Config: &commandline.Backend{
 				Commands: commandline.ServiceConfigCommands{
@@ -91,7 +90,6 @@ var service2 = services.ServiceConfig{
 	Path: common.StringToStringPointer("service2/path"),
 	Backends: []*services.BackendConfig{
 		{
-			Name: "backend1",
 			Type: "commandline",
 			Config: &commandline.Backend{
 				Commands: commandline.ServiceConfigCommands{
@@ -119,7 +117,6 @@ var service3 = services.ServiceConfig{
 	RequiresSudo: true,
 	Backends: []*services.BackendConfig{
 		{
-			Name: "backend1",
 			Type: "commandline",
 			Config: &commandline.Backend{
 				Commands: commandline.ServiceConfigCommands{

diff --git a/edward/client_test.go b/edward/client_test.go
@@ -40,7 +40,8 @@ func TestMain(m *testing.M) {
 	}
 
 	// Register necessary backends
-	services.RegisterDefaultBackend(&commandline.Loader{})
+	services.RegisterLegacyMarshaler(&commandline.LegacyUnmarshaler{})
+	services.RegisterBackend(&commandline.Loader{})
 
 	os.Exit(m.Run())
 }

diff --git a/edward/tail.go b/edward/tail.go
@@ -70,7 +70,7 @@ func followGroupLog(logDir string, group *services.ServiceGroupConfig, logChanne
 
 func followServiceLog(logDir string, service *services.ServiceConfig, logChannel chan runner.LogLine) ([]runner.LogLine, error) {
 	// Skip services that don't include a launch step
-	if !service.BackendConfig.HasLaunchStep() {
+	if !service.Backend().HasLaunchStep() {
 		return nil, nil
 	}
 

diff --git a/generators/generators_test.go b/generators/generators_test.go
@@ -13,7 +13,8 @@ import (
 
 func TestMain(m *testing.M) {
 	// Register necessary backends
-	services.RegisterDefaultBackend(&commandline.Loader{})
+	services.RegisterLegacyMarshaler(&commandline.LegacyUnmarshaler{})
+	services.RegisterBackend(&commandline.Loader{})
 
 	os.Exit(m.Run())
 }

diff --git a/services/backends.go b/services/backends.go
@@ -43,14 +43,9 @@ func RegisterBackend(loader BackendLoader) {
 	loaders[loader.Name()] = loader
 }
 
-func RegisterDefaultBackend(loader BackendLoader) {
-	loaders[loader.Name()] = loader
-	defaultType = loader.Name()
-}
-
 func GetBuilder(s *ServiceConfig) (Builder, error) {
 	for _, backend := range s.Backends {
-		if loader, ok := loaders[backend.Type]; !ok {
+		if loader, ok := loaders[backend.Type]; ok {
 			return loader.Builder(s)
 		}
 	}
@@ -59,7 +54,7 @@ func GetBuilder(s *ServiceConfig) (Builder, error) {
 
 func GetRunner(s *ServiceConfig) (Runner, error) {
 	for _, backend := range s.Backends {
-		if loader, ok := loaders[backend.Type]; !ok {
+		if loader, ok := loaders[backend.Type]; ok {
 			return loader.Runner(s)
 		}
 	}

diff --git a/services/backends/commandline/buildandrun_test.go b/services/backends/commandline/buildandrun_test.go
@@ -17,7 +17,8 @@ import (
 
 func TestMain(m *testing.M) {
 	// Register necessary backends
-	services.RegisterDefaultBackend(&commandline.Loader{})
+	services.RegisterLegacyMarshaler(&commandline.LegacyUnmarshaler{})
+	services.RegisterBackend(&commandline.Loader{})
 
 	os.Exit(m.Run())
 }

diff --git a/services/backends/commandline/legacy.go b/services/backends/commandline/legacy.go
@@ -0,0 +1,27 @@
+package commandline
+
+import (
+	"encoding/json"
+
+	"github.com/pkg/errors"
+	"github.com/yext/edward/services"
+)
+
+type LegacyUnmarshaler struct{}
+
+func (l *LegacyUnmarshaler) Unmarshal(data []byte, c *services.ServiceConfig) error {
+	var backend Backend
+	var empty Backend
+	err := json.Unmarshal(data, &backend)
+	if err != nil {
+		return errors.WithStack(err)
+	}
+	if backend != empty {
+		c.Backends = append(c.Backends, &services.BackendConfig{
+			Type:   "commandline",
+			Config: &backend,
+		})
+	}
+
+	return nil
+}
diff --git a/services/backends/docker/buildandrun_test.go b/services/backends/docker/buildandrun_test.go
@@ -1,4 +1,4 @@
-// +build docker
+// +build acceptance
 
 package docker_test
 
@@ -15,26 +15,30 @@ import (
 
 func TestMain(m *testing.M) {
 	// Register necessary backends
-	services.RegisterDefaultBackend(&docker.Loader{})
-
+	services.RegisterBackend(&docker.Loader{})
 	os.Exit(m.Run())
 }
 
 func TestStart(t *testing.T) {
 	service := &services.ServiceConfig{
 		Name: "testservice",
-		BackendConfig: &docker.Backend{
-			Image: "kitematic/hello-world-nginx:latest",
-			ContainerConfig: docker.Config{
-				ExposedPorts: map[docker.Port]struct{}{
-					"8080/tcp": struct{}{},
-				},
-			},
-			HostConfig: docker.HostConfig{
-				PortBindings: map[docker.Port][]docker.PortBinding{
-					"80/tcp": []docker.PortBinding{
-						{
-							HostPort: "51432/tcp",
+		Backends: []*services.BackendConfig{
+			{
+				Type: "docker",
+				Config: &docker.Backend{
+					Image: "kitematic/hello-world-nginx:latest",
+					ContainerConfig: docker.Config{
+						ExposedPorts: map[docker.Port]struct{}{
+							"8080/tcp": struct{}{},
+						},
+					},
+					HostConfig: docker.HostConfig{
+						PortBindings: map[docker.Port][]docker.PortBinding{
+							"80/tcp": []docker.PortBinding{
+								{
+									HostPort: "51432/tcp",
+								},
+							},
 						},
 					},
 				},

diff --git a/services/legacy.go b/services/legacy.go
@@ -0,0 +1,11 @@
+package services
+
+type LegacyMarshaler interface {
+	Unmarshal([]byte, *ServiceConfig) error
+}
+
+var legacyUnmarshalers []LegacyMarshaler
+
+func RegisterLegacyMarshaler(l LegacyMarshaler) {
+	legacyUnmarshalers = append(legacyUnmarshalers, l)
+}
diff --git a/services/serviceconfig.go b/services/serviceconfig.go
@@ -138,9 +138,14 @@ func (c *ServiceConfig) UnmarshalJSON(data []byte) error {
 	}{
 		Alias: (*Alias)(c),
 	}
-	if err := json.Unmarshal(data, &aux); err != nil {
+	if err := json.Unmarshal(data, aux); err != nil {
 		return errors.Wrap(err, "could not parse service config")
 	}
+	for _, m := range legacyUnmarshalers {
+		if err := m.Unmarshal(data, c); err != nil {
+			return errors.Wrap(err, "could not parse legacy configuration")
+		}
+	}
 
 	return nil
 }