Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[linting] Fix go misspell linting errors #990

Merged
merged 1 commit into from
Mar 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (client *APIClient) ContainerRename(ctx context.Context, id string, name st
return err
}

// ContainerRestart restarts a running contianer.
// ContainerRestart restarts a running container.
func (client *APIClient) ContainerRestart(ctx context.Context, id string, timeout string) error {
q := url.Values{}
q.Add("t", timeout)
Expand Down
2 changes: 1 addition & 1 deletion client/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (client *APIClient) SystemInfo(ctx context.Context) (*types.SystemInfo, err
return info, err
}

// RegistryLogin requests a registy server to login.
// RegistryLogin requests a registry server to login.
func (client *APIClient) RegistryLogin(ctx context.Context, auth *types.AuthConfig) (*types.AuthResponse, error) {
resp, err := client.post(ctx, "/auth", nil, auth, nil)
if err != nil || resp.StatusCode == http.StatusUnauthorized {
Expand Down
2 changes: 1 addition & 1 deletion daemon/mgr/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func (mgr *ContainerManager) Remove(ctx context.Context, name string, option *Co
if c.IsRunning() && option.Force {
msg, err := mgr.Client.DestroyContainer(ctx, c.ID(), c.StopTimeout())
if err != nil && !errtypes.IsNotfound(err) {
return errors.Wrapf(err, "failed to destory container: %s", c.ID())
return errors.Wrapf(err, "failed to destroy container: %s", c.ID())
}
if err := mgr.markStoppedAndRelease(c, msg); err != nil {
return errors.Wrapf(err, "failed to mark container: %s stop status", c.ID())
Expand Down
8 changes: 4 additions & 4 deletions daemon/mgr/cri.go
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,8 @@ func (c *CriManager) ImageStatus(ctx context.Context, r *runtime.ImageStatusRequ

imageInfo, err := c.ImageMgr.GetImage(ctx, strings.TrimPrefix(ref.String(), "sha256:"))
if err != nil {
// TODO: seperate ErrImageNotFound with others.
// Now we just return empty if the error occured.
// TODO: separate ErrImageNotFound with others.
// Now we just return empty if the error occurred.
return &runtime.ImageStatusResponse{}, nil
}

Expand Down Expand Up @@ -840,8 +840,8 @@ func (c *CriManager) RemoveImage(ctx context.Context, r *runtime.RemoveImageRequ

imageInfo, err := c.ImageMgr.GetImage(ctx, strings.TrimPrefix(imageRef, "sha256:"))
if err != nil {
// TODO: seperate ErrImageNotFound with others.
// Now we just return empty if the error occured.
// TODO: separate ErrImageNotFound with others.
// Now we just return empty if the error occurred.
return &runtime.RemoveImageResponse{}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion test/cli_network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (suite *PouchNetworkSuite) TestNetworkDefault(c *check.C) {
funcname = tmpname[i]
}

// After pouchd is launched, default netowrk bridge is created
// After pouchd is launched, default network bridge is created
// check the existence of default network: bridge
command.PouchRun("network", "inspect", "bridge").Assert(c, icmd.Success)

Expand Down
2 changes: 1 addition & 1 deletion test/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

// WaitTimeout wait at most timeout nanoseconds,
// until the conditon become true or timeout reached.
// until the condition become true or timeout reached.
func WaitTimeout(timeout time.Duration, condition func() bool) bool {
ch := make(chan bool, 1)

Expand Down