Skip to content

Commit e16e22f

Browse files
fix lint issues
Signed-off-by: Swapnanil Gupta <[email protected]>
1 parent 3a707f9 commit e16e22f

File tree

8 files changed

+12
-15
lines changed

8 files changed

+12
-15
lines changed

api/handlers/container/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
func (h *handler) logs(w http.ResponseWriter, r *http.Request) {
2424
// return early if neither stdout and stderr are set
2525
stdout, stderr := httputils.BoolValue(r, "stdout"), httputils.BoolValue(r, "stderr")
26-
if !(stdout || stderr) {
26+
if !stdout && !stderr {
2727
response.JSON(w, http.StatusBadRequest, response.NewErrorFromMsg(
2828
"you must choose at least one stream"))
2929
return

api/handlers/image/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func (h *handler) pull(w http.ResponseWriter, r *http.Request) {
5757
streamWriter.WriteError(code, err)
5858
return
5959
}
60-
streamWriter.Write([]byte(fmt.Sprintf("Pulled %s:%s\n", name, tag)))
60+
fmt.Fprintf(streamWriter, "Pulled %s:%s\n", name, tag)
6161
}
6262

6363
func handleUnsupportedParams(r *http.Request) []string {

internal/backend/builder.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ func (p platformParser) DefaultSpec() platforms.Platform {
6767
// Licensed under the Apache License, Version 2.0
6868
// NOTICE: https://github.com/containerd/nerdctl/blob/main/NOTICE
6969

70-
// TODO: Make generateBuildctlArgs public in nerdctl library.
71-
// source: https://github.com/containerd/nerdctl/blob/ff9323859a8d7892d8d72380a17b99395ef9a516/pkg/cmd/builder/build.go.
72-
//
7370
//nolint:stylecheck // adding a todo for exposing env in nerdctl library
7471
func (w *NerdctlWrapper) RunBuild(ctx context.Context, client *containerd.Client, options types.BuilderBuildOptions, buildID string) error {
72+
// TODO: Make generateBuildctlArgs public in nerdctl library.
73+
// source: https://github.com/containerd/nerdctl/blob/ff9323859a8d7892d8d72380a17b99395ef9a516/pkg/cmd/builder/build.go.
7574
buildctlBinary, buildctlArgs, needsLoading, metaFile, tags, cleanup, err := generateBuildctlArgs(ctx, client, options)
7675
if err != nil {
7776
return err
@@ -85,7 +84,7 @@ func (w *NerdctlWrapper) RunBuild(ctx context.Context, client *containerd.Client
8584
buildctlCmd := exec.Command(buildctlBinary, buildctlArgs...)
8685
buildctlCmd.Env = os.Environ()
8786
buildctlCmd.Env = append(buildctlCmd.Env, fmt.Sprintf("FINCH_BUILD_ID=%s", buildID))
88-
buildctlCmd.Env = append(buildctlCmd.Env, fmt.Sprintf("FINCH_CREDENTIAL_SOCKET=%s",config.GetCredentialAddr()))
87+
buildctlCmd.Env = append(buildctlCmd.Env, fmt.Sprintf("FINCH_CREDENTIAL_SOCKET=%s", config.GetCredentialAddr()))
8988

9089
var buildctlStdout io.Reader
9190
if needsLoading {

internal/service/builder/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *service) Build(ctx context.Context, options *ncTypes.BuilderBuildOption
6262
return nil, err
6363
}
6464
result = append(result, types.BuildResult{ID: tagEvent.ID})
65-
options.Stdout.Write([]byte(fmt.Sprintf("Successfully built %s\n", tagEvent.ID)))
65+
fmt.Fprintf(options.Stdout, "Successfully built %s\n", tagEvent.ID)
6666
}
6767
}
6868

internal/service/container/unpause.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (s *service) Unpause(ctx context.Context, cid string, options ncTypes.Conta
2525
status := s.client.GetContainerStatus(ctx, cont)
2626
if status != containerd.Paused {
2727
//nolint:stylecheck // Maintaining Docker-compatible error message format
28-
return errdefs.NewConflict(fmt.Errorf("Container %s is not paused", cid))
28+
return errdefs.NewConflict(fmt.Errorf("container %s is not paused", cid))
2929
}
3030

3131
err = s.nctlContainerSvc.UnpauseContainer(ctx, cid, options)

internal/service/distribution/distribution.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ func (s *service) Inspect(ctx context.Context, name string, ac *dockertypes.Auth
111111
}
112112

113113
var platforms []ocispec.Platform
114-
switch {
115-
case desc.MediaType == ocispec.MediaTypeImageManifest ||
116-
desc.MediaType == containerdimages.MediaTypeDockerSchema2Manifest:
114+
switch desc.MediaType {
115+
case ocispec.MediaTypeImageManifest, containerdimages.MediaTypeDockerSchema2Manifest:
117116
var manifest ocispec.Manifest
118117
if err := json.Unmarshal(res, &manifest); err != nil {
119118
return nil, fmt.Errorf("failed to unmarshal manifest: %w", err)
@@ -145,8 +144,7 @@ func (s *service) Inspect(ctx context.Context, name string, ac *dockertypes.Auth
145144
}
146145

147146
platforms = []ocispec.Platform{image.Platform}
148-
case desc.MediaType == ocispec.MediaTypeImageIndex ||
149-
desc.MediaType == containerdimages.MediaTypeDockerSchema2ManifestList:
147+
case ocispec.MediaTypeImageIndex, containerdimages.MediaTypeDockerSchema2ManifestList:
150148
var index ocispec.Index
151149
if err := json.Unmarshal(res, &index); err != nil {
152150
return nil, fmt.Errorf("failed to unmarshal index: %w", err)

internal/service/image/remove.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func (s *service) Remove(ctx context.Context, name string, force bool) (deleted,
1919
err = errdefs.NewNotFound(fmt.Errorf("no such image: %s", name))
2020
return
2121
}
22-
if matchCount > 1 && !(force && uniqueCount == 1) {
22+
if matchCount > 1 && (!force || uniqueCount != 1) {
2323
err = errdefs.NewConflict(fmt.Errorf(
2424
"unable to delete %s (must be forced) - image is referenced in multiple repositories", name))
2525
return

pkg/utility/imageutility/utility.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ func Canonicalize(name, tag string) (string, error) {
4141
func refNeedsTag(ref reference.Reference) bool {
4242
_, tagged := ref.(reference.Tagged)
4343
_, digested := ref.(reference.Digested)
44-
return !(tagged || digested)
44+
return !tagged && !digested
4545
}

0 commit comments

Comments
 (0)