Add State methods for workload processes.

component/all/process.go

@@ -6,13 +6,15 @@ package all
 import (
 	"github.com/juju/cmd"
 	"github.com/juju/errors"
+	"github.com/juju/names"
 
 	"github.com/juju/juju/apiserver/common"
 	"github.com/juju/juju/process"
 	"github.com/juju/juju/process/api"
 	"github.com/juju/juju/process/api/server"
 	"github.com/juju/juju/process/context"
 	"github.com/juju/juju/process/plugin"
+	procstate "github.com/juju/juju/process/state"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/worker/uniter/runner"
 	"github.com/juju/juju/worker/uniter/runner/jujuc"
@@ -22,6 +24,7 @@ type workloadProcesses struct{}
 
 func (c workloadProcesses) registerForServer() error {
 	c.registerHookContext()
+	c.registerState()
 	return nil
 }
 
@@ -111,3 +114,13 @@ func (workloadProcesses) registerHookContextCommands() {
 		return cmd
 	})
 }
+
+func (c workloadProcesses) registerState() {
+	newUnitProcesses := func(persist state.Persistence, unit names.UnitTag, charm names.CharmTag) (state.UnitProcesses, error) {
+		return procstate.NewUnitProcesses(persist, unit, &charm), nil
+	}
+	newProcessDefinitions := func(persist state.Persistence, charm names.CharmTag) (state.ProcessDefinitions, error) {
+		return procstate.NewDefinitions(persist, charm), nil
+	}
+	state.SetProcessesComponent(newUnitProcesses, newProcessDefinitions)
+}

process/api/server/hookcontext.go

@@ -3,6 +3,8 @@
 
 package server
 
+// TODO(ericsnow) Eliminate the apiserver/common import if possible.
+
 import (
 	"github.com/juju/errors"
 	"github.com/juju/loggo"
@@ -59,8 +61,7 @@ func (a HookContextAPI) RegisterProcesses(args api.RegisterProcessesArgs) (api.P
 	for _, apiProc := range args.Processes {
 		info := api.API2Proc(apiProc)
 		res := api.ProcessResult{
-			ID: info.Name + "/" + info.Details.ID,
-			//ID: info.ID(),
+			ID: info.ID(),
 		}
 		if err := st.Register(info); err != nil {
 			res.Error = common.ServerError(errors.Trace(err))
@@ -94,12 +95,7 @@ func (a HookContextAPI) ListProcesses(args api.ListProcessesArgs) (api.ListProce
 
 	if len(ids) == 0 {
 		for _, proc := range procs {
-			id := proc.Name
-			if proc.Details.ID != "" {
-				id += "/" + proc.Details.ID
-			}
-			ids = append(ids, id)
-			//ids = append(ids, info.ID())
+			ids = append(ids, proc.ID())
 		}
 	}
 
@@ -114,8 +110,7 @@ func (a HookContextAPI) ListProcesses(args api.ListProcessesArgs) (api.ListProce
 			if proc.Details.ID != "" {
 				procID += "/" + proc.Details.ID
 			}
-			//if id == proc.ID() {
-			if id == procID {
+			if id == proc.ID() {
 				res.Info = api.Proc2api(proc)
 				found = true
 				break

process/info.go

@@ -4,7 +4,9 @@
 package process
 
 import (
+	"fmt"
 	"reflect"
+	"strings"
 
 	"github.com/juju/errors"
 	"gopkg.in/juju/charm.v5"
@@ -24,6 +26,8 @@ type Info struct {
 	Details Details
 }
 
+// TODO(ericsnow) Eliminate NewInfoUnvalidated.
+
 // NewInfoUnvalidated builds a new Info object with the provided
 // values. The returned Info may be invalid if the given values cause
 // that result. The Validate method can be used to check.
@@ -36,12 +40,36 @@ func NewInfoUnvalidated(name, procType string) *Info {
 	}
 }
 
+// ID composes a unique ID for the process (relative to the unit/charm).
+func (info Info) ID() string {
+	id := info.Process.Name
+	if info.Details.ID != "" {
+		id = fmt.Sprintf("%s/%s", id, info.Details.ID)
+	}
+	return id
+}
+
+// ParseID extracts the process name and details ID from the provided string.
+func ParseID(id string) (string, string) {
+	parts := strings.SplitN(id, "/", 2)
+	if len(parts) == 2 {
+		return parts[0], parts[1]
+	}
+	return id, ""
+}
+
 // Validate checks the process info to ensure it is correct.
 func (info Info) Validate() error {
 	if err := info.Process.Validate(); err != nil {
 		return errors.Trace(err)
 	}
 
+	if !reflect.DeepEqual(info.Details, Details{}) {
+		if err := info.Details.Validate(); err != nil {
+			return errors.Trace(err)
+		}
+	}
+
 	return nil
 }
 

process/info_test.go

@@ -6,6 +6,7 @@ package process_test
 import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	"gopkg.in/juju/charm.v5"
 
 	"github.com/juju/juju/process"
 	"github.com/juju/juju/testing"
@@ -17,30 +18,91 @@ type infoSuite struct {
 
 var _ = gc.Suite(&infoSuite{})
 
+func (s *infoSuite) newInfo(name, procType string) *process.Info {
+	return &process.Info{
+		Process: charm.Process{
+			Name: name,
+			Type: procType,
+		},
+	}
+}
+
+func (s *infoSuite) TestIDFull(c *gc.C) {
+	info := s.newInfo("a-proc", "docker")
+	info.Details.ID = "my-proc"
+	id := info.ID()
+
+	c.Check(id, gc.Equals, "a-proc/my-proc")
+}
+
+func (s *infoSuite) TestIDMissingDetailsID(c *gc.C) {
+	info := s.newInfo("a-proc", "docker")
+	id := info.ID()
+
+	c.Check(id, gc.Equals, "a-proc")
+}
+
+func (s *infoSuite) TestIDNameOnly(c *gc.C) {
+	info := s.newInfo("a-proc", "docker")
+	id := info.ID()
+
+	c.Check(id, gc.Equals, "a-proc")
+}
+
+func (s *infoSuite) TestParseIDFull(c *gc.C) {
+	name, id := process.ParseID("a-proc/my-proc")
+
+	c.Check(name, gc.Equals, "a-proc")
+	c.Check(id, gc.Equals, "my-proc")
+}
+
+func (s *infoSuite) TestParseIDNameOnly(c *gc.C) {
+	name, id := process.ParseID("a-proc")
+
+	c.Check(name, gc.Equals, "a-proc")
+	c.Check(id, gc.Equals, "")
+}
+
+func (s *infoSuite) TestParseIDExtras(c *gc.C) {
+	name, id := process.ParseID("somecharm/0/a-proc/my-proc")
+
+	c.Check(name, gc.Equals, "somecharm")
+	c.Check(id, gc.Equals, "0/a-proc/my-proc")
+}
+
 func (s *infoSuite) TestValidateOkay(c *gc.C) {
-	info := process.NewInfoUnvalidated("a proc", "docker")
+	info := s.newInfo("a proc", "docker")
 	err := info.Validate()
 
 	c.Check(err, jc.ErrorIsNil)
 }
 
 func (s *infoSuite) TestValidateBadMetadata(c *gc.C) {
-	info := process.NewInfoUnvalidated("a proc", "")
+	info := s.newInfo("a proc", "")
 	err := info.Validate()
 
 	c.Check(err, gc.ErrorMatches, ".*type: name is required")
 }
 
+func (s *infoSuite) TestValidateBadDetails(c *gc.C) {
+	info := s.newInfo("a proc", "docker")
+	info.Details.ID = "my-proc"
+	err := info.Validate()
+
+	c.Check(err, gc.ErrorMatches, ".*Label cannot be empty.*")
+}
+
 func (s *infoSuite) TestIsRegisteredTrue(c *gc.C) {
-	info := process.NewInfoUnvalidated("a proc", "docker")
+	info := s.newInfo("a proc", "docker")
 	info.Details.ID = "abc123"
 	info.Details.Status.Label = "running"
 	isRegistered := info.IsRegistered()
+
 	c.Check(isRegistered, jc.IsTrue)
 }
 
 func (s *infoSuite) TestIsRegisteredFalse(c *gc.C) {
-	info := process.NewInfoUnvalidated("a proc", "docker")
+	info := s.newInfo("a proc", "docker")
 	isRegistered := info.IsRegistered()
 
 	c.Check(isRegistered, jc.IsFalse)

process/persistence/base_test.go

@@ -0,0 +1,87 @@
+// Copyright 2015 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package persistence_test
+
+import (
+	"fmt"
+
+	"github.com/juju/names"
+	gitjujutesting "github.com/juju/testing"
+	"github.com/juju/utils"
+	gc "gopkg.in/check.v1"
+	"gopkg.in/juju/charm.v5"
+
+	"github.com/juju/juju/process"
+	"github.com/juju/juju/testing"
+)
+
+type baseProcessesSuite struct {
+	testing.BaseSuite
+
+	stub  *gitjujutesting.Stub
+	charm names.CharmTag
+	unit  names.UnitTag
+}
+
+func (s *baseProcessesSuite) SetUpTest(c *gc.C) {
+	s.BaseSuite.SetUpTest(c)
+
+	s.stub = &gitjujutesting.Stub{}
+	s.charm = names.NewCharmTag("local:series/dummy-1")
+	s.unit = names.NewUnitTag("a-unit/0")
+}
+
+func (s *baseProcessesSuite) setUnit(id string) {
+	if id == "" {
+		s.unit = names.UnitTag{}
+	} else {
+		s.unit = names.NewUnitTag(id)
+	}
+}
+
+func (s *baseProcessesSuite) setCharm(id string) {
+	if id == "" {
+		s.charm = names.CharmTag{}
+	} else {
+		s.charm = names.NewCharmTag(id)
+	}
+}
+
+func (s *baseProcessesSuite) newDefinitions(pType string, names ...string) []charm.Process {
+	var definitions []charm.Process
+	for _, name := range names {
+		definitions = append(definitions, charm.Process{
+			Name: name,
+			Type: pType,
+		})
+	}
+	return definitions
+}
+
+func (s *baseProcessesSuite) newProcesses(pType string, names ...string) []process.Info {
+	var ids []string
+	for i, name := range names {
+		name, id := process.ParseID(name)
+		names[i] = name
+		if id == "" {
+			id = fmt.Sprintf("%s-%s", name, utils.MustNewUUID())
+		}
+		ids = append(ids, id)
+	}
+
+	var processes []process.Info
+	for i, definition := range s.newDefinitions(pType, names...) {
+		id := ids[i]
+		processes = append(processes, process.Info{
+			Process: definition,
+			Details: process.Details{
+				ID: id,
+				Status: process.Status{
+					Label: "running",
+				},
+			},
+		})
+	}
+	return processes
+}