Skip to content

Commit

Permalink
refactor: UUID & registry error response functions
Browse files Browse the repository at this point in the history
Signed-off-by: jay-dee7 <[email protected]>
  • Loading branch information
jay-dee7 committed Nov 26, 2023
1 parent 40173b3 commit b1f5c39
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 130 deletions.
10 changes: 5 additions & 5 deletions registry/v2/blobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (b *blobs) HEAD(ctx echo.Context) error {
return echoErr
}

metadata, err := b.registry.dfs.Metadata(GetLayerIdentifier(layerRef.ID))
metadata, err := b.registry.dfs.Metadata(layerRef)
if err != nil {
details := echo.Map{
"error": err.Error(),
Expand Down Expand Up @@ -80,8 +80,8 @@ func (b *blobs) UploadBlob(ctx echo.Context) error {
namespace := ctx.Get(string(RegistryNamespace)).(string)
contentRange := ctx.Request().Header.Get("Content-Range")
identifier := ctx.Param("uuid")
layerKey := GetLayerIdentifierFromTrakcingID(identifier)
uploadID := GetUploadIDFromTrakcingID(identifier)
layerKey := types.GetLayerIdentifierFromTrakcingID(identifier)
uploadID := types.GetUploadIDFromTrakcingID(identifier)

// upload the first chunk for the layer
if contentRange == "" || strings.HasPrefix(contentRange, "0-") {
Expand Down Expand Up @@ -109,7 +109,7 @@ func (b *blobs) UploadBlob(ctx echo.Context) error {
part, err := b.registry.dfs.UploadPart(
ctx.Request().Context(),
uploadID,
GetLayerIdentifier(layerKey),
types.GetLayerIdentifier(layerKey),
digest.String(),
b.blobCounter[uploadID],
bytes.NewReader(buf.Bytes()),
Expand Down Expand Up @@ -176,7 +176,7 @@ func (b *blobs) UploadBlob(ctx echo.Context) error {
part, err := b.registry.dfs.UploadPart(
ctx.Request().Context(),
uploadID,
GetLayerIdentifier(layerKey),
types.GetLayerIdentifier(layerKey),
digest.String(),
b.blobCounter[uploadID],
bytes.NewReader(buf.Bytes()),
Expand Down
21 changes: 0 additions & 21 deletions registry/v2/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,9 @@ package registry

import (
"context"
"encoding/json"
"fmt"

"github.com/containerish/OpenRegistry/types"
"github.com/fatih/color"
)

func (r *registry) errorResponse(code, msg string, detail map[string]interface{}) []byte {
var err types.RegistryErrors

err.Errors = append(err.Errors, types.RegistryError{
Code: code,
Message: msg,
Detail: detail,
})

bz, e := json.Marshal(err)
if e != nil {
color.Red("error marshalling error response: %w", err)
}

return bz
}

func (r *registry) getDownloadableURLFromDFSLink(s string) (string, error) {
presignedUrl, err := r.dfs.GeneratePresignedURL(context.Background(), s)
if err != nil {
Expand Down
Loading

0 comments on commit b1f5c39

Please sign in to comment.