mirror of
https://github.com/project-zot/zot.git
synced 2026-06-16 04:17:55 +08:00
Update go version to 1.19 (#829)
* ci: Update go version to 1.19 Signed-off-by: Nicol Draghici <idraghic@cisco.com> * ci: Fix lint issues Signed-off-by: Nicol Draghici <idraghic@cisco.com> * ci: Added needprivileges to lint, made needprivileges pass lint Signed-off-by: Catalin Hofnar <catalin.hofnar@gmail.com> Signed-off-by: Nicol Draghici <idraghic@cisco.com> Signed-off-by: Nicol Draghici <idraghic@cisco.com> Signed-off-by: Catalin Hofnar <catalin.hofnar@gmail.com> Co-authored-by: Catalin Hofnar <catalin.hofnar@gmail.com>
This commit is contained in:
+1
-1
@@ -91,7 +91,7 @@ func noPasswdAuth(realm string, config *config.Config) mux.MiddlewareFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// nolint:gocyclo // we use closure making this a complex subroutine
|
||||
//nolint:gocyclo // we use closure making this a complex subroutine
|
||||
func basicAuthHandler(ctlr *Controller) mux.MiddlewareFunc {
|
||||
realm := ctlr.Config.HTTP.Realm
|
||||
if realm == "" {
|
||||
|
||||
+3
-3
@@ -217,13 +217,13 @@ func AuthzHandler(ctlr *Controller) mux.MiddlewareFunc {
|
||||
|
||||
// will return only repos on which client is authorized to read
|
||||
if request.RequestURI == fmt.Sprintf("%s%s", constants.RoutePrefix, constants.ExtCatalogPrefix) {
|
||||
next.ServeHTTP(response, request.WithContext(ctx))
|
||||
next.ServeHTTP(response, request.WithContext(ctx)) //nolint:contextcheck
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
if strings.Contains(request.RequestURI, constants.ExtSearchPrefix) {
|
||||
next.ServeHTTP(response, request.WithContext(ctx))
|
||||
next.ServeHTTP(response, request.WithContext(ctx)) //nolint:contextcheck
|
||||
|
||||
return
|
||||
}
|
||||
@@ -255,7 +255,7 @@ func AuthzHandler(ctlr *Controller) mux.MiddlewareFunc {
|
||||
if !can {
|
||||
authzFail(response, ctlr.Config.HTTP.Realm, ctlr.Config.HTTP.Auth.FailDelay)
|
||||
} else {
|
||||
next.ServeHTTP(response, request.WithContext(ctx))
|
||||
next.ServeHTTP(response, request.WithContext(ctx)) //nolint:contextcheck
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -13,9 +13,9 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
Commit string // nolint: gochecknoglobals
|
||||
BinaryType string // nolint: gochecknoglobals
|
||||
GoVersion string // nolint: gochecknoglobals
|
||||
Commit string //nolint: gochecknoglobals
|
||||
BinaryType string //nolint: gochecknoglobals
|
||||
GoVersion string //nolint: gochecknoglobals
|
||||
)
|
||||
|
||||
type StorageConfig struct {
|
||||
|
||||
@@ -8,7 +8,6 @@ import (
|
||||
"testing"
|
||||
|
||||
. "github.com/smartystreets/goconvey/convey"
|
||||
|
||||
"zotregistry.io/zot/pkg/api/config"
|
||||
)
|
||||
|
||||
|
||||
+11
-10
@@ -21,7 +21,6 @@ import (
|
||||
"zotregistry.io/zot/errors"
|
||||
"zotregistry.io/zot/pkg/api/config"
|
||||
ext "zotregistry.io/zot/pkg/extensions"
|
||||
"zotregistry.io/zot/pkg/extensions/lint"
|
||||
"zotregistry.io/zot/pkg/extensions/monitoring"
|
||||
"zotregistry.io/zot/pkg/log"
|
||||
"zotregistry.io/zot/pkg/scheduler"
|
||||
@@ -31,7 +30,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
idleTimeout = 120 * time.Second
|
||||
idleTimeout = 120 * time.Second
|
||||
readHeaderTimeout = 5 * time.Second
|
||||
)
|
||||
|
||||
type Controller struct {
|
||||
@@ -162,14 +162,15 @@ func (c *Controller) Run(reloadCtx context.Context) error {
|
||||
monitoring.SetServerInfo(c.Metrics, c.Config.Commit, c.Config.BinaryType, c.Config.GoVersion,
|
||||
c.Config.DistSpecVersion)
|
||||
|
||||
// nolint: contextcheck
|
||||
//nolint: contextcheck
|
||||
_ = NewRouteHandler(c)
|
||||
|
||||
addr := fmt.Sprintf("%s:%s", c.Config.HTTP.Address, c.Config.HTTP.Port)
|
||||
server := &http.Server{
|
||||
Addr: addr,
|
||||
Handler: c.Router,
|
||||
IdleTimeout: idleTimeout,
|
||||
Addr: addr,
|
||||
Handler: c.Router,
|
||||
IdleTimeout: idleTimeout,
|
||||
ReadHeaderTimeout: readHeaderTimeout,
|
||||
}
|
||||
c.Server = server
|
||||
|
||||
@@ -264,7 +265,7 @@ func (c *Controller) InitImageStore(reloadCtx context.Context) error {
|
||||
var defaultStore storage.ImageStore
|
||||
if c.Config.Storage.StorageDriver == nil {
|
||||
// false positive lint - linter does not implement Lint method
|
||||
// nolint: typecheck
|
||||
//nolint:typecheck
|
||||
defaultStore = local.NewImageStore(c.Config.Storage.RootDirectory,
|
||||
c.Config.Storage.GC, c.Config.Storage.GCDelay,
|
||||
c.Config.Storage.Dedupe, c.Config.Storage.Commit, c.Log, c.Metrics, linter,
|
||||
@@ -291,7 +292,7 @@ func (c *Controller) InitImageStore(reloadCtx context.Context) error {
|
||||
}
|
||||
|
||||
// false positive lint - linter does not implement Lint method
|
||||
// nolint: typecheck
|
||||
//nolint: typecheck
|
||||
defaultStore = s3.NewImageStore(rootDir, c.Config.Storage.RootDirectory,
|
||||
c.Config.Storage.GC, c.Config.Storage.GCDelay, c.Config.Storage.Dedupe,
|
||||
c.Config.Storage.Commit, c.Log, c.Metrics, linter, store)
|
||||
@@ -326,7 +327,7 @@ func (c *Controller) InitImageStore(reloadCtx context.Context) error {
|
||||
}
|
||||
|
||||
func (c *Controller) getSubStore(subPaths map[string]config.StorageConfig,
|
||||
linter *lint.Linter,
|
||||
linter storage.Lint,
|
||||
) (map[string]storage.ImageStore, error) {
|
||||
imgStoreMap := make(map[string]storage.ImageStore, 0)
|
||||
|
||||
@@ -398,7 +399,7 @@ func (c *Controller) getSubStore(subPaths map[string]config.StorageConfig,
|
||||
}
|
||||
|
||||
// false positive lint - linter does not implement Lint method
|
||||
// nolint: typecheck
|
||||
//nolint: typecheck
|
||||
subImageStore[route] = s3.NewImageStore(rootDir, storageConfig.RootDirectory,
|
||||
storageConfig.GC, storageConfig.GCDelay,
|
||||
storageConfig.Dedupe, storageConfig.Commit, c.Log, c.Metrics, linter, store,
|
||||
|
||||
+55
-55
@@ -601,7 +601,7 @@ func TestInterruptedBlobUpload(t *testing.T) {
|
||||
blob := make([]byte, 50*1024*1024)
|
||||
digest := godigest.FromBytes(blob).String()
|
||||
|
||||
// nolint: dupl
|
||||
//nolint: dupl
|
||||
Convey("Test interrupt PATCH blob upload", func() {
|
||||
resp, err := client.R().Post(baseURL + "/v2/" + AuthorizedNamespace + "/blobs/uploads/")
|
||||
So(err, ShouldBeNil)
|
||||
@@ -703,7 +703,7 @@ func TestInterruptedBlobUpload(t *testing.T) {
|
||||
So(resp.StatusCode(), ShouldEqual, http.StatusNotFound)
|
||||
})
|
||||
|
||||
// nolint: dupl
|
||||
//nolint: dupl
|
||||
Convey("Test interrupt PUT blob upload", func() {
|
||||
resp, err := client.R().Post(baseURL + "/v2/" + AuthorizedNamespace + "/blobs/uploads/")
|
||||
So(err, ShouldBeNil)
|
||||
@@ -4115,7 +4115,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
// so path routing is bypassed
|
||||
|
||||
Convey("List tags", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4126,7 +4126,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4137,7 +4137,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm := request.URL.Query()
|
||||
qparm.Add("n", "a")
|
||||
@@ -4151,7 +4151,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusBadRequest)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("n", "abc")
|
||||
@@ -4165,7 +4165,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusBadRequest)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("n", "a")
|
||||
@@ -4180,7 +4180,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusBadRequest)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("n", "0")
|
||||
@@ -4194,7 +4194,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("n", "1")
|
||||
@@ -4209,7 +4209,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("n", "1")
|
||||
@@ -4224,7 +4224,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("n", "1")
|
||||
@@ -4242,7 +4242,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Check manifest", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4253,7 +4253,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4264,7 +4264,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "reference": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4277,7 +4277,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Get manifest", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4288,7 +4288,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4299,7 +4299,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "reference": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4312,7 +4312,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Update manifest", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4323,7 +4323,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4334,7 +4334,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "reference": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4347,7 +4347,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Delete manifest", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4358,7 +4358,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4369,7 +4369,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "reference": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4382,7 +4382,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Check blob", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4393,7 +4393,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4404,7 +4404,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "digest": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4417,7 +4417,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Get blob", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4428,7 +4428,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4439,7 +4439,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "digest": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4452,7 +4452,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Delete blob", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4463,7 +4463,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4474,7 +4474,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "digest": ""})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4487,7 +4487,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Create blob upload", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "POST", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPost, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4498,7 +4498,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "POST", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPost, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm := request.URL.Query()
|
||||
qparm.Add("mount", "a")
|
||||
@@ -4513,7 +4513,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusBadRequest)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "POST", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPost, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
qparm = request.URL.Query()
|
||||
qparm.Add("mount", "a")
|
||||
@@ -4529,7 +4529,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Get blob upload", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4540,7 +4540,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4553,7 +4553,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Patch blob upload", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PATCH", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPatch, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4564,7 +4564,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4577,7 +4577,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Update blob upload", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4588,7 +4588,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4599,7 +4599,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "session_id": "bar"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4610,7 +4610,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusBadRequest)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "PUT", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo", "session_id": "bar"})
|
||||
qparm := request.URL.Query()
|
||||
qparm.Add("digest", "a")
|
||||
@@ -4627,7 +4627,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Delete blob upload", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4638,7 +4638,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -4651,7 +4651,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
})
|
||||
|
||||
Convey("Get referrers", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -4662,7 +4662,7 @@ func TestRouteFailures(t *testing.T) {
|
||||
So(resp, ShouldNotBeNil)
|
||||
So(resp.StatusCode, ShouldEqual, http.StatusNotFound)
|
||||
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ = http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "foo"})
|
||||
response = httptest.NewRecorder()
|
||||
|
||||
@@ -5200,7 +5200,7 @@ func TestManifestImageIndex(t *testing.T) {
|
||||
So(resp.Header().Get("Content-Type"), ShouldNotBeEmpty)
|
||||
|
||||
Convey("List tags", func() {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "index"})
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -5713,7 +5713,7 @@ func TestInjectInterruptedImageManifest(t *testing.T) {
|
||||
Convey("Uploading an image manifest blob (when injected simulates an interrupted image manifest upload)", func() {
|
||||
injected := test.InjectFailure(0)
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewReader(content))
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "reference": "1.0"})
|
||||
request.Header.Set("Content-Type", "application/vnd.oci.image.manifest.v1+json")
|
||||
response := httptest.NewRecorder()
|
||||
@@ -5774,7 +5774,7 @@ func TestInjectTooManyOpenFiles(t *testing.T) {
|
||||
// monolithic blob upload
|
||||
injected := test.InjectFailure(0)
|
||||
if injected {
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", loc, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, loc, bytes.NewReader(content))
|
||||
tokens := strings.Split(loc, "/")
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "session_id": tokens[len(tokens)-1]})
|
||||
q := request.URL.Query()
|
||||
@@ -5847,7 +5847,7 @@ func TestInjectTooManyOpenFiles(t *testing.T) {
|
||||
Convey("Uploading an image manifest blob (when injected simulates that PutImageManifest failed due to 'too many open files' error)", func() {
|
||||
injected := test.InjectFailure(1)
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewReader(content))
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "reference": "1.0"})
|
||||
request.Header.Set("Content-Type", "application/vnd.oci.image.manifest.v1+json")
|
||||
response := httptest.NewRecorder()
|
||||
@@ -5867,7 +5867,7 @@ func TestInjectTooManyOpenFiles(t *testing.T) {
|
||||
Convey("when injected simulates a `too many open files` error inside PutImageManifest method of img store", func() {
|
||||
injected := test.InjectFailure(2)
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewReader(content))
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "reference": "1.0"})
|
||||
request.Header.Set("Content-Type", "application/vnd.oci.image.manifest.v1+json")
|
||||
response := httptest.NewRecorder()
|
||||
@@ -5888,7 +5888,7 @@ func TestInjectTooManyOpenFiles(t *testing.T) {
|
||||
Convey("code coverage: error inside PutImageManifest method of img store (unable to marshal JSON)", func() {
|
||||
injected := test.InjectFailure(1)
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewReader(content))
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "reference": "1.0"})
|
||||
request.Header.Set("Content-Type", "application/vnd.oci.image.manifest.v1+json")
|
||||
response := httptest.NewRecorder()
|
||||
@@ -5909,7 +5909,7 @@ func TestInjectTooManyOpenFiles(t *testing.T) {
|
||||
Convey("code coverage: error inside PutImageManifest method of img store (umoci.OpenLayout error)", func() {
|
||||
injected := test.InjectFailure(3)
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewReader(content))
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "reference": "1.0"})
|
||||
request.Header.Set("Content-Type", "application/vnd.oci.image.manifest.v1+json")
|
||||
response := httptest.NewRecorder()
|
||||
@@ -5930,7 +5930,7 @@ func TestInjectTooManyOpenFiles(t *testing.T) {
|
||||
Convey("code coverage: error inside PutImageManifest method of img store (oci.GC)", func() {
|
||||
injected := test.InjectFailure(4)
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewReader(content))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewReader(content))
|
||||
request = mux.SetURLVars(request, map[string]string{"name": "repotest", "reference": "1.0"})
|
||||
request.Header.Set("Content-Type", "application/vnd.oci.image.manifest.v1+json")
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@ type ErrorList struct {
|
||||
|
||||
type ErrorCode int
|
||||
|
||||
// nolint: golint, stylecheck, revive
|
||||
//nolint:golint,stylecheck,revive
|
||||
const (
|
||||
BLOB_UNKNOWN ErrorCode = iota
|
||||
BLOB_UPLOAD_INVALID
|
||||
@@ -60,7 +60,7 @@ func (e ErrorCode) String() string {
|
||||
return errMap[e]
|
||||
}
|
||||
|
||||
func NewError(code ErrorCode, detail ...interface{}) Error { //nolint: interfacer
|
||||
func NewError(code ErrorCode, detail ...interface{}) Error {
|
||||
errMap := map[ErrorCode]Error{
|
||||
BLOB_UNKNOWN: {
|
||||
Message: "blob unknown to registry",
|
||||
|
||||
+3
-4
@@ -55,13 +55,12 @@ func (lc *LDAPClient) Connect() error {
|
||||
// Reconnect with TLS
|
||||
if !lc.SkipTLS {
|
||||
config := &tls.Config{
|
||||
InsecureSkipVerify: lc.InsecureSkipVerify, // nolint: gosec // InsecureSkipVerify is not true by default
|
||||
InsecureSkipVerify: lc.InsecureSkipVerify, //nolint: gosec // InsecureSkipVerify is not true by default
|
||||
RootCAs: lc.ClientCAs,
|
||||
}
|
||||
|
||||
if lc.ClientCertificates != nil && len(lc.ClientCertificates) > 0 {
|
||||
config.Certificates = lc.ClientCertificates
|
||||
config.BuildNameToCertificate()
|
||||
}
|
||||
|
||||
err = l.StartTLS(config)
|
||||
@@ -74,13 +73,13 @@ func (lc *LDAPClient) Connect() error {
|
||||
}
|
||||
} else {
|
||||
config := &tls.Config{
|
||||
InsecureSkipVerify: lc.InsecureSkipVerify, // nolint: gosec // InsecureSkipVerify is not true by default
|
||||
InsecureSkipVerify: lc.InsecureSkipVerify, //nolint: gosec // InsecureSkipVerify is not true by default
|
||||
ServerName: lc.ServerName,
|
||||
RootCAs: lc.ClientCAs,
|
||||
}
|
||||
if lc.ClientCertificates != nil && len(lc.ClientCertificates) > 0 {
|
||||
config.Certificates = lc.ClientCertificates
|
||||
config.BuildNameToCertificate()
|
||||
// config.BuildNameToCertificate()
|
||||
}
|
||||
l, err = ldap.DialTLS("tcp", address, config)
|
||||
if err != nil {
|
||||
|
||||
+3
-2
@@ -2,7 +2,7 @@ package api
|
||||
|
||||
import "regexp"
|
||||
|
||||
// nolint: gochecknoglobals
|
||||
//nolint:gochecknoglobals
|
||||
var (
|
||||
// alphaNumericRegexp defines the alpha numeric atom, typically a
|
||||
// component of names. This only allows lower case characters and digits.
|
||||
@@ -29,7 +29,8 @@ var (
|
||||
)
|
||||
|
||||
// match compiles the string to a regular expression.
|
||||
// nolint: gochecknoglobals
|
||||
//
|
||||
//nolint:gochecknoglobals
|
||||
var match = regexp.MustCompile
|
||||
|
||||
// literal compiles s into a literal regular expression, escaping any regexp
|
||||
|
||||
+4
-6
@@ -32,14 +32,13 @@ import (
|
||||
"zotregistry.io/zot/pkg/log"
|
||||
localCtx "zotregistry.io/zot/pkg/requestcontext"
|
||||
"zotregistry.io/zot/pkg/storage"
|
||||
"zotregistry.io/zot/pkg/test" // nolint:goimports
|
||||
"zotregistry.io/zot/pkg/test" //nolint:goimports
|
||||
)
|
||||
|
||||
type RouteHandler struct {
|
||||
c *Controller
|
||||
}
|
||||
|
||||
// nolint: contextcheck
|
||||
func NewRouteHandler(c *Controller) *RouteHandler {
|
||||
rh := &RouteHandler{c: c}
|
||||
rh.SetupRoutes()
|
||||
@@ -51,7 +50,6 @@ func allowedMethods(method string) []string {
|
||||
return []string{http.MethodOptions, method}
|
||||
}
|
||||
|
||||
// nolint: contextcheck
|
||||
func (rh *RouteHandler) SetupRoutes() {
|
||||
rh.c.Router.Use(AuthHandler(rh.c))
|
||||
// authz is being enabled if AccessControl is specified
|
||||
@@ -308,7 +306,7 @@ func (rh *RouteHandler) CheckManifest(response http.ResponseWriter, request *htt
|
||||
return
|
||||
}
|
||||
|
||||
content, digest, mediaType, err := getImageManifest(rh, imgStore, name, reference)
|
||||
content, digest, mediaType, err := getImageManifest(rh, imgStore, name, reference) //nolint:contextcheck
|
||||
if err != nil {
|
||||
if errors.Is(err, zerr.ErrRepoNotFound) { //nolint:gocritic // errorslint conflicts with gocritic:IfElseChain
|
||||
WriteJSON(response, http.StatusNotFound,
|
||||
@@ -373,7 +371,7 @@ func (rh *RouteHandler) GetManifest(response http.ResponseWriter, request *http.
|
||||
return
|
||||
}
|
||||
|
||||
content, digest, mediaType, err := getImageManifest(rh, imgStore, name, reference)
|
||||
content, digest, mediaType, err := getImageManifest(rh, imgStore, name, reference) //nolint: contextcheck
|
||||
if err != nil {
|
||||
if errors.Is(err, zerr.ErrRepoNotFound) { //nolint:gocritic // errorslint conflicts with gocritic:IfElseChain
|
||||
WriteJSON(response, http.StatusNotFound,
|
||||
@@ -1550,7 +1548,7 @@ func (rh *RouteHandler) GetReferrers(response http.ResponseWriter, request *http
|
||||
|
||||
rh.c.Log.Info().Str("digest", digest).Str("artifactType", artifactType).Msg("getting manifest")
|
||||
|
||||
refs, err := getReferrers(rh, imgStore, name, digest, artifactType)
|
||||
refs, err := getReferrers(rh, imgStore, name, digest, artifactType) //nolint:contextcheck
|
||||
if err != nil {
|
||||
rh.c.Log.Error().Err(err).Str("name", name).Str("digest", digest).Msg("unable to get references")
|
||||
response.WriteHeader(http.StatusBadRequest)
|
||||
|
||||
+15
-15
@@ -60,7 +60,7 @@ func TestRoutes(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{
|
||||
"name": "test",
|
||||
"reference": "b8b1231908844a55c251211c7a67ae3c809fb86a081a8eeb4a715e6d7d65625c",
|
||||
@@ -80,7 +80,7 @@ func TestRoutes(t *testing.T) {
|
||||
testUpdateManifest := func(urlVars map[string]string, ism *mocks.MockedImageStore) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
str := []byte("test")
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PUT", baseURL, bytes.NewBuffer(str))
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPut, baseURL, bytes.NewBuffer(str))
|
||||
request = mux.SetURLVars(request, urlVars)
|
||||
request.Header.Add("Content-Type", ispec.MediaTypeImageManifest)
|
||||
response := httptest.NewRecorder()
|
||||
@@ -159,7 +159,7 @@ func TestRoutes(t *testing.T) {
|
||||
Convey("DeleteManifest", func() {
|
||||
testDeleteManifest := func(headers map[string]string, urlVars map[string]string, ism *mocks.MockedImageStore) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.Background(), "DELETE", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.Background(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, urlVars)
|
||||
for k, v := range headers {
|
||||
request.Header.Add(k, v)
|
||||
@@ -238,7 +238,7 @@ func TestRoutes(t *testing.T) {
|
||||
Convey("DeleteBlob", func() {
|
||||
testDeleteBlob := func(urlVars map[string]string, ism *mocks.MockedImageStore) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "DELETE", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodDelete, baseURL, nil)
|
||||
request = mux.SetURLVars(request, urlVars)
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -306,7 +306,7 @@ func TestRoutes(t *testing.T) {
|
||||
Convey("CheckBlob", func() {
|
||||
testCheckBlob := func(urlVars map[string]string, ism *mocks.MockedImageStore) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "HEAD", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodHead, baseURL, nil)
|
||||
request = mux.SetURLVars(request, urlVars)
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -387,7 +387,7 @@ func TestRoutes(t *testing.T) {
|
||||
Convey("GetBlob", func() {
|
||||
testGetBlob := func(urlVars map[string]string, ism *mocks.MockedImageStore) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, urlVars)
|
||||
response := httptest.NewRecorder()
|
||||
|
||||
@@ -432,7 +432,7 @@ func TestRoutes(t *testing.T) {
|
||||
ism *mocks.MockedImageStore,
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "POST", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPost, baseURL, nil)
|
||||
request = mux.SetURLVars(request,
|
||||
map[string]string{
|
||||
"name": "test",
|
||||
@@ -579,7 +579,7 @@ func TestRoutes(t *testing.T) {
|
||||
ism *mocks.MockedImageStore,
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
q := request.URL.Query()
|
||||
@@ -694,7 +694,7 @@ func TestRoutes(t *testing.T) {
|
||||
ism *mocks.MockedImageStore,
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PATCH", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPatch, baseURL, nil)
|
||||
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
@@ -809,7 +809,7 @@ func TestRoutes(t *testing.T) {
|
||||
ism *mocks.MockedImageStore,
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PATCH", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPatch, baseURL, nil)
|
||||
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
@@ -1054,7 +1054,7 @@ func TestRoutes(t *testing.T) {
|
||||
ism *mocks.MockedImageStore,
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PATCH", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPatch, baseURL, nil)
|
||||
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
@@ -1139,7 +1139,7 @@ func TestRoutes(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodGet, baseURL, nil)
|
||||
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
@@ -1171,7 +1171,7 @@ func TestRoutes(t *testing.T) {
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
ctlr.StoreController.SubStore = map[string]storage.ImageStore{}
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PATCH", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPatch, baseURL, nil)
|
||||
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
@@ -1249,7 +1249,7 @@ func TestRoutes(t *testing.T) {
|
||||
// acCtx := api.NewAccessControlContext(map[string]bool{}, true)
|
||||
// ctx := context.WithValue(context.Background(), "ctx", acCtx)
|
||||
ctx := context.Background()
|
||||
request, _ := http.NewRequestWithContext(ctx, "GET", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(ctx, http.MethodGet, baseURL, nil)
|
||||
request = mux.SetURLVars(request, map[string]string{
|
||||
"name": "repo",
|
||||
"session_id": "test",
|
||||
@@ -1272,7 +1272,7 @@ func TestRoutes(t *testing.T) {
|
||||
ism *mocks.MockedImageStore,
|
||||
) int {
|
||||
ctlr.StoreController.DefaultStore = ism
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), "PATCH", baseURL, nil)
|
||||
request, _ := http.NewRequestWithContext(context.TODO(), http.MethodPatch, baseURL, nil)
|
||||
|
||||
request = mux.SetURLVars(request, vars)
|
||||
|
||||
|
||||
+1
-1
@@ -98,7 +98,7 @@ func SessionLogger(ctlr *Controller) mux.MiddlewareFunc {
|
||||
b, err := base64.StdEncoding.DecodeString(s[1])
|
||||
if err == nil {
|
||||
pair := strings.SplitN(string(b), ":", 2) //nolint:gomnd
|
||||
// nolint:gomnd
|
||||
//nolint:gomnd
|
||||
if len(pair) == 2 {
|
||||
log = log.Str("username", pair[0])
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user