refactor: remove always-nil error returns from internal functions

Author: G-Rath

binary/cli/cli.go

@@ -462,10 +462,7 @@ func multiStringToList(arg []string) []string {
 
 func (f *Flags) scanRoots() ([]*scalibrfs.ScanRoot, error) {
 	if f.RemoteImage != "" {
-		imageOptions, err := f.scanRemoteImageOptions()
-		if err != nil {
-			return nil, err
-		}
+		imageOptions := f.scanRemoteImageOptions()
 		fs, err := scalibrimage.NewFromRemoteName(f.RemoteImage, *imageOptions...)
 		if err != nil {
 			return nil, err
@@ -491,7 +488,7 @@ func (f *Flags) scanRoots() ([]*scalibrfs.ScanRoot, error) {
 	return scanRoots, nil
 }
 
-func (f *Flags) scanRemoteImageOptions() (*[]remote.Option, error) {
+func (f *Flags) scanRemoteImageOptions() *[]remote.Option {
 	imageOptions := []remote.Option{
 		remote.WithAuthFromKeychain(authn.DefaultKeychain),
 	}
@@ -504,7 +501,7 @@ func (f *Flags) scanRemoteImageOptions() (*[]remote.Option, error) {
 			},
 		))
 	}
-	return &imageOptions, nil
+	return &imageOptions
 }
 
 // All capabilities are enabled when running SCALIBR as a binary.

binary/proto/proto.go

@@ -166,10 +166,7 @@ func ScanResultToProto(r *scalibr.ScanResult) (*spb.ScanResult, error) {
 
 	inventories := make([]*spb.Inventory, 0, len(r.Inventories))
 	for _, i := range r.Inventories {
-		p, err := inventoryToProto(i)
-		if err != nil {
-			return nil, err
-		}
+		p := inventoryToProto(i)
 		inventories = append(inventories, p)
 	}
 
@@ -216,9 +213,9 @@ func pluginStatusToProto(s *plugin.Status) *spb.PluginStatus {
 	}
 }
 
-func inventoryToProto(i *extractor.Inventory) (*spb.Inventory, error) {
+func inventoryToProto(i *extractor.Inventory) *spb.Inventory {
 	if i == nil {
-		return nil, nil
+		return nil
 	}
 	p := converter.ToPURL(i)
 	inventoryProto := &spb.Inventory{
@@ -233,7 +230,7 @@ func inventoryToProto(i *extractor.Inventory) (*spb.Inventory, error) {
 		LayerDetails: layerDetailsToProto(i.LayerDetails),
 	}
 	setProtoMetadata(i.Metadata, inventoryProto)
-	return inventoryProto, nil
+	return inventoryProto
 }
 
 func setProtoMetadata(meta any, i *spb.Inventory) {
@@ -614,10 +611,7 @@ func findingToProto(f *detector.Finding) (*spb.Finding, error) {
 	}
 	var target *spb.TargetDetails
 	if f.Target != nil {
-		i, err := inventoryToProto(f.Target.Inventory)
-		if err != nil {
-			return nil, err
-		}
+		i := inventoryToProto(f.Target.Inventory)
 		target = &spb.TargetDetails{
 			Location:  f.Target.Location,
 			Inventory: i,

extractor/filesystem/language/golang/gobinary/gobinary.go

@@ -139,9 +139,9 @@ func (e Extractor) Extract(ctx context.Context, input *filesystem.ScanInput) ([]
 		return []*extractor.Inventory{}, nil
 	}
 
-	inventory, err := e.extractPackagesFromBuildInfo(binfo, input.Path)
-	e.reportFileExtracted(input.Path, input.Info, err)
-	return inventory, err
+	inventory := e.extractPackagesFromBuildInfo(binfo, input.Path)
+	e.reportFileExtracted(input.Path, input.Info, nil)
+	return inventory, nil
 }
 
 func (e Extractor) reportFileExtracted(path string, fileinfo fs.FileInfo, err error) {
@@ -159,7 +159,7 @@ func (e Extractor) reportFileExtracted(path string, fileinfo fs.FileInfo, err er
 	})
 }
 
-func (e *Extractor) extractPackagesFromBuildInfo(binfo *buildinfo.BuildInfo, filename string) ([]*extractor.Inventory, error) {
+func (e *Extractor) extractPackagesFromBuildInfo(binfo *buildinfo.BuildInfo, filename string) []*extractor.Inventory {
 	res := []*extractor.Inventory{}
 
 	validatedGoVers, err := validateGoVersion(binfo.GoVersion)
@@ -190,7 +190,7 @@ func (e *Extractor) extractPackagesFromBuildInfo(binfo *buildinfo.BuildInfo, fil
 		res = append(res, pkg)
 	}
 
-	return res, nil
+	return res
 }
 
 func validateGoVersion(vers string) (string, error) {

extractor/standalone/containers/containerd/containerd_linux.go

@@ -184,11 +184,7 @@ func containersFromAPI(ctx context.Context, client CtrdClient) ([]Metadata, erro
 	for _, ns := range nss {
 		// For each namespace returned by the API, get the containers metadata.
 		ctx := namespaces.WithNamespace(ctx, ns)
-		ctrs, err := containersMetadata(ctx, client, ns, defaultContainerdRootfsPrefix)
-		if err != nil {
-			log.Errorf("Could not get a list of containers from the containerd: %v", err)
-			return nil, err
-		}
+		ctrs := containersMetadata(ctx, client, ns, defaultContainerdRootfsPrefix)
 		// Merge all containers metadata items for all namespaces into a single list.
 		metadata = append(metadata, ctrs...)
 	}
@@ -205,7 +201,7 @@ func namespacesFromAPI(ctx context.Context, client CtrdClient) ([]string, error)
 	return nss, nil
 }
 
-func containersMetadata(ctx context.Context, client CtrdClient, namespace string, defaultAbsoluteToBundlePath string) ([]Metadata, error) {
+func containersMetadata(ctx context.Context, client CtrdClient, namespace string, defaultAbsoluteToBundlePath string) []Metadata {
 	var containersMetadata []Metadata
 
 	taskService := client.TaskService()
@@ -226,7 +222,7 @@ func containersMetadata(ctx context.Context, client CtrdClient, namespace string
 
 		containersMetadata = append(containersMetadata, md)
 	}
-	return containersMetadata, nil
+	return containersMetadata
 }
 
 func taskMetadata(ctx context.Context, client CtrdClient, task *task.Process, namespace string, defaultAbsoluteToBundlePath string) (Metadata, error) {