Merge pull request #3730 from mboersma/stricter-deisctl-list

fix(deisctl): hide random "deis-" services from "deisctl list"

Author: mboersma

deisctl/Makefile

@@ -4,7 +4,7 @@ include ../includes.mk
 repo_path = github.com/deis/deis/deisctl
 
 GO_FILES = deisctl.go deisctl_test.go
-GO_PACKAGES = backend client cmd config utils
+GO_PACKAGES = backend client cmd config units utils
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
 COMPONENT = $(notdir $(repo_path))

deisctl/backend/fleet/list_units.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/coreos/fleet/machine"
 	"github.com/coreos/fleet/schema"
+	"github.com/deis/deis/deisctl/units"
 )
 
 // initialize tabwriter on stdout
@@ -82,8 +83,11 @@ func (c *FleetClient) ListUnits() (err error) {
 	}
 
 	for _, us := range unitStates {
-		if strings.HasPrefix(us.Name, "deis-") {
-			states = append(states, us)
+		for _, prefix := range units.Names {
+			if strings.HasPrefix(us.Name, prefix) {
+				states = append(states, us)
+				break
+			}
 		}
 	}
 	printUnits(states)

deisctl/backend/fleet/utils_test.go

@@ -98,7 +98,7 @@ func TestSplitTarget(t *testing.T) {
 type stubFleetClient struct{}
 
 var (
-	units []*schema.Unit
+	testUnits []*schema.Unit
 )
 
 func (c stubFleetClient) Machines() ([]machine.MachineState, error) {
@@ -108,7 +108,7 @@ func (c stubFleetClient) Unit(string) (*schema.Unit, error) {
 	return nil, nil
 }
 func (c stubFleetClient) Units() ([]*schema.Unit, error) {
-	return units, nil
+	return testUnits, nil
 }
 func (c stubFleetClient) UnitStates() ([]*schema.UnitState, error) {
 	return []*schema.UnitState{}, nil
@@ -126,7 +126,7 @@ func (c stubFleetClient) DestroyUnit(string) error {
 var fc stubFleetClient
 
 func TestExpandTargets(t *testing.T) {
-	units = []*schema.Unit{
+	testUnits = []*schema.Unit{
 		&schema.Unit{
 			Name: "deis-router@1.service",
 		},

deisctl/cmd/cmd.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/deis/deis/deisctl/backend"
 	"github.com/deis/deis/deisctl/config"
+	"github.com/deis/deis/deisctl/units"
 	"github.com/deis/deis/deisctl/utils"
 
 	docopt "github.com/docopt/docopt-go"
@@ -564,27 +565,8 @@ Options:
 	// download and save the unit files to the specified path
 	rootURL := "https://raw.githubusercontent.com/deis/deis/"
 	tag := args["--tag"].(string)
-	units := []string{
-		"deis-builder.service",
-		"deis-cache.service",
-		"deis-controller.service",
-		"deis-database.service",
-		"deis-logger.service",
-		"deis-logspout.service",
-		"deis-publisher.service",
-		"deis-registry.service",
-		"deis-router.service",
-		"deis-store-admin.service",
-		"deis-store-daemon.service",
-		"deis-store-gateway.service",
-		"deis-store-metadata.service",
-		"deis-store-monitor.service",
-		"deis-store-volume.service",
-		"deis-swarm-manager.service",
-		"deis-swarm-node.service",
-	}
-	for _, unit := range units {
-		src := rootURL + tag + "/deisctl/units/" + unit
+	for _, unit := range units.Names {
+		src := rootURL + tag + "/deisctl/units/" + unit + ".service"
 		dest := filepath.Join(dir, unit)
 		res, err := http.Get(src)
 		if err != nil {

deisctl/units/units.go

@@ -0,0 +1,22 @@
+package units
+
+// Names are the base names of Deis units. Update this list when adding a new Deis unit file.
+var Names = []string{
+	"deis-builder",
+	"deis-cache",
+	"deis-controller",
+	"deis-database",
+	"deis-logger",
+	"deis-logspout",
+	"deis-publisher",
+	"deis-registry",
+	"deis-router",
+	"deis-store-admin",
+	"deis-store-daemon",
+	"deis-store-gateway",
+	"deis-store-metadata",
+	"deis-store-monitor",
+	"deis-store-volume",
+	"deis-swarm-manager",
+	"deis-swarm-node",
+}