diff --git a/cmd/compose/ps.go b/cmd/compose/ps.go index 9eed19145d..0c29499856 100644 --- a/cmd/compose/ps.go +++ b/cmd/compose/ps.go @@ -140,11 +140,11 @@ SERVICES: } return formatter.Print(containers, opts.Format, os.Stdout, - writter(containers), + writer(containers), "NAME", "COMMAND", "SERVICE", "STATUS", "PORTS") } -func writter(containers []api.ContainerSummary) func(w io.Writer) { +func writer(containers []api.ContainerSummary) func(w io.Writer) { return func(w io.Writer) { for _, container := range containers { ports := displayablePorts(container) diff --git a/pkg/compose/dependencies.go b/pkg/compose/dependencies.go index 2147862b84..ed33ec2b2b 100644 --- a/pkg/compose/dependencies.go +++ b/pkg/compose/dependencies.go @@ -132,7 +132,7 @@ func getParents(v *Vertex) []*Vertex { return v.GetParents() } -// GetParents returns a slice with the parent vertexes of the a Vertex +// GetParents returns a slice with the parent vertices of the a Vertex func (v *Vertex) GetParents() []*Vertex { var res []*Vertex for _, p := range v.Parents { @@ -145,7 +145,7 @@ func getChildren(v *Vertex) []*Vertex { return v.GetChildren() } -// GetChildren returns a slice with the child vertexes of the a Vertex +// GetChildren returns a slice with the child vertices of the a Vertex func (v *Vertex) GetChildren() []*Vertex { var res []*Vertex for _, p := range v.Children { @@ -194,7 +194,7 @@ func (g *Graph) AddVertex(key string, service string, initialStatus ServiceStatu g.Vertices[key] = v } -// AddEdge adds a relationship of dependency between vertexes `source` and `destination` +// AddEdge adds a relationship of dependency between vertices `source` and `destination` func (g *Graph) AddEdge(source string, destination string) error { g.lock.Lock() defer g.lock.Unlock() diff --git a/pkg/e2e/framework.go b/pkg/e2e/framework.go index 2a5880adaf..502f89989f 100644 --- a/pkg/e2e/framework.go +++ b/pkg/e2e/framework.go @@ -347,7 +347,7 @@ func Lines(output string) []string { } // HTTPGetWithRetry performs an HTTP GET on an `endpoint`, using retryDelay also as a request timeout. -// In the case of an error or the response status is not the expeted one, it retries the same request, +// In the case of an error or the response status is not the expected one, it retries the same request, // returning the response body as a string (empty if we could not reach it) func HTTPGetWithRetry(t testing.TB, endpoint string, expectedStatus int, retryDelay time.Duration, timeout time.Duration) string { var (