Stop deploying services by default

[#162967938]

Signed-off-by: Joao Pereira <[email protected]>

Author: Anthony Emengo

cmd/start/start_test.go

@@ -54,15 +54,13 @@ var _ = Describe("Start", func() {
 		{
 			Name:          "some-service",
 			Flagname:      "some-service-flagname",
-			DefaultDeploy: true,
 			Handle:        "some-handle",
 			Script:        "/path/to/some-script",
 			Deployment:    "some-deployment",
 		},
 		{
 			Name:          "some-other-service",
 			Flagname:      "some-other-service-flagname",
-			DefaultDeploy: false,
 			Handle:        "some-other-handle",
 			Script:        "/path/to/some-other-script",
 			Deployment:    "some-other-deployment",

provision/services.go

@@ -15,7 +15,6 @@ import (
 type Service struct {
 	Name          string `yaml:"name"`
 	Flagname      string `yaml:"flag_name"`
-	DefaultDeploy bool   `yaml:"default_deploy"`
 	Handle        string `yaml:"handle"` //TODO <-- remove
 	Script        string `yaml:"script"`
 	Deployment    string `yaml:"deployment"`
@@ -34,15 +33,7 @@ func (c *Controller) WhiteListServices(whiteList string, services []Service) ([]
 	switch strings.TrimSpace(strings.ToLower(whiteList)) {
 	case "all":
 		return services, nil
-	case "none":
-		return whiteListed, nil
-	case "":
-		for _, service := range services {
-			if service.DefaultDeploy && !contains(whiteListed, service.Name) {
-				whiteListed = append(whiteListed, service)
-			}
-		}
-
+	case "", "none":
 		return whiteListed, nil
 	default:
 		for _, service := range services {

provision/services_test.go

@@ -20,31 +20,27 @@ var _ = Describe("When progress whitelist is called with", func() {
 			{
 				Name:          "service-one",
 				Flagname:      "service-one-flagname",
-				DefaultDeploy: true,
 				Handle:        "service-one-handle",
 				Script:        "/path/to/some-script",
 				Deployment:    "some-deployment",
 			},
 			{
 				Name:          "service-two",
 				Flagname:      "service-two-flagname",
-				DefaultDeploy: false,
 				Handle:        "service-two-handle",
 				Script:        "/path/to/some-script",
 				Deployment:    "some-deployment",
 			},
 			{
 				Name:          "service-three",
 				Flagname:      "service-three-flagname",
-				DefaultDeploy: true,
 				Handle:        "service-three-handle",
 				Script:        "/path/to/some-script",
 				Deployment:    "some-deployment",
 			},
 			{
 				Name:          "service-four",
 				Flagname:      "always-include",
-				DefaultDeploy: true,
 				Handle:        "service-four-handle",
 				Script:        "/path/to/some-script",
 				Deployment:    "some-deployment",
@@ -53,14 +49,12 @@ var _ = Describe("When progress whitelist is called with", func() {
 	})
 
 	Context("an empty string", func() {
-		It("returns all and only the DefaultDeploy services", func() {
+		It("returns only the DefaultDeploy services", func() {
 			output, err := c.WhiteListServices("", services)
 			Expect(err).ToNot(HaveOccurred())
 
-			Expect(len(output)).To(Equal(3))
+			Expect(len(output)).To(Equal(1))
 			Expect(output[0].Name).To(Equal("service-four"))
-			Expect(output[1].Name).To(Equal("service-one"))
-			Expect(output[2].Name).To(Equal("service-three"))
 		})
 	})