Skip to content

Commit

Permalink
make format
Browse files Browse the repository at this point in the history
Signed-off-by: Benji Visser <[email protected]>
  • Loading branch information
noqcks committed Aug 8, 2024
1 parent 004f336 commit 19c2b77
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 23 deletions.
3 changes: 1 addition & 2 deletions xeol/distro/distro.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import (
"fmt"
"strings"

hashiVer "github.com/hashicorp/go-version"

"github.com/anchore/syft/syft/linux"
hashiVer "github.com/hashicorp/go-version"
)

// Distro represents a Linux Distribution.
Expand Down
6 changes: 3 additions & 3 deletions xeol/distro/distro_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package distro
import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/anchore/syft/syft/linux"
"github.com/anchore/syft/syft/source"
"github.com/anchore/syft/syft/source/directorysource"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/xeol-io/xeol/internal/stringutil"
)

Expand Down
3 changes: 1 addition & 2 deletions xeol/pkg/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"strings"
"testing"

"github.com/stretchr/testify/assert"

"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/file"
Expand All @@ -15,6 +13,7 @@ import (
syftPkg "github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/testutil"
"github.com/stretchr/testify/assert"
)

func TestNew(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions xeol/pkg/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ import (
"errors"
"fmt"

"github.com/bmatcuk/doublestar/v2"

"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/sbom"
"github.com/bmatcuk/doublestar/v2"
)

var errDoesNotProvide = fmt.Errorf("cannot provide packages from the given source")
Expand Down
3 changes: 1 addition & 2 deletions xeol/pkg/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ package pkg
import (
"testing"

"github.com/stretchr/testify/assert"

"github.com/anchore/stereoscope/pkg/imagetest"
"github.com/anchore/syft/syft"
"github.com/anchore/syft/syft/file"
"github.com/stretchr/testify/assert"
)

func TestProviderLocationExcludes(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions xeol/pkg/purl_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import (
"os"
"strings"

"github.com/mitchellh/go-homedir"

"github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/pkg"
"github.com/mitchellh/go-homedir"
)

const (
Expand Down
1 change: 1 addition & 0 deletions xeol/pkg/syft_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/anchore/syft/syft/sbom"
"github.com/anchore/syft/syft/source"
"github.com/anchore/syft/syft/source/sourceproviders"

"github.com/xeol-io/xeol/internal/log"
)

Expand Down
4 changes: 2 additions & 2 deletions xeol/pkg/syft_sbom_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"os"
"strings"

"github.com/anchore/syft/syft/format"
"github.com/anchore/syft/syft/sbom"
"github.com/gabriel-vasile/mimetype"
"github.com/mitchellh/go-homedir"

"github.com/anchore/syft/syft/format"
"github.com/anchore/syft/syft/sbom"
"github.com/xeol-io/xeol/internal"
"github.com/xeol-io/xeol/internal/log"
)
Expand Down
7 changes: 3 additions & 4 deletions xeol/pkg/syft_sbom_provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ import (
"strings"
"testing"

"github.com/go-test/deep"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/linux"
"github.com/anchore/syft/syft/source"
"github.com/go-test/deep"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestParseSyftJSON(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions xeol/pkg/upstream_package.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ package pkg
import (
"strings"

"github.com/scylladb/go-set/strset"

"github.com/anchore/syft/syft/cpe"
"github.com/scylladb/go-set/strset"
)

type UpstreamPackage struct {
Expand Down
3 changes: 1 addition & 2 deletions xeol/pkg/upstream_package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ package pkg
import (
"testing"

"github.com/stretchr/testify/assert"

"github.com/anchore/syft/syft/cpe"
"github.com/stretchr/testify/assert"
)

func TestUpstreamPackages(t *testing.T) {
Expand Down

0 comments on commit 19c2b77

Please sign in to comment.