github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-16 04:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Reduce zb binary size (#1783)

Browse Source 
Signed-off-by: Alexei Dodon <adodon@cisco.com>
This commit is contained in:
Alexei Dodon
2023-09-13 10:28:14 +03:00
committed by GitHub
parent 98ab43f6ef
commit 48bf7f69f8
17 changed files with 243 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/test/common.go
+3 -21
View File
@@ -18,7 +18,6 @@ import (
mathRand "math/rand"
"net"
"net/http"
"net/url"
"os"
"path"
"path/filepath"
@@ -55,6 +54,7 @@ import (
storageCommon "zotregistry.io/zot/pkg/storage/common"
"zotregistry.io/zot/pkg/storage/local"
stypes "zotregistry.io/zot/pkg/storage/types"
testc "zotregistry.io/zot/pkg/test/common"
"zotregistry.io/zot/pkg/test/inject"
"zotregistry.io/zot/pkg/test/mocks"
)
@@ -158,24 +158,6 @@ func MakeHtpasswdFileFromString(fileContent string) string {
return htpasswdFile.Name()
}
func Location(baseURL string, resp *resty.Response) string {
// For some API responses, the Location header is set and is supposed to
// indicate an opaque value. However, it is not clear if this value is an
// absolute URL (https://server:port/v2/...) or just a path (/v2/...)
// zot implements the latter as per the spec, but some registries appear to
// return the former - this needs to be clarified
loc := resp.Header().Get("Location")
uloc, err := url.Parse(loc)
if err != nil {
return ""
}
path := uloc.Path
return baseURL + path
}
func CopyFiles(sourceDir, destDir string) error {
sourceMeta, err := os.Stat(sourceDir)
if err != nil {
@@ -954,7 +936,7 @@ func UploadImage(img Image, baseURL, repo, ref string) error {
return ErrPostBlob
}
loc := Location(baseURL, resp)
loc := testc.Location(baseURL, resp)
// uploading blob should get 201
resp, err = resty.R().
@@ -1633,7 +1615,7 @@ func UploadImageWithBasicAuth(img Image, baseURL, repo, ref, user, password stri
return ErrPostBlob
}
loc := Location(baseURL, resp)
loc := testc.Location(baseURL, resp)
// uploading blob should get 201
resp, err = resty.R().
pkg/test/common/utils.go
+25
View File
@@ -0,0 +1,25 @@
package common
import (
"net/url"
"gopkg.in/resty.v1"
)
func Location(baseURL string, resp *resty.Response) string {
// For some API responses, the Location header is set and is supposed to
// indicate an opaque value. However, it is not clear if this value is an
// absolute URL (https://server:port/v2/...) or just a path (/v2/...)
// zot implements the latter as per the spec, but some registries appear to
// return the former - this needs to be clarified
loc := resp.Header().Get("Location")
uloc, err := url.Parse(loc)
if err != nil {
return ""
}
path := uloc.Path
return baseURL + path
}