chore(builder): upgrade to golang1.17

Author: duanhongyi

boot.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"runtime"
 
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
-	"github.com/docker/distribution/registry/storage/driver/factory"
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 	"github.com/drycc/builder/pkg"
 	"github.com/drycc/builder/pkg/cleaner"
 	"github.com/drycc/builder/pkg/conf"

go.mod

@@ -1,22 +1,65 @@
 module github.com/drycc/builder
 
-go 1.16
+go 1.17
 
 require (
 	github.com/arschles/assert v1.0.1-0.20191213221312-71f210f9375a
 	github.com/aws/aws-sdk-go v1.40.15
-	github.com/docker/distribution v2.7.1+incompatible
-	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/drycc/controller-sdk-go v0.0.0-20210805062837-2a7a960603e6
-	github.com/drycc/pkg v0.0.0-20210805062602-f69851d7b6af
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/distribution/distribution/v3 v3.0.0-20210921140121-a60a3f69eb54
+	github.com/drycc/controller-sdk-go v0.0.0-20210826011521-d57f3c75935a
+	github.com/drycc/pkg v0.0.0-20210826011456-c60b87108840
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/pborman/uuid v1.2.1
-	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/urfave/cli v1.22.5
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.22.0
 	k8s.io/apimachinery v0.22.0
 	k8s.io/client-go v0.22.0
 )
+
+require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/go-metrics v0.0.1 // indirect
+	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/goware/urlx v0.3.1 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/prometheus/client_golang v1.1.0 // indirect
+	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
+	github.com/prometheus/common v0.6.0 // indirect
+	github.com/prometheus/procfs v0.0.3 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
+)
+
+replace github.com/docker/distribution v2.7.1+incompatible => github.com/distribution/distribution v2.7.1+incompatible

go.sum

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	//"github.com/docker/distribution/context"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	//"github.com/distribution/distribution/v3/context"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	"github.com/drycc/builder/pkg/gitreceive"
 	"github.com/drycc/builder/pkg/k8s"
 	"github.com/drycc/builder/pkg/sys"

pkg/cleaner/cleaner.go

@@ -13,8 +13,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/docker/distribution/context"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/context"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	"github.com/drycc/builder/pkg/controller"
 	"github.com/drycc/builder/pkg/git"
 	"github.com/drycc/builder/pkg/k8s"

pkg/gitreceive/build.go

@@ -11,9 +11,9 @@ import (
 
 	"github.com/arschles/assert"
 
-	//"github.com/docker/distribution/context"
-	"github.com/docker/distribution/registry/storage/driver/factory"
-	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
+	//"github.com/distribution/distribution/v3/context"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory"
 	builderconf "github.com/drycc/builder/pkg/conf"
 	"github.com/drycc/builder/pkg/sys"
 	"github.com/drycc/controller-sdk-go/api"

pkg/gitreceive/build_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	builderconf "github.com/drycc/builder/pkg/conf"
 	"github.com/drycc/builder/pkg/sys"
 	"github.com/drycc/pkg/log"

pkg/gitreceive/run.go

@@ -2,10 +2,10 @@ package healthsrv
 
 import (
 	"context"
-	//"github.com/docker/distribution/context"
+	//"github.com/distribution/distribution/v3/context"
 )
 
-// BucketLister is a *(github.com/docker/distribution/registry/storage/driver).StorageDriver compatible interface that provides just
+// BucketLister is a *(github.com/distribution/distribution/v3/registry/storage/driver).StorageDriver compatible interface that provides just
 // the List cross-section of functionality. It can also be implemented for unit tests.
 type BucketLister interface {
 	// List returns a list of the objects that are direct descendants of the given path.

pkg/healthsrv/buckets_lister.go

@@ -10,11 +10,12 @@ import (
 	"net/http/httptest"
 	"strings"
 	"testing"
-	//"github.com/docker/distribution/context"
+
+	//"github.com/distribution/distribution/v3/context"
 
 	"github.com/arschles/assert"
 	"github.com/drycc/builder/pkg/sshd"
-	"github.com/drycc/controller-sdk-go"
+	drycc "github.com/drycc/controller-sdk-go"
 )
 
 var (

pkg/healthsrv/healthz_handler_test.go

@@ -2,11 +2,11 @@ package storage
 
 import (
 	"context"
-	//"github.com/docker/distribution/context"
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	//"github.com/distribution/distribution/v3/context"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 )
 
-// ObjectStatter is a *(github.com/docker/distribution/registry/storage/driver).StorageDriver compatible interface, restricted to
+// ObjectStatter is a *(github.com/distribution/distribution/v3/registry/storage/driver).StorageDriver compatible interface, restricted to
 // just the StatObject function. You can use it in your code for easier unit testing without
 // any external dependencies (like access to S3).
 type ObjectStatter interface {
@@ -31,7 +31,7 @@ func (f *FakeObjectStatter) Stat(ctx context.Context, path string) (storagedrive
 	return f.Fn(ctx, path)
 }
 
-// ObjectGetter is a *(github.com/docker/distribution/registry/storage/driver).StorageDriver compatible interface, restricted to
+// ObjectGetter is a *(github.com/distribution/distribution/v3/registry/storage/driver).StorageDriver compatible interface, restricted to
 // just the GetContent function. You can use it in your code for easier unit testing without
 // any external dependencies (like access to S3).
 type ObjectGetter interface {