working commit
This commit is contained in:
@@ -154,18 +154,20 @@ func (oper *Operator) PutManifest(ctx context.Context, params *PutManifestParams
|
||||
incomingManifestDescr, incomingLayerDescrs, err := descrsFromManifest(name, reference, incomingManifest, incomingManifestBytes)
|
||||
// Always check layer files for availability
|
||||
var blobError error
|
||||
for _, layer := range incomingLayerDescrs {
|
||||
layerExists, _, err := oper.store.BlobExists(layer.Digest)
|
||||
for _, blobDescr := range incomingLayerDescrs {
|
||||
blobExists, _, err := oper.store.BlobExists(blobDescr.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if !layerExists {
|
||||
err := fmt.Errorf("Layer %s not found.", layer.Digest)
|
||||
if !blobExists {
|
||||
oper.logg.Warningf("Found incomleted blob binary for %s:%s", blobDescr.Name, blobDescr.Digest)
|
||||
err := fmt.Errorf("Layer %s not found.", blobDescr.Digest)
|
||||
blobError = errors.Join(blobError, err)
|
||||
}
|
||||
}
|
||||
if blobError != nil {
|
||||
return res, http.StatusInternalServerError, blobError
|
||||
// TODO: more relevant code?
|
||||
return res, http.StatusFailedDependency, blobError
|
||||
}
|
||||
if !manifestExists {
|
||||
// Store manifest and layesrs data
|
||||
@@ -213,6 +215,21 @@ func (oper *Operator) PutManifest(ctx context.Context, params *PutManifestParams
|
||||
}
|
||||
}
|
||||
|
||||
for _, blobDescr := range incomingLayerDescrs {
|
||||
// TODO: move the requests to db layer transaction
|
||||
blobDescrExists, _, err := oper.mdb.GetBlobByNameDigest(ctx, blobDescr.Name, blobDescr.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if !blobDescrExists {
|
||||
oper.logg.Warningf("Save incomleted blob descriptor for %s:%s", blobDescr.Name, blobDescr.Digest)
|
||||
err = oper.mdb.InsertBlob(ctx, &blobDescr)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
res.Location = fmt.Sprintf(`/v2/%s/manifests/%s`, params.Name, params.Reference)
|
||||
return res, http.StatusCreated, err
|
||||
|
||||
@@ -282,9 +299,21 @@ type DeleteManifestResult struct{}
|
||||
func (oper *Operator) DeleteManifest(ctx context.Context, params *DeleteManifestParams) (*DeleteManifestResult, int, error) {
|
||||
var err error
|
||||
res := &DeleteManifestResult{}
|
||||
manifestDescr := descr.Manifest{}
|
||||
|
||||
if params.Name == "" {
|
||||
err = fmt.Errorf("Empty name")
|
||||
return res, http.StatusBadRequest, err
|
||||
}
|
||||
if params.Reference == "" {
|
||||
err = fmt.Errorf("Empty reference")
|
||||
return res, http.StatusBadRequest, err
|
||||
}
|
||||
|
||||
var exists bool
|
||||
var reference string
|
||||
|
||||
manifestDescr := descr.Manifest{}
|
||||
|
||||
// Check manifest by digest as name
|
||||
if stringLikeSHADigest(params.Reference) {
|
||||
digest := normalizeSHADigest(params.Reference)
|
||||
@@ -354,3 +383,64 @@ func (oper *Operator) deleteManifestObjects(ctx context.Context, name, reference
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
type GetTagsParams struct {
|
||||
Name string
|
||||
}
|
||||
type GetTagsResult struct {
|
||||
TagDescr descr.Tags
|
||||
}
|
||||
|
||||
func (oper *Operator) GetTags(ctx context.Context, params *GetTagsParams) (*GetTagsResult, int, error) {
|
||||
var err error
|
||||
res := &GetTagsResult{
|
||||
TagDescr: descr.Tags{
|
||||
Name: params.Name,
|
||||
Tags: make([]string, 0),
|
||||
},
|
||||
}
|
||||
|
||||
if params.Name == "" {
|
||||
err = fmt.Errorf("Empty name")
|
||||
return res, http.StatusBadRequest, err
|
||||
}
|
||||
manifestDescrs, err := oper.mdb.ListManifestsByName(ctx, params.Name)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
for _, manifestDescr := range manifestDescrs {
|
||||
res.TagDescr.Tags = append(res.TagDescr.Tags, manifestDescr.Reference)
|
||||
}
|
||||
return res, http.StatusOK, err
|
||||
}
|
||||
|
||||
type GetRefererParams struct {
|
||||
Name string
|
||||
Digest string
|
||||
}
|
||||
type GetRefererResult struct {
|
||||
Reference string
|
||||
}
|
||||
|
||||
func (oper *Operator) GetReferer(ctx context.Context, params *GetRefererParams) (*GetRefererResult, int, error) {
|
||||
var err error
|
||||
res := &GetRefererResult{}
|
||||
|
||||
if params.Name == "" {
|
||||
err = fmt.Errorf("Empty name")
|
||||
return res, http.StatusBadRequest, err
|
||||
}
|
||||
if params.Digest == "" {
|
||||
err = fmt.Errorf("Empty digest")
|
||||
return res, http.StatusBadRequest, err
|
||||
}
|
||||
manifests, err := oper.mdb.GetReferer(ctx, params.Name, params.Digest)
|
||||
if err != nil {
|
||||
return res, http.StatusInternalServerError, err
|
||||
}
|
||||
if len(manifests) == 0 {
|
||||
return res, http.StatusNotFound, err
|
||||
}
|
||||
res.Reference = manifests[0].Reference
|
||||
return res, http.StatusOK, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user