Move provision methods to appropriately-names files

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

Author: Anthony Emengo

provision/controller.go

@@ -4,8 +4,14 @@ import (
 	"code.cloudfoundry.org/cfdev/config"
 	"context"
 	"github.com/aemengo/bosh-runc-cpi/client"
+	"io"
 )
 
+type UI interface {
+	Say(message string, args ...interface{})
+	Writer() io.Writer
+}
+
 type Controller struct {
 	Config config.Config
 }

provision/progress.go

@@ -1,87 +1,13 @@
 package provision
 
 import (
-	e "errors"
 	"fmt"
-	"io"
-	"strings"
 	"time"
 
 	"code.cloudfoundry.org/cfdev/bosh"
 	"code.cloudfoundry.org/cfdev/errors"
 )
 
-type UI interface {
-	Say(message string, args ...interface{})
-	Writer() io.Writer
-}
-
-func (c *Controller) WhiteListServices(whiteList string, services []Service) ([]Service, error) {
-	if services == nil {
-		return nil, e.New("Error whitelisting services")
-	}
-
-	if strings.ToLower(whiteList) == "all" {
-		return services, nil
-	}
-
-	var whiteListed []Service
-
-	if whiteList == "none" {
-		for _, service := range services {
-			if service.Flagname == "always-include" {
-				whiteListed = append(whiteListed, service)
-			}
-		}
-
-		return whiteListed, nil
-	}
-
-	if whiteList == "" {
-		for _, service := range services {
-			if service.DefaultDeploy {
-				whiteListed = append(whiteListed, service)
-			}
-		}
-
-		return whiteListed, nil
-	}
-
-	for _, service := range services {
-		if (strings.ToLower(whiteList) == strings.ToLower(service.Flagname)) || (strings.ToLower(service.Flagname) == "always-include") {
-			whiteListed = append(whiteListed, service)
-		}
-	}
-
-	return whiteListed, nil
-}
-
-func (c *Controller) DeployServices(ui UI, services []Service) error {
-	b, err := bosh.New(c.Config)
-	if err != nil {
-		return err
-	}
-
-	errChan := make(chan error, 1)
-
-	for _, service := range services {
-		start := time.Now()
-
-		ui.Say("Deploying %s...", service.Name)
-
-		go func(handle string, serviceManifest string) {
-			errChan <- c.DeployService(service)
-		}(service.Handle, service.Script)
-
-		err = c.report(start, ui, b, service, errChan)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (c *Controller) report(start time.Time, ui UI, b *bosh.Bosh, service Service, errChan chan error) error {
 	ticker := time.NewTicker(time.Second)
 

provision/progress_test.go

@@ -2,13 +2,91 @@ package provision
 
 import (
 	"code.cloudfoundry.org/cfdev/bosh"
+	"errors"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
+	"time"
 )
 
+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"`
+	IsErrand      bool   `yaml:"errand"`
+}
+
+func (c *Controller) WhiteListServices(whiteList string, services []Service) ([]Service, error) {
+	if services == nil {
+		return nil, errors.New("Error whitelisting services")
+	}
+
+	if strings.ToLower(whiteList) == "all" {
+		return services, nil
+	}
+
+	var whiteListed []Service
+
+	if whiteList == "none" {
+		for _, service := range services {
+			if service.Flagname == "always-include" {
+				whiteListed = append(whiteListed, service)
+			}
+		}
+
+		return whiteListed, nil
+	}
+
+	if whiteList == "" {
+		for _, service := range services {
+			if service.DefaultDeploy {
+				whiteListed = append(whiteListed, service)
+			}
+		}
+
+		return whiteListed, nil
+	}
+
+	for _, service := range services {
+		if (strings.ToLower(whiteList) == strings.ToLower(service.Flagname)) || (strings.ToLower(service.Flagname) == "always-include") {
+			whiteListed = append(whiteListed, service)
+		}
+	}
+
+	return whiteListed, nil
+}
+
+func (c *Controller) DeployServices(ui UI, services []Service) error {
+	b, err := bosh.New(c.Config)
+	if err != nil {
+		return err
+	}
+
+	errChan := make(chan error, 1)
+
+	for _, service := range services {
+		start := time.Now()
+
+		ui.Say("Deploying %s...", service.Name)
+
+		go func(handle string, serviceManifest string) {
+			errChan <- c.DeployService(service)
+		}(service.Handle, service.Script)
+
+		err = c.report(start, ui, b, service, errChan)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (c *Controller) DeployService(service Service) error {
 	var cmd *exec.Cmd
 
@@ -31,14 +109,4 @@ func (c *Controller) DeployService(service Service) error {
 	cmd.Stderr = logFile
 
 	return cmd.Run()
-}
-
-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"`
-	IsErrand      bool   `yaml:"errand"`
-}
+}