chore: lint and error fix

Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
anchore · Dec 9, 2024 · 1cc2248 · 1cc2248
1 parent 59b3662
commit 1cc2248
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/cmd/syft/internal/options/source.go b/cmd/syft/internal/options/source.go
@@ -5,11 +5,11 @@ import (
 	"sort"
 	"strings"
 
-	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
 	"github.com/dustin/go-humanize"
 	"github.com/scylladb/go-set/strset"
 
 	"github.com/anchore/clio"
+	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
 	"github.com/anchore/syft/syft/source/sourceproviders"
 )
 

diff --git a/syft/format/common/spdxhelpers/to_format_model.go b/syft/format/common/spdxhelpers/to_format_model.go
@@ -630,7 +630,8 @@ func toFiles(s sbom.SBOM) (results []*spdx.File) {
 
 		relativePath, err := convertAbsoluteToRelative(coordinates.RealPath)
 		if err != nil {
-			// TODO:
+			log.Debugf("unable to convert relative path '%s' to absolute path: %s", coordinates.RealPath, err)
+			relativePath = coordinates.RealPath
 		}
 
 		results = append(results, &spdx.File{

diff --git a/syft/format/common/spdxhelpers/to_format_model_test.go b/syft/format/common/spdxhelpers/to_format_model_test.go
@@ -405,10 +405,10 @@ func Test_toFiles(t *testing.T) {
 						Version: "version-1",
 					}),
 					FileMetadata: map[file.Coordinates]file.Metadata{
-						file.Coordinates{
+						{
 							RealPath:     "/some/path",
 							FileSystemID: "",
-						}: file.Metadata{
+						}: {
 							Path: "/some/path",
 						},
 					},

diff --git a/syft/internal/fileresolver/file_indexer.go b/syft/internal/fileresolver/file_indexer.go
@@ -5,11 +5,12 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/wagoodman/go-progress"
+
 	"github.com/anchore/stereoscope/pkg/file"
 	"github.com/anchore/stereoscope/pkg/filetree"
 	"github.com/anchore/syft/internal/log"
 	"github.com/anchore/syft/syft/internal/windows"
-	"github.com/wagoodman/go-progress"
 )
 
 type fileIndexer struct {

diff --git a/syft/internal/fileresolver/file_indexer_test.go b/syft/internal/fileresolver/file_indexer_test.go
@@ -1,13 +1,15 @@
 package fileresolver
 
 import (
-	"github.com/anchore/stereoscope/pkg/file"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"io/fs"
 	"os"
 	"path"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/anchore/stereoscope/pkg/file"
 )
 
 // - Verify that both the parent and the path are indexed

diff --git a/syft/internal/fileresolver/filetree_resolver_test.go b/syft/internal/fileresolver/filetree_resolver_test.go
@@ -14,13 +14,14 @@ import (
 	"testing"
 	"time"
 
-	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
-	"github.com/anchore/syft/syft/file"
 	"github.com/google/go-cmp/cmp"
 	"github.com/scylladb/go-set/strset"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
+
+	stereoscopeFile "github.com/anchore/stereoscope/pkg/file"
+	"github.com/anchore/syft/syft/file"
 )
 
 // Tests for filetree resolver when directory is used for index