Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 6d45a08

Browse files
committed
chore: fix errcheck issues
Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>
1 parent 7d2ec59 commit 6d45a08

6 files changed

Lines changed: 19 additions & 10 deletions

File tree

commands/cmd.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func readWorkspace(args []string, cli command.Cli) (string, error) {
254254
} else if v, ok := os.LookupEnv("ATOMIST_WORKSPACE"); v != "" && ok {
255255
workspace = v
256256
} else {
257-
fmt.Fprintf(cli.Out(), "Workspace: ")
257+
_, _ = fmt.Fprintf(cli.Out(), "Workspace: ")
258258

259259
workspace = readInput(cli.In(), cli.Out())
260260
if workspace == "" {
@@ -282,12 +282,12 @@ func readApiKey(apiKeyStdin bool, cli command.Cli) (string, error) {
282282
if err != nil {
283283
return "", err
284284
}
285-
fmt.Fprintf(cli.Out(), "API key: ")
286-
term.DisableEcho(cli.In().FD(), oldState)
285+
_, _ = fmt.Fprintf(cli.Out(), "API key: ")
286+
_ = term.DisableEcho(cli.In().FD(), oldState)
287287

288288
apiKey = readInput(cli.In(), cli.Out())
289-
fmt.Fprint(cli.Out(), "\n")
290-
term.RestoreTerminal(cli.In().FD(), oldState)
289+
_, _ = fmt.Fprint(cli.Out(), "\n")
290+
_ = term.RestoreTerminal(cli.In().FD(), oldState)
291291
if apiKey == "" {
292292
return "", errors.Errorf("Error: API key required")
293293
}
@@ -299,7 +299,7 @@ func readInput(in io.Reader, out io.Writer) string {
299299
reader := bufio.NewReader(in)
300300
line, _, err := reader.ReadLine()
301301
if err != nil {
302-
fmt.Fprintln(out, err.Error())
302+
_, _ = fmt.Fprintln(out, err.Error())
303303
os.Exit(1)
304304
}
305305
return string(line)

internal/spinner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func StartInfoSpinner(text string, isTerminal bool) *Spinner {
6363
func StartSpinner(level string, text string, isTerminal bool) *Spinner {
6464
if isTerminal {
6565
s := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
66-
s.Color("yellow")
66+
_ = s.Color("yellow")
6767

6868
spinner := &Spinner{
6969
level: level,

query/base.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ func ForBaseImageInIndex(digest digest.Digest, workspace string, apiKey string)
136136
func ForBaseImageWithoutCve(cve string, name string, sb *types.Sbom, workspace string, apiKey string) (*[]types.Image, error) {
137137
cf := (*sb).Source.Image.Config
138138
resp, err := query(fmt.Sprintf(baseImageCveQuery, cve, name, cf.OS, cf.Architecture, cf.Variant), "base_image_cve_query", workspace, apiKey)
139+
if err != nil {
140+
return nil, errors.Wrapf(err, "failed to query for base image without CVE")
141+
}
139142

140143
var result ImageQueryResult
141144
err = edn.NewDecoder(resp.Body).Decode(&result)
@@ -174,6 +177,9 @@ func ForBaseImageWithoutCve(cve string, name string, sb *types.Sbom, workspace s
174177
// ForBaseImageInDb returns images with matching digest in :docker.image/blob-digest or :docker.image/diff-chain-id
175178
func ForBaseImageInDb(digest digest.Digest, workspace string, apiKey string) (*[]types.Image, error) {
176179
resp, err := query(fmt.Sprintf(baseImageQuery, digest), "base_image_query", workspace, apiKey)
180+
if err != nil {
181+
return nil, errors.Wrapf(err, "failed to query for base image in DB")
182+
}
177183

178184
var result ImageQueryResult
179185
err = edn.NewDecoder(resp.Body).Decode(&result)
@@ -204,6 +210,9 @@ func ForBaseImageInDb(digest digest.Digest, workspace string, apiKey string) (*[
204210

205211
func ForRepositoryInDb(repo string, workspace string, apiKey string) (*types.Repository, error) {
206212
resp, err := query(fmt.Sprintf(repositoryQuery, repo), "repository_query", workspace, apiKey)
213+
if err != nil {
214+
return nil, errors.Wrapf(err, "failed to query for repository in DB")
215+
}
207216

208217
var result RepositoryQueryResult
209218
err = edn.NewDecoder(resp.Body).Decode(&result)

sbom/detect/detect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ var (
110110
)
111111

112112
func readStrings(reader io.ReadCloser, expr *regexp.Regexp) [][]string {
113-
defer reader.Close()
113+
defer reader.Close() //nolint:errcheck
114114
in := bufio.NewReader(reader)
115115
str := make([]rune, 0, max)
116116
filePos := int64(0)

sbom/lsp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func SendFileHashes(image string, tx chan<- string) error {
7272
content, err := res.FileContentsByLocation(source.NewLocation(string(ref.RealPath)))
7373
if err == nil {
7474
b, _ := io.ReadAll(content)
75-
content.Close()
75+
content.Close() //nolint:errcheck
7676
h := sha256.New()
7777
h.Write(b)
7878
hash := fmt.Sprintf("sha256:%x", h.Sum(nil))

sbom/trivy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func trivySbom(cache *registry.ImageCache, lm *types.LayerMapping, resultChan ch
5656
resultChan <- result
5757
return
5858
}
59-
defer cacheClient.Close()
59+
defer cacheClient.Close() //nolint:errcheck
6060

6161
img, err := image.NewArchiveImage(cache.ImagePath)
6262
if err != nil {

0 commit comments

Comments
 (0)