Merge pull request #367 from vdemeester/removing-nonused-err

Remove returned error in ID and IsRunning…

Author: joshwget

docker/container/container.go

@@ -168,9 +168,8 @@ func (c *Container) Kill(ctx context.Context, signal string) error {
 }
 
 // IsRunning returns the running state of the container.
-// FIXME(vdemeester): remove the nil error here
-func (c *Container) IsRunning(ctx context.Context) (bool, error) {
-	return c.container.State.Running, nil
+func (c *Container) IsRunning(ctx context.Context) bool {
+	return c.container.State.Running
 }
 
 // Run creates, start and attach to the container based on the image name,
@@ -292,16 +291,6 @@ func (c *Container) Start(ctx context.Context) error {
 	return nil
 }
 
-// ID returns the container Id.
-func (c *Container) ID() (string, error) {
-	return c.container.ID, nil
-}
-
-// Name returns the container name.
-func (c *Container) Name() string {
-	return c.container.Name
-}
-
 // Restart restarts the container if existing, does nothing otherwise.
 func (c *Container) Restart(ctx context.Context, timeout int) error {
 	timeoutDuration := time.Duration(timeout) * time.Second
@@ -355,6 +344,21 @@ func (c *Container) Networks() (map[string]*network.EndpointSettings, error) {
 	return c.container.NetworkSettings.Networks, nil
 }
 
+// ID returns the container Id.
+func (c *Container) ID() string {
+	return c.container.ID
+}
+
+// ShortID return the container Id in its short form
+func (c *Container) ShortID() string {
+	return c.container.ID[:12]
+}
+
+// Name returns the container name.
+func (c *Container) Name() string {
+	return c.container.Name
+}
+
 // Image returns the container image. Depending on the engine version its either
 // the complete id or the digest reference the image.
 func (c *Container) Image() string {

docker/service/convert.go

@@ -217,10 +217,7 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose
 				}
 				if len(containers) != 0 {
 					container := containers[0]
-					containerID, err := container.ID()
-					if err != nil {
-						return nil, nil, err
-					}
+					containerID := container.ID()
 					networkMode = "container:" + containerID
 				}
 				// FIXME(vdemeester) log/warn in case of len(containers) == 0

docker/service/service.go

@@ -215,8 +215,7 @@ func (s *Service) constructContainers(ctx context.Context, count int) ([]*contai
 			return nil, err
 		}
 
-		// FIXME(vdemeester) use property/method instead
-		id, _ := c.ID()
+		id := c.ID()
 		logrus.Debugf("Created container %s: %v", id, c.Name())
 
 		result = append(result, c)
@@ -363,8 +362,7 @@ func (s *Service) connectContainerToNetworks(ctx context.Context, c *container.C
 				// FIXME(vdemeester) implement alias checking (to not disconnect/reconnect for nothing)
 				aliasPresent := false
 				for _, alias := range existingNetwork.Aliases {
-					// FIXME(vdemeester) use shortID instead of ID
-					ID, _ := c.ID()
+					ID := c.ShortID()
 					if alias == ID {
 						aliasPresent = true
 					}
@@ -386,15 +384,15 @@ func (s *Service) connectContainerToNetworks(ctx context.Context, c *container.C
 
 // NetworkDisconnect disconnects the container from the specified network
 func (s *Service) NetworkDisconnect(ctx context.Context, c *container.Container, net *yaml.Network, oneOff bool) error {
-	containerID, _ := c.ID()
+	containerID := c.ID()
 	client := s.clientFactory.Create(s)
 	return client.NetworkDisconnect(ctx, net.RealName, containerID, true)
 }
 
 // NetworkConnect connects the container to the specified network
 // FIXME(vdemeester) will be refactor with Container refactoring
 func (s *Service) NetworkConnect(ctx context.Context, c *container.Container, net *yaml.Network, oneOff bool) error {
-	containerID, _ := c.ID()
+	containerID := c.ID()
 	client := s.clientFactory.Create(s)
 	internalLinks, err := s.getLinks()
 	if err != nil {
@@ -452,7 +450,7 @@ func (s *Service) recreateIfNeeded(ctx context.Context, c *container.Container,
 
 func (s *Service) recreate(ctx context.Context, c *container.Container) (*container.Container, error) {
 	name := c.Name()
-	id, _ := c.ID()
+	id := c.ID()
 	newName := fmt.Sprintf("%s_%s", name, id[:12])
 	logrus.Debugf("Renaming %s => %s", name, newName)
 	if err := c.Rename(ctx, newName); err != nil {
@@ -464,7 +462,7 @@ func (s *Service) recreate(ctx context.Context, c *container.Container) (*contai
 	if err != nil {
 		return nil, err
 	}
-	newID, _ := newContainer.ID()
+	newID := newContainer.ID()
 	logrus.Debugf("Created replacement container %s", newID)
 	if err := c.Remove(ctx, false); err != nil {
 		logrus.Errorf("Failed to remove old container %s", c.Name())
@@ -549,7 +547,7 @@ func (s *Service) Kill(ctx context.Context, signal string) error {
 // Delete implements Service.Delete. It removes any containers related to the service.
 func (s *Service) Delete(ctx context.Context, options options.Delete) error {
 	return s.collectContainersAndDo(ctx, func(c *container.Container) error {
-		running, _ := c.IsRunning(ctx)
+		running := c.IsRunning(ctx)
 		if !running || options.RemoveRunning {
 			return c.Remove(ctx, options.RemoveVolume)
 		}

docker/service/service_create.go

@@ -155,11 +155,7 @@ func addIpc(config *containertypes.HostConfig, service project.Service, containe
 		return nil, fmt.Errorf("Failed to find container for IPC %v", ipc)
 	}
 
-	id, err := containers[0].ID()
-	if err != nil {
-		return nil, err
-	}
-
+	id := containers[0].ID()
 	config.IpcMode = containertypes.IpcMode("container:" + id)
 	return config, nil
 }
@@ -169,11 +165,7 @@ func addNetNs(config *containertypes.HostConfig, service project.Service, contai
 		return nil, fmt.Errorf("Failed to find container for networks ns %v", networkMode)
 	}
 
-	id, err := containers[0].ID()
-	if err != nil {
-		return nil, err
-	}
-
+	id := containers[0].ID()
 	config.NetworkMode = containertypes.NetworkMode("container:" + id)
 	return config, nil
 }

project/container.go

@@ -6,8 +6,8 @@ import (
 
 // Container defines what a libcompose container provides.
 type Container interface {
-	ID() (string, error)
+	ID() string
 	Name() string
 	Port(ctx context.Context, port string) (string, error)
-	IsRunning(ctx context.Context) (bool, error)
+	IsRunning(ctx context.Context) bool
 }

project/project_containers.go

@@ -5,7 +5,6 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/docker/libcompose/project/events"
 )
 
@@ -21,10 +20,7 @@ func (p *Project) Containers(ctx context.Context, filter Filter, services ...str
 			}
 
 			for _, container := range serviceContainers {
-				running, innerErr := container.IsRunning(ctx)
-				if innerErr != nil {
-					log.Error(innerErr)
-				}
+				running := container.IsRunning(ctx)
 				switch filter.State {
 				case Running:
 					if !running {
@@ -40,10 +36,7 @@ func (p *Project) Containers(ctx context.Context, filter Filter, services ...str
 					// Invalid state filter
 					return fmt.Errorf("Invalid container filter: %s", filter.State)
 				}
-				containerID, innerErr := container.ID()
-				if innerErr != nil {
-					log.Error(innerErr)
-				}
+				containerID := container.ID()
 				containers = append(containers, containerID)
 			}
 			return nil