refactor(*): update to new fleet 0.7 branch

Author: Gabriel Monroy

client/api.go

@@ -7,7 +7,8 @@ type Client interface {
 	Start(string) error
 	Stop(string) error
 	Scale(string, int) error
-	List() error
+	ListUnits() error
+	ListUnitFiles() error
 	Status(string) error
 	Journal(string) error
 }

client/create.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/coreos/fleet/job"
+	"github.com/coreos/fleet/schema"
 	"github.com/coreos/fleet/unit"
 )
 
@@ -13,48 +14,53 @@ import (
 func (c *FleetClient) Create(target string) (err error) {
 	var (
 		unitName string
-		unitPtr  *unit.Unit
+		unitFile *unit.UnitFile
 	)
 	// create unit
-	unitName, unitPtr, err = c.createUnit(target)
+	unitName, unitFile, err = c.createUnit(target)
 	if err != nil {
 		return err
 	}
-	// schedule job
-	j := job.NewJob(unitName, *unitPtr)
-	if err := c.Fleet.CreateJob(j); err != nil {
+	//
+	u := &schema.Unit{
+		Name:    unitName,
+		Options: schema.MapUnitFileToSchemaUnitOptions(unitFile),
+	}
+	// schedule unit
+	if err := c.Fleet.CreateUnit(u); err != nil {
 		return fmt.Errorf("failed creating job %s: %v", unitName, err)
 	}
-	newState := job.JobStateLoaded
-	err = c.Fleet.SetJobTargetState(unitName, newState)
+	desiredState := string(job.JobStateLoaded)
+	err = c.Fleet.SetUnitTargetState(unitName, desiredState)
 	if err != nil {
 		return err
 	}
-	err = waitForJobStates([]string{unitName}, jobStateLoaded)
+	outchan, errchan := waitForUnitStates([]string{unitName}, desiredState)
+	err = printUnitState(unitName, outchan, errchan)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (c *FleetClient) createUnit(target string) (unitName string, unitPtr *unit.Unit, err error) {
+func (c *FleetClient) createUnit(target string) (unitName string, uf *unit.UnitFile, err error) {
 	component, num, err := splitTarget(target)
 	if err != nil {
 		return
 	}
 	if strings.HasSuffix(component, "-data") {
-		unitName, unitPtr, err = c.createDataUnit(component)
+		unitName, uf, err = c.createDataUnit(component)
 	} else {
-		unitName, unitPtr, err = c.createServiceUnit(component, num)
+		unitName, uf, err = c.createServiceUnit(component, num)
 	}
 	if err != nil {
-		return unitName, unitPtr, err
+		return unitName, uf, err
 	}
 	return
 }
 
 // Create normal service unit
-func (c *FleetClient) createServiceUnit(component string, num int) (unitName string, unitPtr *unit.Unit, err error) {
+func (c *FleetClient) createServiceUnit(component string, num int) (name string, uf *unit.UnitFile, err error) {
 	// if number wasn't provided get next unit number
 	if num == 0 {
 		num, err = c.nextUnit(component)
@@ -63,31 +69,31 @@ func (c *FleetClient) createServiceUnit(component string, num int) (unitName str
 		}
 	}
 	// build a fleet unit
-	unitName, err = formatUnitName(component, num)
+	name, err = formatUnitName(component, num)
 	if err != nil {
 		return "", nil, err
 	}
-	unitPtr, err = NewUnit(component)
+	uf, err = NewUnit(component)
 	if err != nil {
 		return
 	}
-	return unitName, unitPtr, nil
+	return name, uf, nil
 }
 
 // Create data container unit
-func (c *FleetClient) createDataUnit(component string) (unitName string, unitPtr *unit.Unit, err error) {
-	unitName, err = formatUnitName(component, 0)
+func (c *FleetClient) createDataUnit(component string) (name string, uf *unit.UnitFile, err error) {
+	name, err = formatUnitName(component, 0)
 	if err != nil {
 		return
 	}
 	machineID, err := randomMachineID(c)
 	if err != nil {
 		return
 	}
-	unitPtr, err = NewDataUnit(component, machineID)
+	uf, err = NewDataUnit(component, machineID)
 	if err != nil {
 		return
 	}
-	return unitName, unitPtr, nil
+	return name, uf, nil
 
 }

client/destroy.go

@@ -20,11 +20,11 @@ func (c *FleetClient) Destroy(target string) (err error) {
 	if err != nil {
 		return err
 	}
-	_, err = c.Fleet.Job(unitName)
+	_, err = c.Fleet.Unit(unitName)
 	if err != nil {
 		return
 	}
-	if err = c.Fleet.DestroyJob(unitName); err != nil {
+	if err = c.Fleet.DestroyUnit(unitName); err != nil {
 		return fmt.Errorf("failed destroying job %s: %v", unitName, err)
 	}
 	fmt.Printf("Destroyed Unit %s\n", unitName)

client/journal.go

@@ -18,21 +18,21 @@ func (c *FleetClient) Journal(target string) (err error) {
 }
 
 // runJournal tails the systemd journal for a given unit
-func runJournal(jobName string) (exit int) {
+func runJournal(name string) (exit int) {
 
-	j, err := cAPI.Job(jobName)
+	u, err := cAPI.Unit(name)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error retrieving Job %s: %v", jobName, err)
+		fmt.Fprintf(os.Stderr, "Error retrieving Unit %s: %v", name, err)
 		return 1
 	}
-	if j == nil {
-		fmt.Fprintf(os.Stderr, "Job %s does not exist.\n", jobName)
+	if u == nil {
+		fmt.Fprintf(os.Stderr, "Unit %s does not exist.\n", name)
 		return 1
-	} else if j.UnitState == nil {
-		fmt.Fprintf(os.Stderr, "Job %s does not appear to be running.\n", jobName)
+	} else if u.CurrentState == "" {
+		fmt.Fprintf(os.Stderr, "Unit %s does not appear to be running.\n", name)
 		return 1
 	}
 
-	command := fmt.Sprintf("journalctl --unit %s --no-pager -n 40 -f", jobName)
-	return runCommand(command, j.UnitState.MachineID)
+	command := fmt.Sprintf("journalctl --unit %s --no-pager -n 40 -f", name)
+	return runCommand(command, u.MachineID)
 }