Refactor backends in config to allow for multiple, named backends.

yext · Mar 7, 2018 · 2e9e228 · 2e9e228
1 parent c95930f
commit 2e9e228
Show file tree

Hide file tree

Showing 16 changed files with 380 additions and 224 deletions.
diff --git a/builder/build.go b/builder/build.go
@@ -36,7 +36,7 @@ func (b *builder) Build(dirConfig *home.EdwardConfiguration, task tracker.Task,
 // BuildWithTracker builds a service.
 // If force is false, the build will be skipped if the service is already running.
 func (b *builder) BuildWithTracker(dirConfig *home.EdwardConfiguration, task tracker.Task, service *services.ServiceConfig, force bool) error {
-	if !service.BackendConfig.HasBuildStep() {
+	if !service.Backend().HasBuildStep() {
 		return nil
 	}
 	if task == nil {

diff --git a/config/config_test.go b/config/config_test.go
@@ -25,14 +25,20 @@ var service1 = services.ServiceConfig{
 	Description:  "My Service 1 is magic",
 	Path:         common.StringToStringPointer("."),
 	RequiresSudo: true,
-	BackendConfig: &commandline.Backend{
-		Commands: commandline.ServiceConfigCommands{
-			Build:  "buildCmd",
-			Launch: "launchCmd",
-			Stop:   "stopCmd",
-		},
-		LaunchChecks: &commandline.LaunchChecks{
-			LogText: "startedProperty",
+	Backends: []*services.BackendConfig{
+		{
+			Name: "backend1",
+			Type: "commandline",
+			Config: &commandline.Backend{
+				Commands: commandline.ServiceConfigCommands{
+					Build:  "buildCmd",
+					Launch: "launchCmd",
+					Stop:   "stopCmd",
+				},
+				LaunchChecks: &commandline.LaunchChecks{
+					LogText: "startedProperty",
+				},
+			},
 		},
 	},
 	Logger: common.NullLogger{},
@@ -43,14 +49,20 @@ var service1alias = services.ServiceConfig{
 	Aliases:      []string{"service2"},
 	Path:         common.StringToStringPointer("."),
 	RequiresSudo: true,
-	BackendConfig: &commandline.Backend{
-		Commands: commandline.ServiceConfigCommands{
-			Build:  "buildCmd",
-			Launch: "launchCmd",
-			Stop:   "stopCmd",
-		},
-		LaunchChecks: &commandline.LaunchChecks{
-			LogText: "startedProperty",
+	Backends: []*services.BackendConfig{
+		{
+			Name: "backend1",
+			Type: "commandline",
+			Config: &commandline.Backend{
+				Commands: commandline.ServiceConfigCommands{
+					Build:  "buildCmd",
+					Launch: "launchCmd",
+					Stop:   "stopCmd",
+				},
+				LaunchChecks: &commandline.LaunchChecks{
+					LogText: "startedProperty",
+				},
+			},
 		},
 	},
 	Logger: common.NullLogger{},
@@ -77,11 +89,17 @@ var group1alias = services.ServiceGroupConfig{
 var service2 = services.ServiceConfig{
 	Name: "service2",
 	Path: common.StringToStringPointer("service2/path"),
-	BackendConfig: &commandline.Backend{
-		Commands: commandline.ServiceConfigCommands{
-			Build:  "buildCmd2",
-			Launch: "launchCmd2",
-			Stop:   "stopCmd2",
+	Backends: []*services.BackendConfig{
+		{
+			Name: "backend1",
+			Type: "commandline",
+			Config: &commandline.Backend{
+				Commands: commandline.ServiceConfigCommands{
+					Build:  "buildCmd2",
+					Launch: "launchCmd2",
+					Stop:   "stopCmd2",
+				},
+			},
 		},
 	},
 	Logger: common.NullLogger{},
@@ -99,14 +117,20 @@ var service3 = services.ServiceConfig{
 	Name:         "service3",
 	Path:         common.StringToStringPointer("."),
 	RequiresSudo: true,
-	BackendConfig: &commandline.Backend{
-		Commands: commandline.ServiceConfigCommands{
-			Build:  "buildCmd",
-			Launch: "launchCmd",
-			Stop:   "stopCmd",
-		},
-		LaunchChecks: &commandline.LaunchChecks{
-			LogText: "startedProperty",
+	Backends: []*services.BackendConfig{
+		{
+			Name: "backend1",
+			Type: "commandline",
+			Config: &commandline.Backend{
+				Commands: commandline.ServiceConfigCommands{
+					Build:  "buildCmd",
+					Launch: "launchCmd",
+					Stop:   "stopCmd",
+				},
+				LaunchChecks: &commandline.LaunchChecks{
+					LogText: "startedProperty",
+				},
+			},
 		},
 	},
 	Logger: common.NullLogger{},

diff --git a/generators/docker.go b/generators/docker.go
@@ -56,13 +56,18 @@ func (v *DockerGenerator) VisitDir(path string) (bool, error) {
 			Name: name,
 			Path: &dockerPath,
 			Env:  []string{},
-			BackendConfig: &commandline.Backend{
-				Commands: commandline.ServiceConfigCommands{
-					Build:  "docker build -t " + tag + " .",
-					Launch: "docker run " + strings.Join(portCommands, " ") + " " + tag,
-				},
-				LaunchChecks: &commandline.LaunchChecks{
-					Ports: expectedPorts,
+			Backends: []*services.BackendConfig{
+				{
+					Type: "commandline",
+					Config: &commandline.Backend{
+						Commands: commandline.ServiceConfigCommands{
+							Build:  "docker build -t " + tag + " .",
+							Launch: "docker run " + strings.Join(portCommands, " ") + " " + tag,
+						},
+						LaunchChecks: &commandline.LaunchChecks{
+							Ports: expectedPorts,
+						},
+					},
 				},
 			},
 		}