fix(units): switch to systemd template units

Author: Gabriel Monroy

client/unit.go

@@ -27,7 +27,7 @@ func (c *FleetClient) getUnits(target string) (units []string, err error) {
 	} else if strings.Contains(target, ".") {
 		r = regexp.MustCompile(`deis\-(` + target + `)\.service`)
 	} else {
-		r = regexp.MustCompile(`deis\-(` + target + `)\.([\d]+)\.service`)
+		r = regexp.MustCompile(`deis\-(` + target + `)@([\d]+)\.service`)
 	}
 	for _, j := range jobs {
 		match := r.MatchString(j.Name)
@@ -100,7 +100,7 @@ func formatUnitName(component string, num int) (unitName string, err error) {
 	if num == 0 {
 		return "deis-" + component + ".service", nil
 	} else {
-		return "deis-" + component + "." + strconv.Itoa(num) + ".service", nil
+		return "deis-" + component + "@" + strconv.Itoa(num) + ".service", nil
 	}
 }
 

client/unit_test.go

@@ -7,7 +7,7 @@ func TestFormatUnitName(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if unitName != "deis-router.1.service" {
+	if unitName != "deis-router@1.service" {
 		t.Fatalf("invalid unit name: %v", unitName)
 	}
 

client/utils.go

@@ -51,7 +51,7 @@ func countUnits(units []string) (count []int, err error) {
 }
 
 func splitJobName(component string) (c string, num int, err error) {
-	r := regexp.MustCompile(`deis\-([a-z-]+)\.([\d]+)\.service`)
+	r := regexp.MustCompile(`deis\-([a-z-]+)\@([\d]+)\.service`)
 	match := r.FindStringSubmatch(component)
 	if len(match) == 0 {
 		c, err = "", fmt.Errorf("Could not parse component: %v", component)
@@ -67,7 +67,7 @@ func splitJobName(component string) (c string, num int, err error) {
 
 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+)?$`)
+	r := regexp.MustCompile(`^([a-z]+)(\-data|@\d+)?$`)
 	match := r.FindStringSubmatch(target)
 	// check for failed match
 	if len(match) != 3 {

client/utils_test.go

@@ -12,37 +12,37 @@ func TestNextComponent(t *testing.T) {
 		t.Fatal("Invalid component number")
 	}
 	// test next component
-	num, err = nextUnitNum([]string{"deis-router.1.service"})
+	num, err = nextUnitNum([]string{"deis-router@1.service"})
 	if err != nil {
 		t.Fatal(err)
 	}
 	if num != 2 {
 		t.Fatal("Invalid component number")
 	}
 	// test last component
-	num, err = nextUnitNum([]string{"deis-router.1.service", "deis-router.2.service"})
+	num, err = nextUnitNum([]string{"deis-router@1.service", "deis-router@2.service"})
 	if err != nil {
 		t.Fatal(err)
 	}
 	if num != 3 {
 		t.Fatal("Invalid component number")
 	}
 	// test middle component
-	num, err = nextUnitNum([]string{"deis-router.3.service"})
+	num, err = nextUnitNum([]string{"deis-router@3.service"})
 	if err != nil {
 		t.Fatal(err)
 	}
 	if num != 1 {
 		t.Fatal("Invalid component number")
 	}
-	num, err = nextUnitNum([]string{"deis-router.1.service", "deis-router.3.service"})
+	num, err = nextUnitNum([]string{"deis-router@1.service", "deis-router@3.service"})
 	if err != nil {
 		t.Fatal(err)
 	}
 	if num != 2 {
 		t.Fatalf("Invalid component number: %v", num)
 	}
-	num, err = nextUnitNum([]string{"deis-router.1.service", "deis-router.2.service", "deis-router.3.service"})
+	num, err = nextUnitNum([]string{"deis-router@1.service", "deis-router@2.service", "deis-router@3.service"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -52,7 +52,7 @@ func TestNextComponent(t *testing.T) {
 }
 
 func TestSplitJobName(t *testing.T) {
-	c, num, err := splitJobName("deis-router.1.service")
+	c, num, err := splitJobName("deis-router@1.service")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -70,12 +70,12 @@ func TestSplitTarget(t *testing.T) {
 		t.Fatalf("Invalid split on \"%v\": %v %v", "router", c, num)
 	}
 
-	c, num, err = splitTarget("router.3")
+	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)
+		t.Fatalf("Invalid split on \"%v\": %v %v", "router@3", c, num)
 	}
 
 	c, num, err = splitTarget("database-data")

deisctl.go

@@ -74,7 +74,7 @@ Example Commands:
   deisctl uninstall
   deisctl list
   deisctl scale router=2
-  deisctl start router.2
+  deisctl start router@2
   deisctl stop router builder
   deisctl status controller
 

units/deis-controller.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=deis-controller
-Requires=deis-logger.1.service
-After=deis-logger.1.service
+Requires=deis-logger@1.service
+After=deis-logger@1.service
 
 [Service]
 EnvironmentFile=/etc/environment
@@ -15,4 +15,4 @@ ExecStopPost=/usr/bin/docker stop deis-controller
 WantedBy=multi-user.target
 
 [X-Fleet]
-X-ConditionMachineOf=deis-logger.1.service
+X-ConditionMachineOf=deis-logger@1.service