Merge pull request #6063 from QiWang19/manifest-annotate

manifest annotate

4 files changed, 78 insertions, 1 deletions

diff --git a/pkg/domain/entities/engine_image.go b/pkg/domain/entities/engine_image.go
index 45686ec79..c46ba815a 100644
--- a/pkg/domain/entities/engine_image.go
+++ b/pkg/domain/entities/engine_image.go
@@ -29,4 +29,5 @@ type ImageEngine interface {
 	ManifestCreate(ctx context.Context, names, images []string, opts ManifestCreateOptions) (string, error)
 	ManifestInspect(ctx context.Context, name string) ([]byte, error)
 	ManifestAdd(ctx context.Context, opts ManifestAddOptions) (string, error)
+	ManifestAnnotate(ctx context.Context, names []string, opts ManifestAnnotateOptions) (string, error)
 }
diff --git a/pkg/domain/entities/manifest.go b/pkg/domain/entities/manifest.go
index 7316735b0..d92b1dc9b 100644
--- a/pkg/domain/entities/manifest.go
+++ b/pkg/domain/entities/manifest.go
@@ -14,3 +14,13 @@ type ManifestAddOptions struct {
 	OSVersion  string   `json:"os_version" schema:"os_version"`
 	Variant    string   `json:"variant" schema:"variant"`
 }
+
+type ManifestAnnotateOptions struct {
+	Annotation []string `json:"annotation"`
+	Arch       string   `json:"arch" schema:"arch"`
+	Features   []string `json:"features" schema:"features"`
+	OS         string   `json:"os" schema:"os"`
+	OSFeatures []string `json:"os_features" schema:"os_features"`
+	OSVersion  string   `json:"os_version" schema:"os_version"`
+	Variant    string   `json:"variant" schema:"variant"`
+}
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index 88331f96c..812507f0a 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -14,6 +14,7 @@ import (
 	libpodImage "github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/util"
+	"github.com/opencontainers/go-digest"
 
 	"github.com/pkg/errors"
 )
@@ -71,7 +72,7 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 	}
 	listImage, err := ir.Libpod.ImageRuntime().NewFromLocal(listImageSpec)
 	if err != nil {
-		return "", errors.Wrapf(err, "error retriving local image from image name %s", listImageSpec)
+		return "", errors.Wrapf(err, "error retrieving local image from image name %s", listImageSpec)
 	}
 
 	manifestAddOpts := libpodImage.ManifestAddOpts{
@@ -100,3 +101,39 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 	}
 	return listID, nil
 }
+
+// ManifestAnnotate updates an entry of the manifest list
+func (ir *ImageEngine) ManifestAnnotate(ctx context.Context, names []string, opts entities.ManifestAnnotateOptions) (string, error) {
+	listImage, err := ir.Libpod.ImageRuntime().NewFromLocal(names[0])
+	if err != nil {
+		return "", errors.Wrapf(err, "error retreiving local image from image name %s", names[0])
+	}
+	digest, err := digest.Parse(names[1])
+	if err != nil {
+		return "", errors.Errorf(`invalid image digest "%s": %v`, names[1], err)
+	}
+	manifestAnnotateOpts := libpodImage.ManifestAnnotateOpts{
+		Arch:       opts.Arch,
+		Features:   opts.Features,
+		OS:         opts.OS,
+		OSFeatures: opts.OSFeatures,
+		OSVersion:  opts.OSVersion,
+		Variant:    opts.Variant,
+	}
+	if len(opts.Annotation) > 0 {
+		annotations := make(map[string]string)
+		for _, annotationSpec := range opts.Annotation {
+			spec := strings.SplitN(annotationSpec, "=", 2)
+			if len(spec) != 2 {
+				return "", errors.Errorf("no value given for annotation %q", spec[0])
+			}
+			annotations[spec[0]] = spec[1]
+		}
+		manifestAnnotateOpts.Annotation = annotations
+	}
+	updatedListID, err := listImage.AnnotateManifest(*ir.Libpod.SystemContext(), digest, manifestAnnotateOpts)
+	if err == nil {
+		return fmt.Sprintf("%s: %s", updatedListID, digest.String()), nil
+	}
+	return "", err
+}
diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go
index 18b400533..3d3196019 100644
--- a/pkg/domain/infra/tunnel/manifest.go
+++ b/pkg/domain/infra/tunnel/manifest.go
@@ -3,6 +3,7 @@ package tunnel
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"github.com/containers/libpod/libpod/image"
@@ -62,3 +63,31 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 	}
 	return listID, nil
 }
+
+// ManifestAnnotate updates an entry of the manifest list
+func (ir *ImageEngine) ManifestAnnotate(ctx context.Context, names []string, opts entities.ManifestAnnotateOptions) (string, error) {
+	manifestAnnotateOpts := image.ManifestAnnotateOpts{
+		Arch:       opts.Arch,
+		Features:   opts.Features,
+		OS:         opts.OS,
+		OSFeatures: opts.OSFeatures,
+		OSVersion:  opts.OSVersion,
+		Variant:    opts.Variant,
+	}
+	if len(opts.Annotation) > 0 {
+		annotations := make(map[string]string)
+		for _, annotationSpec := range opts.Annotation {
+			spec := strings.SplitN(annotationSpec, "=", 2)
+			if len(spec) != 2 {
+				return "", errors.Errorf("no value given for annotation %q", spec[0])
+			}
+			annotations[spec[0]] = spec[1]
+		}
+		manifestAnnotateOpts.Annotation = annotations
+	}
+	updatedListID, err := manifests.Annotate(ctx, names[0], names[1], manifestAnnotateOpts)
+	if err != nil {
+		return updatedListID, errors.Wrapf(err, "error annotating %s of manifest list %s", names[1], names[0])
+	}
+	return fmt.Sprintf("%s :%s", updatedListID, names[1]), nil
+}