chore: fix ineffassign issues

Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>

Author: eunomie

commands/cmd.go

@@ -177,9 +177,7 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 			if err != nil {
 				return err
 			}
-			err = sbom.UploadSbom(sb, workspace, apiKey)
-
-			return nil
+			return sbom.UploadSbom(sb, workspace, apiKey)
 		},
 	}
 	uploadCommandFlags := uploadCommand.Flags()

registry/read.go

@@ -31,6 +31,9 @@ func ReadImage(name string, path string) (*ImageCache, error) {
 		return nil, errors.Wrapf(err, "failed to read manifest index at %s", path)
 	}
 	mani, err := index.IndexManifest()
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to read manifest index at %s", path)
+	}
 	hash := mani.Manifests[0].Digest
 	img, _ := index.Image(hash)
 

sbom/index.go

@@ -42,10 +42,17 @@ type ImageIndexResult struct {
 
 func indexImageAsync(wg *sync.WaitGroup, image string, cli command.Cli, resultChan chan<- ImageIndexResult) {
 	defer wg.Done()
-	sbom, err := IndexImage(image, cli)
-	cves, err := query.ForVulnerabilitiesInGraphQL(sbom)
+	var (
+		sbom *types.Sbom
+		cves *types.VulnerabilitiesByPurls
+		err  error
+	)
+	sbom, err = IndexImage(image, cli)
 	if err == nil {
-		sbom.Vulnerabilities = cves.VulnerabilitiesByPackage
+		cves, err = query.ForVulnerabilitiesInGraphQL(sbom)
+		if err == nil {
+			sbom.Vulnerabilities = cves.VulnerabilitiesByPackage
+		}
 	}
 	resultChan <- ImageIndexResult{
 		Input: image,
@@ -112,9 +119,12 @@ func indexImage(cache *registry.ImageCache, cli command.Cli) (*types.Sbom, error
 	}
 
 	trivyResult.Packages, err = types.NormalizePackages(trivyResult.Packages)
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to normalize packages: %s", cache.Name)
+	}
 	syftResult.Packages, err = types.NormalizePackages(syftResult.Packages)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to normalize packagess: %s", cache.Name)
+		return nil, errors.Wrapf(err, "failed to normalize packages: %s", cache.Name)
 	}
 
 	packages := types.MergePackages(syftResult, trivyResult)