bump: change oras-go version to rc6 and change concurrency type (#715)

To accommodate the latest breaking change in oras-go rc6.

Resolves #719 

Signed-off-by: wangxiaoxuan273 <wangxiaoxuan119@gmail.com>

Author: wangxiaoxuan273

cmd/oras/attach.go

@@ -36,7 +36,7 @@ type attachOptions struct {
 
 	targetRef    string
 	artifactType string
-	concurrency  int64
+	concurrency  int
 }
 
 func attachCmd() *cobra.Command {
@@ -75,7 +75,7 @@ Example - Attach file 'hi.txt' and export the pushed manifest to 'manifest.json'
 	}
 
 	cmd.Flags().StringVarP(&opts.artifactType, "artifact-type", "", "", "artifact type")
-	cmd.Flags().Int64VarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
+	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
 	cmd.MarkFlagRequired("artifact-type")
 	option.ApplyFlags(&opts, cmd.Flags())
 	return cmd

cmd/oras/cp.go

@@ -36,7 +36,7 @@ type copyOptions struct {
 	option.Platform
 	recursive bool
 
-	concurrency int64
+	concurrency int
 	srcRef      string
 	dstRef      string
 	extraRefs   []string
@@ -80,7 +80,7 @@ Example - Copy the artifact tagged with 'v1' from repository 'localhost:5000/net
 	cmd.Flags().BoolVarP(&opts.recursive, "recursive", "r", false, "recursively copy the artifact and its referrer artifacts")
 	opts.src.ApplyFlagsWithPrefix(cmd.Flags(), "from", "source")
 	opts.dst.ApplyFlagsWithPrefix(cmd.Flags(), "to", "destination")
-	cmd.Flags().Int64VarP(&opts.concurrency, "concurrency", "", 3, "concurrency level")
+	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 3, "concurrency level")
 	option.ApplyFlags(&opts, cmd.Flags())
 
 	return cmd

cmd/oras/manifest/push.go

@@ -39,7 +39,7 @@ type pushOptions struct {
 	option.Pretty
 	option.Remote
 
-	concurrency int64
+	concurrency int
 	targetRef   string
 	extraRefs   []string
 	fileRef     string
@@ -94,7 +94,7 @@ Example - Push a manifest to repository 'locahost:5000/hello' and tag with 'tag1
 
 	option.ApplyFlags(&opts, cmd.Flags())
 	cmd.Flags().StringVarP(&opts.mediaType, "media-type", "", "", "media type of manifest")
-	cmd.Flags().Int64VarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
+	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
 	return cmd
 }
 

cmd/oras/pull.go

@@ -38,7 +38,7 @@ type pullOptions struct {
 	option.Remote
 	option.Platform
 
-	concurrency       int64
+	concurrency       int
 	targetRef         string
 	KeepOldFiles      bool
 	PathTraversal     bool
@@ -86,7 +86,7 @@ Example - Pull all files with concurrency level tuned:
 	cmd.Flags().BoolVarP(&opts.PathTraversal, "allow-path-traversal", "T", false, "allow storing files out of the output directory")
 	cmd.Flags().StringVarP(&opts.Output, "output", "o", ".", "output directory")
 	cmd.Flags().StringVarP(&opts.ManifestConfigRef, "config", "", "", "output manifest config file")
-	cmd.Flags().Int64VarP(&opts.concurrency, "concurrency", "", 3, "concurrency level")
+	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 3, "concurrency level")
 	option.ApplyFlags(&opts, cmd.Flags())
 	return cmd
 }

cmd/oras/push.go

@@ -44,7 +44,7 @@ type pushOptions struct {
 	extraRefs         []string
 	manifestConfigRef string
 	artifactType      string
-	concurrency       int64
+	concurrency       int
 }
 
 func pushCmd() *cobra.Command {
@@ -107,7 +107,7 @@ Example - Push file "hi.txt" with multiple tags and concurrency level tuned:
 	}
 	cmd.Flags().StringVarP(&opts.manifestConfigRef, "config", "", "", "`path` of image config file")
 	cmd.Flags().StringVarP(&opts.artifactType, "artifact-type", "", "", "artifact type")
-	cmd.Flags().Int64VarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
+	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
 
 	option.ApplyFlags(&opts, cmd.Flags())
 	return cmd

cmd/oras/tag/tag.go

@@ -27,7 +27,7 @@ type tagOptions struct {
 	option.Common
 	option.Remote
 
-	concurrency int64
+	concurrency int
 	srcRef      string
 	targetRefs  []string
 }
@@ -65,7 +65,7 @@ Example - Tag the manifest 'v1.0.1' in 'localhost:5000/hello' to 'v1.0.1', 'v1.0
 	}
 
 	option.ApplyFlags(&opts, cmd.Flags())
-	cmd.Flags().Int64VarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
+	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 5, "concurrency level")
 	return cmd
 }
 

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/pflag v1.0.5
-	oras.land/oras-go/v2 v2.0.0-rc.4.0.20221111045309-74eeb52579de
+	oras.land/oras-go/v2 v2.0.0-rc.6
 )
 
 require (
@@ -20,6 +20,6 @@ require (
 	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
 )

go.sum

@@ -46,8 +46,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -63,5 +63,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
-oras.land/oras-go/v2 v2.0.0-rc.4.0.20221111045309-74eeb52579de h1:wd4FNQUAyeKAsL28thn32k+vvAMlYN/a+rdKqsyB9Cs=
-oras.land/oras-go/v2 v2.0.0-rc.4.0.20221111045309-74eeb52579de/go.mod h1:YGHvWBGuqRlZgUyXUIoKsR3lcuCOb3DAtG0SEsEw1iY=
+oras.land/oras-go/v2 v2.0.0-rc.6 h1:jGWysqm8flq+X0Vj8bZ6rkASAqTab5k18Mx9hEjFc8g=
+oras.land/oras-go/v2 v2.0.0-rc.6/go.mod h1:iVExH1NxrccIxjsiq17L91WCZ4KIw6jVQyCLsZsu1gc=