[WIP] Add tag parameter tests

This also reworks passing push and pull API options per digest.

Signed-off-by: Brandon Mitchell <git@bmitch.net>

Author: sudo-bmitch

conformance/README.md

@@ -41,6 +41,7 @@ export OCI_API_BLOBS_UPLOAD_CANCEL=false # cancel a running upload
 export OCI_API_MANIFESTS_ATOMIC=true # whether manifest delete operations should be immediate
 export OCI_API_MANIFESTS_DELETE=true
 export OCI_API_MANIFESTS_DIGEST_HEADER=false # whether Docker-Content-Digest header is required
+export OCI_API_MANIFESTS_TAG_PARAM=false # push manifest by digest with tags as parameters
 export OCI_API_TAGS_ATOMIC=true # whether tag delete operations should be immediate
 export OCI_API_TAGS_DELETE=true
 export OCI_API_TAGS_LIST=true
@@ -105,6 +106,7 @@ apis:
     atomic: true
     delete: true
     digestHeader: false
+    tagParam: false
   tags:
     atomic: true
     delete: true

conformance/api.go

@@ -920,7 +920,7 @@ func (a *api) ManifestHeadExists(registry, repo, ref string, dig digest.Digest,
 	return errors.Join(errs...)
 }
 
-func (a *api) ManifestPut(registry, repo, ref string, dig digest.Digest, td *testData, referrersEnabled bool, opts ...apiDoOpt) error {
+func (a *api) ManifestPut(registry, repo, ref string, dig digest.Digest, td *testData, referrersEnabled bool, putOpts []apiDoOpt, opts ...apiDoOpt) error {
 	flags := a.GetFlags(opts...)
 	bodyBytes, ok := td.manifests[dig]
 	if !ok {
@@ -933,16 +933,16 @@ func (a *api) ManifestPut(registry, repo, ref string, dig digest.Digest, td *tes
 	mediaType := detectMediaType(bodyBytes)
 	resp := http.Response{Header: http.Header{}}
 	loc := ""
-	var putOpts []apiDoOpt
+	putOpts = append(putOpts, opts...)
 	if flags["ExpectBadDigest"] {
 		putOpts = append([]apiDoOpt{
 			apiExpectStatus(http.StatusBadRequest),
-		}, opts...)
+		}, putOpts...)
 	} else {
 		putOpts = append([]apiDoOpt{
 			apiExpectStatus(http.StatusCreated),
 			apiReturnHeader("Location", &loc),
-		}, opts...)
+		}, putOpts...)
 	}
 	if referrersEnabled {
 		// if the referrers API is being tested, verify OCI-Subject header is returned when appropriate
@@ -1170,7 +1170,7 @@ func apiWithURLParam(key, val string) apiDoOpt {
 				return fmt.Errorf("URL must be set before adding a parameter")
 			}
 			params := req.URL.Query()
-			params.Set(key, val)
+			params.Add(key, val)
 			req.URL.RawQuery = params.Encode()
 			return nil
 		},
@@ -1243,13 +1243,13 @@ func apiExpectBody(bodyExpect []byte) apiDoOpt {
 func apiExpectHeader(key, val string) apiDoOpt {
 	return apiDoOpt{
 		respFn: func(resp *http.Response) error {
-			cur := resp.Header.Get(key)
+			cur := resp.Header.Values(key)
 			if val == "" {
-				if cur == "" {
+				if len(cur) == 0 {
 					return fmt.Errorf("missing header %q", key)
 				}
 			} else {
-				if cur != val {
+				if !slices.Contains(cur, val) {
 					return fmt.Errorf("header value mismatch for %q, expected %q, received %q", key, val, cur)
 				}
 			}

conformance/config.go

@@ -75,6 +75,7 @@ type configManifests struct {
 	Atomic       bool `conformance:"ATOMIC" yaml:"atomic"`
 	Delete       bool `conformance:"DELETE" yaml:"delete"`
 	DigestHeader bool `conformance:"DIGEST_HEADER" yaml:"digestHeader"`
+	TagParam     bool `conformance:"TAG_PARAM" yaml:"tagParam"`
 }
 
 type configTags struct {
@@ -167,6 +168,7 @@ func configLoad() (config, error) {
 				Atomic:       true,
 				Delete:       true,
 				DigestHeader: false,
+				TagParam:     false,
 			},
 			Tags: configTags{
 				Atomic: true,
@@ -198,6 +200,7 @@ func configLoad() (config, error) {
 		c.APIs.Blobs.UploadCancel = true
 		c.APIs.Blobs.DigestHeader = true
 		c.APIs.Manifests.DigestHeader = true
+		c.APIs.Manifests.TagParam = true
 		c.Version = "1.1+dev"
 	case "", "stable", "1.1":
 		c.Version = "1.1"

conformance/main.go

@@ -78,6 +78,7 @@ func mainRun(legacy bool) {
 		fmt.Fprintf(os.Stderr, "WARNING: \"go test\" is deprecated. Please update to using \"go build\".\n")
 	}
 	if r.Results.Status != statusPass {
+		fmt.Fprintf(os.Stderr, "*** Conformance test detected a failure. ***\n")
 		os.Exit(1)
 	}
 }