use go.yaml.in/yaml (#4157)

Signed-off-by: Nikita Besperstov <n.bes@pm.me>
This commit is contained in:
n-bes 2025-08-26 18:24:23 +03:00 committed by GitHub
parent 7dc7c01c5c
commit 170c4c41f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 19 additions and 16 deletions

View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/clio" "github.com/anchore/clio"
"github.com/anchore/fangs" "github.com/anchore/fangs"

View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
_ "modernc.org/sqlite" // required for rpmdb and other features _ "modernc.org/sqlite" // required for rpmdb and other features
"github.com/anchore/syft/syft" "github.com/anchore/syft/syft"

3
go.mod
View File

@ -88,10 +88,10 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 github.com/xeipuuv/gojsonschema v1.2.0
github.com/zyedidia/generic v1.2.2-0.20230320175451-4410d2372cb1 github.com/zyedidia/generic v1.2.2-0.20230320175451-4410d2372cb1
go.uber.org/goleak v1.3.0 go.uber.org/goleak v1.3.0
go.yaml.in/yaml/v3 v3.0.4
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
golang.org/x/mod v0.27.0 golang.org/x/mod v0.27.0
golang.org/x/net v0.43.0 golang.org/x/net v0.43.0
gopkg.in/yaml.v3 v3.0.1
modernc.org/sqlite v1.38.2 modernc.org/sqlite v1.38.2
) )
@ -283,6 +283,7 @@ require (
google.golang.org/grpc v1.67.3 // indirect google.golang.org/grpc v1.67.3 // indirect
google.golang.org/protobuf v1.36.4 // indirect google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.66.3 // indirect modernc.org/libc v1.66.3 // indirect
modernc.org/mathutil v1.7.1 // indirect modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect modernc.org/memory v1.11.0 // indirect

2
go.sum
View File

@ -1621,6 +1621,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc= go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU= go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

View File

@ -11,7 +11,7 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/syft/pkg/cataloger/binary/test-fixtures/manager/internal" "github.com/anchore/syft/syft/pkg/cataloger/binary/test-fixtures/manager/internal"
"github.com/anchore/syft/syft/pkg/cataloger/binary/test-fixtures/manager/internal/config" "github.com/anchore/syft/syft/pkg/cataloger/binary/test-fixtures/manager/internal/config"

View File

@ -8,7 +8,7 @@ import (
"github.com/hashicorp/go-multierror" "github.com/hashicorp/go-multierror"
"github.com/scylladb/go-set/strset" "github.com/scylladb/go-set/strset"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
) )
const Path = "config.yaml" const Path = "config.yaml"

View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"github.com/OneOfOne/xxhash" "github.com/OneOfOne/xxhash"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
) )
type BinaryFromImage struct { type BinaryFromImage struct {

View File

@ -5,7 +5,7 @@ import (
"os" "os"
"strings" "strings"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
) )
type SnippetMetadata struct { type SnippetMetadata struct {

View File

@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/file" "github.com/anchore/syft/syft/file"

View File

@ -7,7 +7,7 @@ import (
"regexp" "regexp"
"sort" "sort"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"

View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"

View File

@ -6,7 +6,7 @@ import (
"io" "io"
"regexp" "regexp"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"

View File

@ -6,7 +6,7 @@ import (
"io" "io"
"strings" "strings"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"

View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"

View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/log" "github.com/anchore/syft/internal/log"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"

View File

@ -6,7 +6,7 @@ import (
"io" "io"
"strings" "strings"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
"github.com/anchore/syft/internal/unknown" "github.com/anchore/syft/internal/unknown"
"github.com/anchore/syft/syft/artifact" "github.com/anchore/syft/syft/artifact"

View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/yaml.v3" "go.yaml.in/yaml/v3"
) )
func Test_configLoading(t *testing.T) { func Test_configLoading(t *testing.T) {