Fix golangci-lint issues

Author: arnested

.golangci.yml

@@ -1,3 +1,5 @@
 linters:
   enable-all: true
-
+  disable:
+    - depguard
+    - exhaustruct

containers.go

@@ -17,29 +17,29 @@ type Container struct {
 type Containers map[string]Container
 
 // Add a container to the list of monitored containers.
-func (c *Containers) Add(id string, new Container) {
+func (c *Containers) Add(containerID string, newContainer Container) {
 	// Is container already in containers?
-	existing, ok := (*c)[id]
+	existing, ok := (*c)[containerID]
 
 	if !ok {
-		(*c)[id] = new
+		(*c)[containerID] = newContainer
 
 		return
 	}
 
 	// This is an old state (we know a newer state). Ignore and
 	// return.
-	if existing.Changed.After(new.Changed) {
+	if existing.Changed.After(newContainer.Changed) {
 		return
 	}
 
 	// Remember the new state.
-	(*c)[id] = new
+	(*c)[containerID] = newContainer
 }
 
 // Healthy if all containers are healthy.
-func (c Containers) Healthy() bool {
-	for _, container := range c {
+func (c *Containers) Healthy() bool {
+	for _, container := range *c {
 		if container.Status != types.Healthy && container.Status != types.NoHealthcheck {
 			return false
 		}
@@ -49,12 +49,12 @@ func (c Containers) Healthy() bool {
 }
 
 // Unhealthy if one of the containers get unhealthy.
-func (c Containers) Unhealthy() error {
-	for _, container := range c {
+func (c *Containers) Unhealthy() error {
+	for _, container := range *c {
 		if container.Status == types.Unhealthy {
 			return fmt.Errorf(
 				"%w: %s",
-				unhealthyError,
+				errUnhealthy,
 				strings.Join(c.UnhealtyContainers(), ", "),
 			)
 		}
@@ -64,10 +64,10 @@ func (c Containers) Unhealthy() error {
 }
 
 // NonHealtyContainers returns a list of container names of containers that are not healthy (yet).
-func (c Containers) NonHealtyContainers() []string {
+func (c *Containers) NonHealtyContainers() []string {
 	var nonHealthy []string
 
-	for _, container := range c {
+	for _, container := range *c {
 		if container.Status != types.Healthy && container.Status != types.NoHealthcheck {
 			nonHealthy = append(nonHealthy, container.Name)
 		}
@@ -77,10 +77,10 @@ func (c Containers) NonHealtyContainers() []string {
 }
 
 // UnhealtyContainers returns a list of container names of containers that are not healthy (yet).
-func (c Containers) UnhealtyContainers() []string {
+func (c *Containers) UnhealtyContainers() []string {
 	var unhealthy []string
 
-	for _, container := range c {
+	for _, container := range *c {
 		if container.Status == types.Unhealthy {
 			unhealthy = append(unhealthy, container.Name)
 		}

event.go

@@ -19,24 +19,24 @@ func (e Error) Error() string {
 }
 
 const (
-	timeoutError   Error = "timeout while waiting for containers to be healthy"
-	unhealthyError Error = "containers are unhealthy"
+	errTimeout   Error = "timeout while waiting for containers to be healthy"
+	errUnhealthy Error = "containers are unhealthy"
 )
 
-func listen(c Containers, since time.Time, timeout time.Duration, failOnUnhealthy bool) (bool, error) {
+func listen(containers Containers, since time.Time, timeout time.Duration, failOnUnhealthy bool) (bool, error) {
 	cli, err := client.NewClientWithOpts(
 		client.FromEnv,
 		client.WithAPIVersionNegotiation(),
 	)
 	if err != nil {
-		return false, err
+		return false, fmt.Errorf("creating Docker client: %w", err)
 	}
 
 	filter := filters.NewArgs()
 	filter.Add("type", "container")
 	filter.Add("event", "health_status")
 
-	for id := range c {
+	for id := range containers {
 		filter.Add("container", id)
 	}
 
@@ -60,21 +60,21 @@ func listen(c Containers, since time.Time, timeout time.Duration, failOnUnhealth
 				Changed: time.Unix(msg.Time, msg.TimeNano),
 			}
 
-			c.Add(msg.ID, container)
+			containers.Add(msg.ID, container)
 
-			if c.Healthy() {
+			if containers.Healthy() {
 				return true, nil
 			}
 
-			if err := c.Unhealthy(); err != nil && failOnUnhealthy {
+			if err := containers.Unhealthy(); err != nil && failOnUnhealthy {
 				return false, err
 			}
 		case <-timeoutChan:
 			return false, fmt.Errorf(
 				"%w (%s): %s",
-				timeoutError,
+				errTimeout,
 				timeout,
-				strings.Join(c.NonHealtyContainers(), ", "),
+				strings.Join(containers.NonHealtyContainers(), ", "),
 			)
 		}
 	}

main.go

@@ -33,34 +33,34 @@ func main() {
 		fail(err)
 	}
 
-	c := Containers{}
+	containers := Containers{}
 
 	for _, container := range flag.Args() {
 		ID, container, err := containerInfo(container, cli, since)
 		if err != nil {
 			fail(err)
 		}
 
-		c.Add(ID, *container)
+		containers.Add(ID, *container)
 	}
 
-	if c.Healthy() {
+	if containers.Healthy() {
 		os.Exit(0)
 	}
 
-	if err := c.Unhealthy(); err != nil && *failOnUnhealthy {
+	if err := containers.Unhealthy(); err != nil && *failOnUnhealthy {
 		fail(err)
 	}
 
-	if _, err := listen(c, since, *timeout, *failOnUnhealthy); err != nil {
+	if _, err := listen(containers, since, *timeout, *failOnUnhealthy); err != nil {
 		fail(err)
 	}
 }
 
 func containerInfo(containerID string, cli *client.Client, since time.Time) (string, *Container, error) {
 	info, err := cli.ContainerInspect(context.Background(), containerID)
 	if err != nil {
-		return "", nil, err
+		return "", nil, fmt.Errorf("inspecting container: %w", err)
 	}
 
 	state := types.NoHealthcheck
@@ -69,13 +69,13 @@ func containerInfo(containerID string, cli *client.Client, since time.Time) (str
 		state = info.State.Health.Status
 	}
 
-	c := &Container{
+	container := &Container{
 		Status:  state,
 		Changed: since,
 		Name:    strings.TrimLeft(info.Name, "/"),
 	}
 
-	return info.ID, c, nil
+	return info.ID, container, nil
 }
 
 func fail(err error) {