diff --git a/go.mod b/go.mod index ff9ff4e..b863f3d 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/DataDog/rules_oci -go 1.24.0 - -toolchain go1.24.2 +go 1.25.0 require ( github.com/DataDog/zstd v1.5.7 @@ -18,7 +16,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.11.1 github.com/urfave/cli/v2 v2.27.2 - golang.org/x/sync v0.17.0 + golang.org/x/sync v0.22.0 oras.land/oras-go v1.2.7 ) @@ -63,4 +61,5 @@ require ( google.golang.org/grpc v1.68.0 // indirect google.golang.org/protobuf v1.35.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + oras.land/oras-go/v2 v2.6.2 // indirect ) diff --git a/go.sum b/go.sum index 49f6f9c..1aecc8c 100644 --- a/go.sum +++ b/go.sum @@ -248,8 +248,8 @@ golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM= golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= -golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -283,3 +283,5 @@ gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= oras.land/oras-go v1.2.7 h1:KF9rBAtKYMGB5gjgHV5XquUfYDER3ecQBEXjdI7KZWI= oras.land/oras-go v1.2.7/go.mod h1:WVpIPbm82xjWT/GJU3TqZ0y9Ctj3DGco4wLYvGdOVvA= +oras.land/oras-go/v2 v2.6.2 h1:N04RXngAp1LJKTG6ifz3xHPipasEkWr+hFmInja5YKo= +oras.land/oras-go/v2 v2.6.2/go.mod h1:PlTtg4JTDJkDe8yVHpM2wz7/YDc00GVas+i4jAW2TZ4= diff --git a/go/cmd/ocitool/gen_cmd.go b/go/cmd/ocitool/gen_cmd.go index dc7a7df..052700b 100644 --- a/go/cmd/ocitool/gen_cmd.go +++ b/go/cmd/ocitool/gen_cmd.go @@ -14,7 +14,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" - orascontent "oras.land/oras-go/pkg/content" + orascontent "oras.land/oras-go/v2/pkg/content" ) func GenerateBuildFilesCmd(c *cli.Context) error { diff --git a/go/cmd/ocitool/pull_cmd.go b/go/cmd/ocitool/pull_cmd.go index 67f97a8..794d501 100644 --- a/go/cmd/ocitool/pull_cmd.go +++ b/go/cmd/ocitool/pull_cmd.go @@ -9,7 +9,7 @@ import ( "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/urfave/cli/v2" - orascontent "oras.land/oras-go/pkg/content" + orascontent "oras.land/oras-go/v2/pkg/content" ) func PullCmd(c *cli.Context) error { diff --git a/go/pkg/ociutil/fetch.go b/go/pkg/ociutil/fetch.go index 6ccc634..589c353 100644 --- a/go/pkg/ociutil/fetch.go +++ b/go/pkg/ociutil/fetch.go @@ -4,7 +4,7 @@ import ( "github.com/containerd/containerd/content" "github.com/containerd/containerd/remotes" log "github.com/sirupsen/logrus" - "oras.land/oras-go/pkg/oras" + "oras.land/oras-go/v2/pkg/oras" ) func FetchertoProvider(fetcher remotes.Fetcher) content.Provider {