Refactor provision/services.go

[#161730948]

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

Author: Anthony Emengo

provision/services.go

@@ -2,7 +2,6 @@ package provision
 
 import (
 	"code.cloudfoundry.org/cfdev/bosh"
-	"errors"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -22,43 +21,46 @@ type Service struct {
 }
 
 func (c *Controller) WhiteListServices(whiteList string, services []Service) ([]Service, error) {
-	if services == nil {
-		return nil, errors.New("Error whitelisting services")
-	}
+	var whiteListed []Service
 
-	if strings.ToLower(whiteList) == "all" {
-		return services, nil
+	for _, service := range services {
+		if service.Flagname == "always-include" {
+			whiteListed = append(whiteListed, service)
+		}
 	}
 
-	var whiteListed []Service
-
-	if whiteList == "none" {
+	switch strings.TrimSpace(strings.ToLower(whiteList)) {
+	case "all":
+		return services, nil
+	case "none":
+		return whiteListed, nil
+	case "":
 		for _, service := range services {
-			if service.Flagname == "always-include" {
+			if service.DefaultDeploy && !contains(whiteListed, service.Name) {
 				whiteListed = append(whiteListed, service)
 			}
 		}
 
 		return whiteListed, nil
-	}
-
-	if whiteList == "" {
+	default:
 		for _, service := range services {
-			if service.DefaultDeploy {
+			if strings.Contains(strings.ToLower(whiteList), strings.ToLower(service.Flagname)) && !contains(whiteListed, service.Name) {
 				whiteListed = append(whiteListed, service)
 			}
 		}
 
 		return whiteListed, nil
 	}
+}
 
-	for _, service := range services {
-		if strings.Contains(strings.ToLower(whiteList), strings.ToLower(service.Flagname)) || (strings.ToLower(service.Flagname) == "always-include") {
-			whiteListed = append(whiteListed, service)
+func contains(services []Service, name string) bool {
+	for _, s := range services {
+		if s.Name == name {
+			return true
 		}
 	}
 
-	return whiteListed, nil
+	return false
 }
 
 func (c *Controller) DeployServices(ui UI, services []Service) error {
@@ -109,4 +111,4 @@ func (c *Controller) DeployService(service Service) error {
 	cmd.Stderr = logFile
 
 	return cmd.Run()
-}
+}

provision/services_test.go

@@ -58,9 +58,9 @@ var _ = Describe("When progress whitelist is called with", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			Expect(len(output)).To(Equal(3))
-			Expect(output[0].Name).To(Equal("service-one"))
-			Expect(output[1].Name).To(Equal("service-three"))
-			Expect(output[2].Name).To(Equal("service-four"))
+			Expect(output[0].Name).To(Equal("service-four"))
+			Expect(output[1].Name).To(Equal("service-one"))
+			Expect(output[2].Name).To(Equal("service-three"))
 		})
 	})
 
@@ -79,8 +79,8 @@ var _ = Describe("When progress whitelist is called with", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			Expect(len(output)).To(Equal(2))
-			Expect(output[0].Name).To(Equal("service-three"))
-			Expect(output[1].Name).To(Equal("service-four"))
+			Expect(output[0].Name).To(Equal("service-four"))
+			Expect(output[1].Name).To(Equal("service-three"))
 		})
 	})
 
@@ -90,9 +90,9 @@ var _ = Describe("When progress whitelist is called with", func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			Expect(len(output)).To(Equal(3))
-			Expect(output[0].Name).To(Equal("service-two"))
-			Expect(output[1].Name).To(Equal("service-three"))
-			Expect(output[2].Name).To(Equal("service-four"))
+			Expect(output[0].Name).To(Equal("service-four"))
+			Expect(output[1].Name).To(Equal("service-two"))
+			Expect(output[2].Name).To(Equal("service-three"))
 		})
 	})
 
@@ -105,11 +105,4 @@ var _ = Describe("When progress whitelist is called with", func() {
 			Expect(output[0].Name).To(Equal("service-four"))
 		})
 	})
-
-	Context("nil services", func() {
-		It("returns an error", func() {
-			_, err := c.WhiteListServices("service-one", nil)
-			Expect(err).To(HaveOccurred())
-		})
-	})
 })