remove data containers from interface, cleanup target parsing

Author: Gabriel Monroy

client/api.go

@@ -2,9 +2,9 @@ package client
 
 // Client interface used to interact with the cluster control plane
 type Client interface {
-	Create(string, bool) error
+	Create(string) error
 	Destroy(string) error
-	Start(string, bool) error
+	Start(string) error
 	Stop(string) error
 	Scale(string, int) error
 	List() error

client/create.go

@@ -3,26 +3,21 @@ package client
 import (
 	"fmt"
 	"os"
-	"regexp"
-	"strconv"
+	"strings"
 
 	"github.com/coreos/fleet/job"
 	"github.com/coreos/fleet/unit"
 )
 
 // Create schedules a new unit for the given component
 // and blocks until the unit is loaded
-func (c *FleetClient) Create(component string, data bool) (err error) {
+func (c *FleetClient) Create(target string) (err error) {
 	var (
 		unitName string
 		unitPtr  *unit.Unit
 	)
 	// create unit
-	if data == true {
-		unitName, unitPtr, err = c.createDataUnit(component)
-	} else {
-		unitName, unitPtr, err = c.createServiceUnit(component)
-	}
+	unitName, unitPtr, err = c.createUnit(target)
 	if err != nil {
 		return err
 	}
@@ -43,35 +38,36 @@ func (c *FleetClient) Create(component string, data bool) (err error) {
 	return nil
 }
 
-// Create normal service unit
-func (c *FleetClient) createServiceUnit(target string) (unitName string, unitPtr *unit.Unit, err error) {
-
-	// see if we were provided a specific target
-	r := regexp.MustCompile(`([a-z-]+)\.([\d]+)`)
-	match := r.FindStringSubmatch(target)
-	var (
-		num int
-		component string
-	)
-	if len(match) == 3 {
-		component = match[1]
-		num, err = strconv.Atoi(match[2])
-		if err != nil {
-			return "", nil, err
-		}
-		unitName, err = formatUnitName(component, num)
+func (c *FleetClient) createUnit(target string) (unitName string, unitPtr *unit.Unit, err error) {
+	component, num, err := splitTarget(target)
+	if err != nil {
+		return
+	}
+	if strings.HasSuffix(component, "-data") {
+		unitName, unitPtr, err = c.createDataUnit(component)
 	} else {
-		component = target
-		num, err := c.nextUnit(component)
-		if err != nil {
-			return "", nil, err
-		}
-		unitName, err = formatUnitName(component, num)
+		unitName, unitPtr, err = c.createServiceUnit(component, num)
+	}
+	if err != nil {
+		return unitName, unitPtr, err
+	}
+	return
+}
+
+// Create normal service unit
+func (c *FleetClient) createServiceUnit(component string, num int) (unitName string, unitPtr *unit.Unit, err error) {
+	// if number wasn't provided get next unit number
+	if num == 0 {
+		num, err = c.nextUnit(component)
 		if err != nil {
 			return "", nil, err
 		}
 	}
-
+	// build a fleet unit
+	unitName, err = formatUnitName(component, num)
+	if err != nil {
+		return "", nil, err
+	}
 	unitPtr, err = NewUnit(component)
 	if err != nil {
 		return

client/destroy.go

@@ -2,38 +2,23 @@ package client
 
 import (
 	"fmt"
-	"regexp"
-	"strconv"
 )
 
-// Destroy unschedules one unit for a given component type
-func (c *FleetClient) Destroy(component string) (err error) {
-
-	// see if we were provided a specific target
-	r := regexp.MustCompile(`([a-z-]+)\.([\d]+)`)
-	match := r.FindStringSubmatch(component)
-	var (
-		num int
-		unitName string
-	)
-	if len(match) == 3 {
-		num, err = strconv.Atoi(match[2])
-		if err != nil {
-			return err
-		}
-		unitName, err = formatUnitName(component, 0)
-	} else {
-		num, err = c.lastUnit(component)
-		if err != nil {
-			return err
-		}
-		unitName, err = formatUnitName(component, num)
-		if err != nil {
-			return err
-		}
+// Destroy units for a given target
+func (c *FleetClient) Destroy(target string) (err error) {
+	component, num, err := splitTarget(target)
+	if err != nil {
+		return
 	}
 	if num == 0 {
-		return fmt.Errorf("no units to destroy")
+			num, err = c.lastUnit(component)
+			if err != nil {
+				return err
+			}
+	}
+	unitName, err := formatUnitName(component, num)
+	if err != nil {
+		return err
 	}
 	_, err = c.Fleet.Job(unitName)
 	if err != nil {

client/list.go

@@ -18,7 +18,7 @@ func init() {
 }
 
 const (
-	defaultListUnitFields = "unit,state,load,active,sub,desc,machine"
+	defaultListUnitFields = "unit,state,load,active,sub,machine"
 )
 
 type jobToField func(j *job.Job, full bool) string

client/scale.go

@@ -11,7 +11,7 @@ func (c *FleetClient) Scale(component string, num int) (err error) {
 			break
 		}
 		if len(components) < num {
-			err := c.Create(component, false)
+			err := c.Create(component)
 			if err != nil {
 				return err
 			}

client/start.go

@@ -3,24 +3,13 @@ package client
 import (
 	"fmt"
 	"os"
-	"regexp"
 
 	"github.com/coreos/fleet/job"
 )
 
 // Start launches target units and blocks until active
-func (c *FleetClient) Start(target string, data bool) (err error) {
-
-	// see if we were provided a specific target
-	r := regexp.MustCompile(`([a-z-]+)\.([\d]+)`)
-	match := r.FindStringSubmatch(target)
-	var component string
-	if len(match) == 3 {
-		component = match[1]
-	} else {
-		component = target
-	}
-	units, err := c.getUnits(component)
+func (c *FleetClient) Start(target string) (err error) {
+	units, err := c.getUnits(target)
 	if err != nil {
 		return
 	}

client/unit.go

@@ -24,6 +24,8 @@ func (c *FleetClient) getUnits(target string) (units []string, err error) {
 	var r *regexp.Regexp
 	if strings.HasSuffix(target, "-data") {
 		r = regexp.MustCompile(`deis\-(` + target + `)\.service`)
+	} else if strings.Contains(target, ".") {
+		r = regexp.MustCompile(`deis\-(` + target + `)\.service`)
 	} else {
 		r = regexp.MustCompile(`deis\-(` + target + `)\.([\d]+)\.service`)
 	}

client/utils.go

@@ -65,22 +65,27 @@ func splitJobName(component string) (c string, num int, err error) {
 	return
 }
 
-func splitComponentTarget(target string) (c string, num int, err error) {
-	r := regexp.MustCompile(`([a-z-]+)\.?([\d]+)?`)
+func splitTarget(target string) (component string, num int, err error) {
+	// see if we were provided a specific target
+	r := regexp.MustCompile(`^([a-z]+)(\-data|\.\d+)?$`)
 	match := r.FindStringSubmatch(target)
-	if len(match) == 0 {
-		err = fmt.Errorf("Could not parse: %v", target)
+	// check for failed match
+	if len(match) != 3 {
+		err = fmt.Errorf("Could not parse target: %v", target)
 		return
 	}
 	if match[2] == "" {
-		return match[1], 0, nil
+		component = match[1]
+		return component, 0, nil
+	} else if match[2] == "-data" {
+		component = match[1] + "-data"
+		return component, 0, nil
 	}
-	c = match[1]
-	num, err = strconv.Atoi(match[2])
+	num, err = strconv.Atoi(match[2][1:])
 	if err != nil {
-		return
+		return "", 0, err
 	}
-	return
+	return match[1], num, err
 }
 
 // randomValue returns a random string from a slice of string

client/utils_test.go

@@ -60,3 +60,30 @@ func TestSplitJobName(t *testing.T) {
 		t.Fatalf("Invalid values: %v %v", c, num)
 	}
 }
+
+func TestSplitTarget(t *testing.T) {
+	c, num, err := splitTarget("router")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c != "router" && num != 0 {
+		t.Fatalf("Invalid split on \"%v\": %v %v", "router", c, num)
+	}
+
+	c, num, err = splitTarget("router.3")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c != "router" || num != 3 {
+		t.Fatalf("Invalid split on \"%v\": %v %v", "router.3", c, num)
+	}
+
+	c, num, err = splitTarget("database-data")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if c != "database-data" || num != 0 {
+		t.Fatalf("Invalid split on \"%v\": %v %v", "database-data", c, num)
+	}
+
+}

cmd/cmd.go

@@ -29,7 +29,7 @@ func Scale(c client.Client, targets []string) error {
 
 func Start(c client.Client, targets []string) error {
 	for _, target := range targets {
-		err := c.Start(target, false)
+		err := c.Start(target)
 		if err != nil {
 			return err
 		}
@@ -71,11 +71,11 @@ func Install(c client.Client, targets []string) error {
 	} else {
 		// otherwise create and start the specific targets
 		for _, target := range targets {
-			err := c.Create(target, false)
+			err := c.Create(target)
 			if err != nil {
 				return err
 			}
-			err = c.Start(target, false)
+			err = c.Start(target)
 			if err != nil {
 				return err
 			}
@@ -94,14 +94,14 @@ func installDataContainers(c client.Client) error {
 	}
 	fmt.Println("Scheduling data containers...")
 	for _, dataContainer := range dataContainers {
-		c.Create(dataContainer, true)
+		c.Create(dataContainer)
 		// if err != nil {
 		// 	return err
 		// }
 	}
 	fmt.Println("Activating data containers...")
 	for _, dataContainer := range dataContainers {
-		c.Start(dataContainer, true)
+		c.Start(dataContainer)
 		// if err != nil {
 		// 	return err
 		// }