ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-03-16 20:55:36 +02:00
parent 5c1da77f4c
commit 13b1905e05
31 changed files with 177 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/filecli/referer.go
+31 -31
View File
@@ -30,7 +30,7 @@ type Referer struct {
}
func ParsePath(rawpath string) (*Referer, error) {
repo := &Referer{
ref := &Referer{
values: url.Values{},
}
if !strings.Contains(rawpath, "://") {
@@ -38,71 +38,71 @@ func ParsePath(rawpath string) (*Referer, error) {
}
urlobj, err := url.Parse(rawpath)
if err != nil {
return repo, err
return ref, err
}
if urlobj.User != nil {
repo.user = urlobj.User.Username()
repo.pass, _ = urlobj.User.Password()
ref.user = urlobj.User.Username()
ref.pass, _ = urlobj.User.Password()
urlobj.User = nil
}
repo.resource = path.Join("/", urlobj.Path)
ref.resource = path.Join("/", urlobj.Path)
urlobj.Path = "/"
repo.urlobj = urlobj
repo.values = urlobj.Query()
return repo, err
ref.urlobj = urlobj
ref.values = urlobj.Query()
return ref, err
}
func (repo *Referer) Raw() string {
res := path.Join(repo.urlobj.Host, repo.resource)
query := repo.values.Encode()
func (ref *Referer) Raw() string {
res := path.Join(ref.urlobj.Host, ref.resource)
query := ref.values.Encode()
if query != "" {
return res + "?" + query
}
return res
}
func (repo *Referer) SetResource(resource string) {
repo.resource = path.Join("/", resource)
func (ref *Referer) SetResource(resource string) {
ref.resource = path.Join("/", resource)
}
func (repo *Referer) JoinResource(resource string) {
repo.resource = path.Join("/", repo.resource, resource)
func (ref *Referer) JoinResource(resource string) {
ref.resource = path.Join("/", ref.resource, resource)
}
func (repo *Referer) PathType(typ string) {
repo.values.Set("pathType", typ)
func (ref *Referer) PathType(typ string) {
ref.values.Set("pathType", typ)
}
func (repo *Referer) DryRun(yesno bool) {
repo.values.Set("dryRun", strconv.FormatBool(yesno))
func (ref *Referer) DryRun(yesno bool) {
ref.values.Set("dryRun", strconv.FormatBool(yesno))
}
func (repo *Referer) FileEP() string {
curl := repo.urlobj.JoinPath("/v3/api/file/", repo.resource)
func (ref *Referer) FileEP() string {
curl := ref.urlobj.JoinPath("/v3/api/file/", ref.resource)
return curl.String()
}
func (repo *Referer) FilesEP() string {
curl := repo.urlobj.JoinPath("/v3/api/files/", repo.resource)
func (ref *Referer) FilesEP() string {
curl := ref.urlobj.JoinPath("/v3/api/files/", ref.resource)
return curl.String()
}
func (repo *Referer) CollectionEP() string {
curl := repo.urlobj.JoinPath("/v3/api/collection/", repo.resource)
func (ref *Referer) CollectionEP() string {
curl := ref.urlobj.JoinPath("/v3/api/collection/", ref.resource)
return curl.String()
}
func (repo *Referer) CollectionsEP() string {
curl := repo.urlobj.JoinPath("/v3/api/collections/", repo.resource)
func (ref *Referer) CollectionsEP() string {
curl := ref.urlobj.JoinPath("/v3/api/collections/", ref.resource)
return curl.String()
}
func (repo *Referer) Userinfo() (string, string) {
return repo.user, repo.pass
func (ref *Referer) Userinfo() (string, string) {
return ref.user, ref.pass
}
func (repo *Referer) SetUserinfo(user, pass string) {
func (ref *Referer) SetUserinfo(user, pass string) {
if user != "" && pass != "" {
repo.user, repo.pass = user, pass
ref.user, ref.pass = user, pass
}
}
pkg/repocli/blobexist.go
-2
View File
@@ -27,8 +27,6 @@ func (cli *Client) BlobExists(ctx context.Context, rawrepo string, digest string
return exist, size, err
}
uri := ref.BlobEP(digest)
fmt.Println(uri)
req, err := http.NewRequestWithContext(ctx, http.MethodHead, uri, nil)
if err != nil {
return exist, size, err
pkg/repocli/pushimage.go
+20 -14
View File
@@ -17,7 +17,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)
func (down *Loader) Push(ctx context.Context, rawref, dir, osname, arch string) error {
func (down *Loader) Push(ctx context.Context, dir, rawref, osname, arch string) error {
var err error
ref, err := NewReferer(rawref)
@@ -45,23 +45,29 @@ func (down *Loader) Push(ctx context.Context, rawref, dir, osname, arch string)
layers = append(layers, man.Layers...)
layers = append(layers, man.Config)
for _, layer := range layers {
id, _, err := down.cli.GetUpload(ctx, ref.RawRepo())
if err != nil {
return err
}
digstr := layer.Digest.String()
size, reader, err := imager.LayerReader(ctx, digstr)
exists, _, err := down.cli.BlobExists(ctx, ref.RawRepo(), digstr)
if err != nil {
return err
}
defer reader.Close()
_, err = down.cli.PatchUpload(ctx, ref.RawRepo(), reader, id, size)
if err != nil {
return err
}
_, err = down.cli.PutUpload(ctx, ref.RawRepo(), nil, id, digstr, size)
if err != nil {
return err
if !exists {
id, _, err := down.cli.GetUpload(ctx, ref.RawRepo())
if err != nil {
return err
}
size, reader, err := imager.LayerReader(ctx, digstr)
if err != nil {
return err
}
defer reader.Close()
_, err = down.cli.PatchUpload(ctx, ref.RawRepo(), reader, id, size)
if err != nil {
return err
}
_, err = down.cli.PutUpload(ctx, ref.RawRepo(), nil, id, digstr, size)
if err != nil {
return err
}
}
}
err = down.cli.PutManifest(ctx, ref.Raw(), mandata, mime)
pkg/repocli/pushimage_test.go
+1 -1
View File
@@ -28,7 +28,7 @@ func TestPushImage(t *testing.T) {
load := NewLoader(cli)
require.NotNil(t, load)
err := load.Push(ctx, "localhost:1025/test:v1.0", "test-oci", "", "")
err := load.Push(ctx, "test-oci", "localhost:1025/test:v1.0", "", "")
require.NoError(t, err)
}
//return
pkg/repocli/referer.go
+6
View File
@@ -144,3 +144,9 @@ func (ref *Referer) CatalogEP() string {
func (ref *Referer) Userinfo() (string, string) {
return ref.user, ref.pass
}
func (ref *Referer) SetUserinfo(user, pass string) {
if user != "" && pass != "" {
ref.user, ref.pass = user, pass
}
}