Skip to content

Commit

Permalink
add: Annotations to image manifests & index
Browse files Browse the repository at this point in the history 
Signed-off-by: jay-dee7 <[email protected]>
  • Loading branch information
@jay-dee7
jay-dee7 committed Nov 17, 2023
1 parent 5ae8601 commit 7312ff4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 157 deletions.
5 changes: 4 additions & 1 deletion registry/v2/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ func (r *registry) PushImage(ctx echo.Context) error {

// References:
// - https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-manifests
// - https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-manifests-with-subject
// - https://github.com/opencontainers/image-spec/blob/main/manifest.md#image-manifest-property-descriptions
// Method: PUT
// Path: /v2/<namespace>/manifests/<reference>
Expand Down Expand Up @@ -1005,9 +1006,11 @@ func (r *registry) GetRepositoryFromCtx(ctx echo.Context) *types_v2.ContainerIma
return nil
}

// Reference:
// - https://github.com/opencontainers/distribution-spec/blob/main/spec.md#enabling-the-referrers-api
// - https://github.com/opencontainers/distribution-spec/blob/main/spec.md#listing-referrers
func (r *registry) ListReferrers(ctx echo.Context) error {
ctx.Set(types.HandlerStartTime, time.Now())
ctx.Set("start", time.Now())

namespace := ctx.Get(string(RegistryNamespace)).(string)
digest := ctx.Param("digest")
Expand Down
176 changes: 21 additions & 155 deletions store/v2/registry/registry_impl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

v2 "github.com/containerish/OpenRegistry/store/v2"
"github.com/containerish/OpenRegistry/store/v2/types"
"github.com/fatih/color"
"github.com/google/uuid"
oci_digest "github.com/opencontainers/go-digest"
img_spec "github.com/opencontainers/image-spec/specs-go"
Expand Down Expand Up @@ -589,30 +588,17 @@ func (s *registryStore) GetReferrers(
db.
NewSelect().
Model(&manifests).
// WhereOr("COALESCE(subject_digest, '') = '' AND digest = ?", digest).
// WhereOr("subject_digest = ?", digest)

WhereGroup(" OR ", func(sq *bun.SelectQuery) *bun.SelectQuery {
return sq.Where("subject_digest = ?", digest)
// return sq.WhereOr("COALESCE(subject_digest, '') = '' AND digest = ?", digest).
// WhereOr("subject_digest = ?", digest)
})

if len(artifactTypes) > 0 {
// q.
// WhereOr("artifact_type IN (?)", bun.In(artifactTypes)).
// WhereOr("COALESCE(artifact_type, '') = '' AND config_media_type IN (?)", bun.In(artifactTypes))

q.WhereGroup(" AND ", func(sq *bun.SelectQuery) *bun.SelectQuery {
return sq.WhereOr("artifact_type IN (?)", bun.In(artifactTypes)).
WhereOr("COALESCE(artifact_type, '') = '' AND config_media_type IN (?)", bun.In(artifactTypes))
})

// WhereOr("artifact_type = '' AND config_artifact_type IN (?)", bun.In(artifactTypes))
}

color.Magenta("query: %s", q.String())

q.
Relation("Repository", func(sq *bun.SelectQuery) *bun.SelectQuery {
return sq.ExcludeColumn("*").Where("name = ?", repoName)
Expand All @@ -625,99 +611,6 @@ func (s *registryStore) GetReferrers(
return imgIndex, err
}

// q := s.
// db.
// NewSelect().
// Model(&manifestList)
//
// // Find OCI Distribution Spec < 1.1 manifests to provide backword compatibility
// // Reference - https://github.com/opencontainers/distribution-spec/blob/main/spec.md#enabling-the-referrers-api
// q.WhereGroup(" OR ", func(sq *bun.SelectQuery) *bun.SelectQuery {
// return sq.
// // for all new manifests with subject (OCI v1.1+), we set subject digest and manifest artifactType values
// Where("subject_digest = '' AND artifact_type = '' AND digest = ?", digest)
// }).WhereGroup(" OR ", func(sq *bun.SelectQuery) *bun.SelectQuery {
// return sq.Where("subject_digest = ?", digest)
// })
//
// if len(artifactTypes) > 0 {
// q.WhereGroup(" AND ", func(sq *bun.SelectQuery) *bun.SelectQuery {
// return sq.Where("artifact_type in (?) or artifact_type = ''", bun.In(artifactTypes))
// })
// }

// color.Magenta("GetReferrers: oldManifestsQuery: %s", oldMfQ.String())
// color.Magenta("GetReferrers: newManifestsQuery: %s", newMfQ.String())
// q.Relation("Repository", func(sq *bun.SelectQuery) *bun.SelectQuery {
// return sq.ExcludeColumn("*").Where("name = ?", repoName)
// }).Relation("User", func(sq *bun.SelectQuery) *bun.SelectQuery {
// return sq.Where("username = ?", username).ExcludeColumn("*")
// })

// eChan := make(chan error)
// go func() {
// wg.Wait()
// close(eChan)
// }()
//
// go func() {
// defer wg.Done()
// if err := oldMfQ.Scan(ctx); err != nil {
// eChan <- err
// return
// }
// }()
//
// go func() {
// defer wg.Done()
// if err := newMfQ.Scan(ctx); err != nil {
// eChan <- err
// return
// }
// }()
//
// mErr := &multierror.Error{}
// for err := range eChan {
// if err != nil {
// mErr.Errors = append(mErr.Errors, err)
// }
// }
// if mErr.ErrorOrNil() != nil {
// return imgIndex, mErr
// }

// obz, _ := json.MarshalIndent(oldManifests, "", "\t")
// nbz, _ := json.MarshalIndent(manifests, "", "\t")
// color.Blue("OldManifests: \n%s\nNewManifests: \n%s", obz, nbz)

// seenMap := map[string]struct{}{}
// for _, m := range append(oldManifests, newManifests...) {
//
// mapKey := fmt.Sprintf("%s_%s", m.MediaType, m.Digest)
//
// if m.Subject != nil {
// mapKey = fmt.Sprintf("%s_%s_%s", m.MediaType, m.Digest, m.Subject.MediaType)
// } else if m.Config != nil {
// mapKey = fmt.Sprintf("%s_%s", m.Config.MediaType, m.Config.Digest)
// }
// if _, ok := seenMap[mapKey]; ok {
// continue
// }
// if m.Subject != nil {
// seenMap[mapKey] = struct{}{}
// subjectList = append(subjectList, m.Subject)
// continue
// }
//
// seenMap[mapKey] = struct{}{}
// subjectList = append(subjectList, &types.OCIDescriptor{
// MediaType: m.MediaType,
// Digest: oci_digest.FromString(m.Digest),
// Size: int64(m.Size),
// })
// }

// combinedManifests := append(oldManifests, manifests...)
var descriptors []img_spec_v1.Descriptor

for _, m := range manifests {
Expand All @@ -727,64 +620,37 @@ func (s *registryStore) GetReferrers(
continue
}

if !s.descriptorFound(descriptors, d.String()) {
if m.Subject != nil {
descriptors = append(descriptors, img_spec_v1.Descriptor{
MediaType: m.MediaType,
Digest: d,
Size: int64(m.Size),
ArtifactType: m.ArtifactType,
})
} else {
if m.ArtifactType == "" {
m.ArtifactType = m.Config.MediaType
}
//
//
// artifactType := m.ArtifactType
// if artifactType == "" {
// artifactType = m.Config.ArtifactType
// }

descriptors = append(descriptors, img_spec_v1.Descriptor{
MediaType: m.MediaType,
Digest: d,
Size: int64(m.Size),
ArtifactType: m.ArtifactType,
})
if m.Subject != nil {
descriptor := img_spec_v1.Descriptor{
MediaType: m.MediaType,
Digest: d,
Size: int64(m.Size),
ArtifactType: m.ArtifactType,
Annotations: m.Annotations,
}

descriptors = append(descriptors, descriptor)
} else {
if m.ArtifactType == "" {
m.ArtifactType = m.Config.MediaType
}
descriptor := img_spec_v1.Descriptor{
MediaType: m.MediaType,
Digest: d,
Size: int64(m.Size),
ArtifactType: m.ArtifactType,
Annotations: m.Annotations,
}

descriptors = append(descriptors, descriptor)
}

// switch m.MediaType {
// case img_spec_v1.MediaTypeImageManifest:
// case img_spec_v1.MediaTypeImageIndex:
// descriptors = append(descriptors, img_spec_v1.Descriptor{
// Annotations: m.Subject.Annotations,
// MediaType: m.MediaType,
// Digest: oci_digest.FromString(m.Digest),
// Size: int64(m.Size),
// ArtifactType: m.ArtifactType,
// })
// default:
// color.Red("----------------------------- FOUND_INVALID_MEDIA_TYPE -------------------------------------")
// }
}

imgIndex.Manifests = descriptors
return imgIndex, nil
}

func (s *registryStore) descriptorFound(descriptors []img_spec_v1.Descriptor, digest string) bool {
for _, d := range descriptors {
if d.Digest.String() == digest {
return true
}
}

return false
}

func (s *registryStore) GetImageSizeByLayerIds(ctx context.Context, layerIDs []string) (uint64, error) {
var size uint64
err := s.
Expand Down
3 changes: 2 additions & 1 deletion store/v2/types/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ type (
User *User `bun:"rel:belongs-to,join:owner_id=id" json:"-"`
Subject *img_spec_v1.Descriptor `bun:"embed:subject_" json:"subject,omitempty"`
Config *img_spec_v1.Descriptor `bun:"embed:config_" json:"config"`
Reference string `bun:"reference,notnull" json:"reference"`
Annotations map[string]string `bun:"annotations,type:jsonb" json:"annotations,omitempty"`
Digest string `bun:"digest,notnull" json:"digest"`
MediaType string `bun:"media_type,notnull" json:"mediaType"`
ArtifactType string `bun:"artifact_type" json:"artifactType,omitempty"`
Reference string `bun:"reference,notnull" json:"reference"`
Layers ImageManifestLayers `bun:"layers,type:jsonb" json:"layers"`
SchemaVersion int `bun:"schema_version,notnull" json:"schemaVersion"`
Size uint64 `bun:"size,notnull" json:"size"`
Expand Down

0 comments on commit 7312ff4

Please sign in to comment.