set binding tests to required

some small fix ups for binding tests and then make them required.

update containers-common

V2 bindings tests were failing because of changes introduced in commit
a2ad5bb.

Fix some typos.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

in the case where the specgen attribute for Env and Labels are nil, we should should then make the map IF we have labels and envs that need to be added.

Signed-off-by: Brent Baude <bbaude@redhat.com>

1 files changed, 26 insertions, 24 deletions

diff --git a/pkg/domain/infra/tunnel/manifest.go b/pkg/domain/infra/tunnel/manifest.go
index 7d9a0fce1..9c1f5349a 100644
--- a/pkg/domain/infra/tunnel/manifest.go
+++ b/pkg/domain/infra/tunnel/manifest.go
@@ -64,32 +64,34 @@ func (ir *ImageEngine) ManifestAdd(ctx context.Context, opts entities.ManifestAd
 	return listID, nil
 }
 
+// FIXME There is no endpoint for annotate and therefor this code is currently invalid
 // 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
+	return "", errors.New("not implemented")
+	//	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
 }
 
 // ManifestRemove removes the digest from manifest list