Merge pull request #478 from mesg-foundation/feature/core-name-config…

…uration

Multiple core runnable

config/config.go

@@ -38,6 +38,7 @@ type Config struct {
 
 	Core struct {
 		Image string
+		Name  string
 		Path  string
 	}
 
@@ -62,6 +63,7 @@ func New() (*Config, error) {
 	c.Log.Format = "text"
 	c.Log.Level = "info"
 	c.Core.Image = "mesg/core:" + strings.Split(version.Version, " ")[0]
+	c.Core.Name = "core"
 	c.Core.Path = filepath.Join(home, ".mesg")
 	c.Docker.Core.Path = "/mesg"
 	c.Docker.Socket = "/var/run/docker.sock"
@@ -117,8 +119,10 @@ func (c *Config) Validate() error {
 // DaemonEnv returns the needed environmental variable for the Daemon.
 func (c *Config) DaemonEnv() map[string]string {
 	return map[string]string{
-		"MESG_LOG_FORMAT": c.Log.Format,
-		"MESG_LOG_LEVEL":  c.Log.Level,
-		"MESG_CORE_PATH":  c.Docker.Core.Path,
+		"MESG_SERVER_ADDRESS": c.Server.Address,
+		"MESG_LOG_FORMAT":     c.Log.Format,
+		"MESG_LOG_LEVEL":      c.Log.Level,
+		"MESG_CORE_NAME":      c.Core.Name,
+		"MESG_CORE_PATH":      c.Docker.Core.Path,
 	}
 }

config/config_test.go

@@ -19,6 +19,7 @@ func TestDefaultValue(t *testing.T) {
 	require.Equal(t, "text", c.Log.Format)
 	require.Equal(t, "info", c.Log.Level)
 	require.Equal(t, filepath.Join(home, ".mesg"), c.Core.Path)
+	require.Equal(t, "core", c.Core.Name)
 	require.Equal(t, "/mesg", c.Docker.Core.Path)
 	require.Equal(t, "/var/run/docker.sock", c.Docker.Socket)
 	require.True(t, strings.HasPrefix(c.Core.Image, "mesg/core:"))
@@ -77,6 +78,9 @@ func TestValidate(t *testing.T) {
 func TestDaemonEnv(t *testing.T) {
 	c, _ := New()
 	env := c.DaemonEnv()
-	require.Equal(t, c.Log.Format, env["MESG_LOG_FORMAT"])
+	require.Equal(t, c.Server.Address, env["MESG_SERVER_ADDRESS"])
 	require.Equal(t, c.Log.Level, env["MESG_LOG_LEVEL"])
+	require.Equal(t, c.Log.Format, env["MESG_LOG_FORMAT"])
+	require.Equal(t, c.Core.Name, env["MESG_CORE_NAME"])
+	require.Equal(t, c.Docker.Core.Path, env["MESG_CORE_PATH"])
 }

container/container.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 	docker "github.com/docker/docker/client"
+	"github.com/mesg-foundation/core/config"
 )
 
 // Container provides high level interactions with Docker API for MESG.
@@ -17,6 +18,8 @@ type Container struct {
 
 	// callTimeout is the timeout value for Docker API calls.
 	callTimeout time.Duration
+
+	config *config.Config
 }
 
 // Option is a configuration func for Container.
@@ -31,6 +34,11 @@ func New(options ...Option) (*Container, error) {
 		option(c)
 	}
 	var err error
+	cfg, err := config.Global()
+	if err != nil {
+		return nil, err
+	}
+	c.config = cfg
 	if c.client == nil {
 		c.client, err = docker.NewEnvClient()
 		if err != nil {
@@ -89,7 +97,7 @@ func (c *Container) FindContainer(namespace []string) (types.ContainerJSON, erro
 	containers, err := c.client.ContainerList(ctx, types.ContainerListOptions{
 		Filters: filters.NewArgs(filters.KeyValuePair{
 			Key:   "label",
-			Value: "com.docker.stack.namespace=" + Namespace(namespace),
+			Value: "com.docker.stack.namespace=" + c.Namespace(namespace),
 		}),
 		Limit: 1,
 	})

container/container_test.go

@@ -8,13 +8,15 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/swarm"
 
+	"github.com/mesg-foundation/core/config"
 	"github.com/mesg-foundation/core/container/dockertest"
 	"github.com/stretchr/testify/require"
 )
 
 func TestNew(t *testing.T) {
 	dt := dockertest.New()
 	c, err := New(ClientOption(dt.Client()))
+	cfg, _ := config.Global()
 	require.Nil(t, err)
 	require.NotNil(t, c)
 
@@ -33,7 +35,7 @@ func TestNew(t *testing.T) {
 	require.Equal(t, "0.0.0.0:2377", (<-dt.LastSwarmInit()).Request.ListenAddr)
 
 	ln := <-dt.LastNetworkCreate()
-	require.Equal(t, "mesg-shared", ln.Name)
+	require.Equal(t, cfg.Core.Name, ln.Name)
 	require.Equal(t, types.NetworkCreate{
 		CheckDuplicate: true,
 		Driver:         "overlay",
@@ -72,7 +74,7 @@ func TestFindContainerNonExistent(t *testing.T) {
 	require.Equal(t, types.ContainerListOptions{
 		Filters: filters.NewArgs(filters.KeyValuePair{
 			Key:   "label",
-			Value: "com.docker.stack.namespace=" + Namespace(namespace),
+			Value: "com.docker.stack.namespace=" + c.Namespace(namespace),
 		}),
 		Limit: 1,
 	}, (<-dt.LastContainerList()).Options)
@@ -103,7 +105,7 @@ func TestFindContainer(t *testing.T) {
 	require.Equal(t, types.ContainerListOptions{
 		Filters: filters.NewArgs(filters.KeyValuePair{
 			Key:   "label",
-			Value: "com.docker.stack.namespace=" + Namespace(namespace),
+			Value: "com.docker.stack.namespace=" + c.Namespace(namespace),
 		}),
 		Limit: 1,
 	}, (<-dt.LastContainerList()).Options)
@@ -125,7 +127,7 @@ func TestNonExistentContainerStatus(t *testing.T) {
 	require.Equal(t, STOPPED, status)
 
 	resp := <-dt.LastServiceInspectWithRaw()
-	require.Equal(t, Namespace(namespace), resp.ServiceID)
+	require.Equal(t, c.Namespace(namespace), resp.ServiceID)
 	require.Equal(t, types.ServiceInspectOptions{false}, resp.Options)
 }
 

container/namespace.go

@@ -4,14 +4,11 @@ import (
 	"strings"
 )
 
-const (
-	namespacePrefix    string = "mesg"
-	namespaceSeparator string = "-"
-)
+const namespaceSeparator string = "-"
 
 // Namespace creates a namespace from a list of string.
-func Namespace(ss []string) string {
-	ssWithPrefix := append([]string{namespacePrefix}, ss...)
+func (c *Container) Namespace(ss []string) string {
+	ssWithPrefix := append([]string{c.config.Core.Name}, ss...)
 	namespace := strings.Join(ssWithPrefix, namespaceSeparator)
 	namespace = strings.Replace(namespace, " ", namespaceSeparator, -1)
 	return namespace

container/namespace_test.go

@@ -4,15 +4,20 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/mesg-foundation/core/config"
 	"github.com/stretchr/testify/require"
 )
 
 func TestNamespace(t *testing.T) {
-	namespace := Namespace([]string{"test"})
-	require.Equal(t, namespace, strings.Join([]string{namespacePrefix, "test"}, namespaceSeparator))
+	cfg, _ := config.Global()
+	c, _ := New()
+	namespace := c.Namespace([]string{"test"})
+	require.Equal(t, namespace, strings.Join([]string{cfg.Core.Name, "test"}, namespaceSeparator))
 }
 
 func TestNamespaceReplaceSpace(t *testing.T) {
-	namespace := Namespace([]string{"test foo"})
-	require.Equal(t, namespace, strings.Join([]string{namespacePrefix, "test-foo"}, namespaceSeparator))
+	cfg, _ := config.Global()
+	c, _ := New()
+	namespace := c.Namespace([]string{"test foo"})
+	require.Equal(t, namespace, strings.Join([]string{cfg.Core.Name, "test-foo"}, namespaceSeparator))
 }

container/network.go

@@ -17,7 +17,7 @@ func (c *Container) CreateNetwork(namespace []string) (id string, err error) {
 	if network.ID != "" {
 		return network.ID, nil
 	}
-	namespaceFlat := Namespace(namespace)
+	namespaceFlat := c.Namespace(namespace)
 	ctx, cancel := context.WithTimeout(context.Background(), c.callTimeout)
 	defer cancel()
 	response, err := c.client.NetworkCreate(ctx, namespaceFlat, types.NetworkCreate{
@@ -69,5 +69,5 @@ func (c *Container) DeleteNetwork(namespace []string) error {
 func (c *Container) FindNetwork(namespace []string) (types.NetworkResource, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), c.callTimeout)
 	defer cancel()
-	return c.client.NetworkInspect(ctx, Namespace(namespace), types.NetworkInspectOptions{})
+	return c.client.NetworkInspect(ctx, c.Namespace(namespace), types.NetworkInspectOptions{})
 }

container/network_test.go

@@ -29,12 +29,12 @@ func TestCreateNetwork(t *testing.T) {
 	require.Equal(t, id, networkID)
 
 	li := <-dt.LastNetworkCreate()
-	require.Equal(t, Namespace(namespace), li.Name)
+	require.Equal(t, c.Namespace(namespace), li.Name)
 	require.Equal(t, types.NetworkCreate{
 		CheckDuplicate: true,
 		Driver:         "overlay",
 		Labels: map[string]string{
-			"com.docker.stack.namespace": Namespace(namespace),
+			"com.docker.stack.namespace": c.Namespace(namespace),
 		},
 	}, li.Options)
 }
@@ -57,7 +57,7 @@ func TestCreateAlreadyExistingNetwork(t *testing.T) {
 	require.Equal(t, id, networkID)
 
 	li := <-dt.LastNetworkInspect()
-	require.Equal(t, Namespace(namespace), li.Network)
+	require.Equal(t, c.Namespace(namespace), li.Network)
 	require.Equal(t, types.NetworkInspectOptions{}, li.Options)
 
 	select {
@@ -88,7 +88,7 @@ func TestDeleteNetwork(t *testing.T) {
 	require.Nil(t, c.DeleteNetwork(namespace))
 
 	li := <-dt.LastNetworkInspect()
-	require.Equal(t, Namespace(namespace), li.Network)
+	require.Equal(t, c.Namespace(namespace), li.Network)
 	require.Equal(t, types.NetworkInspectOptions{}, li.Options)
 
 	require.Equal(t, id, (<-dt.LastNetworkRemove()).Network)
@@ -150,7 +150,7 @@ func TestFindNetwork(t *testing.T) {
 	require.Equal(t, id, network.ID)
 
 	li := <-dt.LastNetworkInspect()
-	require.Equal(t, Namespace(namespace), li.Network)
+	require.Equal(t, c.Namespace(namespace), li.Network)
 	require.Equal(t, types.NetworkInspectOptions{}, li.Options)
 }
 

container/service.go

@@ -12,30 +12,34 @@ import (
 )
 
 // ListServices returns existing docker services matching a specific label name.
-func (c *Container) ListServices(label string) ([]swarm.Service, error) {
+func (c *Container) ListServices(labels ...string) ([]swarm.Service, error) {
+	args := make([]filters.KeyValuePair, 0)
+	for _, label := range labels {
+		args = append(args, filters.KeyValuePair{
+			Key:   "label",
+			Value: label,
+		})
+	}
 	ctx, cancel := context.WithTimeout(context.Background(), c.callTimeout)
 	defer cancel()
 	return c.client.ServiceList(ctx, types.ServiceListOptions{
-		Filters: filters.NewArgs(filters.KeyValuePair{
-			Key:   "label",
-			Value: label,
-		}),
+		Filters: filters.NewArgs(args...),
 	})
 }
 
 // FindService returns the Docker Service or an error if not found.
 func (c *Container) FindService(namespace []string) (swarm.Service, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), c.callTimeout)
 	defer cancel()
-	service, _, err := c.client.ServiceInspectWithRaw(ctx, Namespace(namespace),
+	service, _, err := c.client.ServiceInspectWithRaw(ctx, c.Namespace(namespace),
 		types.ServiceInspectOptions{},
 	)
 	return service, err
 }
 
 // StartService starts a docker service.
 func (c *Container) StartService(options ServiceOptions) (serviceID string, err error) {
-	service := options.toSwarmServiceSpec()
+	service := options.toSwarmServiceSpec(c)
 	ctx, cancel := context.WithTimeout(context.Background(), c.callTimeout)
 	defer cancel()
 	response, err := c.client.ServiceCreate(ctx, service, types.ServiceCreateOptions{})
@@ -53,7 +57,7 @@ func (c *Container) StopService(namespace []string) (err error) {
 	if err != nil {
 		return err
 	}
-	if err := c.client.ServiceRemove(ctx, Namespace(namespace)); err != nil && !docker.IsErrNotFound(err) {
+	if err := c.client.ServiceRemove(ctx, c.Namespace(namespace)); err != nil && !docker.IsErrNotFound(err) {
 		return err
 	}
 	timeout := 1 * time.Second
@@ -68,7 +72,7 @@ func (c *Container) StopService(namespace []string) (err error) {
 
 // ServiceLogs returns the logs of a service.
 func (c *Container) ServiceLogs(namespace []string) (io.ReadCloser, error) {
-	return c.client.ServiceLogs(context.Background(), Namespace(namespace),
+	return c.client.ServiceLogs(context.Background(), c.Namespace(namespace),
 		types.ContainerLogsOptions{
 			ShowStdout: true,
 			ShowStderr: true,

container/service_options.go

@@ -33,8 +33,8 @@ type Mount struct {
 	Bind   bool
 }
 
-func (options *ServiceOptions) toSwarmServiceSpec() swarm.ServiceSpec {
-	namespace := Namespace(options.Namespace)
+func (options *ServiceOptions) toSwarmServiceSpec(c *Container) swarm.ServiceSpec {
+	namespace := c.Namespace(options.Namespace)
 	return swarm.ServiceSpec{
 		Annotations: swarm.Annotations{
 			Name: namespace,

container/service_options_test.go

@@ -11,8 +11,9 @@ func TestServiceOptionNamespace(t *testing.T) {
 	options := &ServiceOptions{
 		Namespace: namespace,
 	}
-	expectedNamespace := Namespace(namespace)
-	service := options.toSwarmServiceSpec()
+	c, _ := New()
+	expectedNamespace := c.Namespace(namespace)
+	service := options.toSwarmServiceSpec(c)
 	require.Equal(t, expectedNamespace, service.Annotations.Name)
 	require.Equal(t, expectedNamespace, service.Annotations.Labels["com.docker.stack.namespace"])
 	require.Equal(t, expectedNamespace, service.TaskTemplate.ContainerSpec.Labels["com.docker.stack.namespace"])
@@ -23,7 +24,8 @@ func TestServiceOptionImage(t *testing.T) {
 	options := &ServiceOptions{
 		Image: image,
 	}
-	service := options.toSwarmServiceSpec()
+	c, _ := New()
+	service := options.toSwarmServiceSpec(c)
 	require.Equal(t, image, service.Annotations.Labels["com.docker.stack.image"])
 	require.Equal(t, image, service.TaskTemplate.ContainerSpec.Image)
 }
@@ -52,7 +54,8 @@ func TestServiceOptionLabels(t *testing.T) {
 			"label2": "bar",
 		},
 	}
-	service := options.toSwarmServiceSpec()
+	c, _ := New()
+	service := options.toSwarmServiceSpec(c)
 	require.Equal(t, "foo", service.Annotations.Labels["label1"])
 	require.Equal(t, "bar", service.Annotations.Labels["label2"])
 }
@@ -97,7 +100,8 @@ func TestServiceOptionEnv(t *testing.T) {
 	options := &ServiceOptions{
 		Env: []string{"env1", "env2"},
 	}
-	service := options.toSwarmServiceSpec()
+	c, _ := New()
+	service := options.toSwarmServiceSpec(c)
 	env := service.TaskTemplate.ContainerSpec.Env
 	require.Equal(t, 2, len(env))
 	require.Equal(t, "env1", env[0])