fix(conformance): OCI-Filters-Applied should return a literal (projec…

…t-zot#1640) * fix(conformance): OCI-Filters-Applied should return a literal opencontainers/distribution-spec#448 Should only indicate what filter-type was applied and not what exact values it was filtered on. Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com> * ci(conformance): point to temporary repo Revert this commit once upstream changes have been merged Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com> --------- Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>
rchincha · Jul 22, 2023 · de24bd9 · de24bd9
1 parent 46ee330
commit de24bd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/oci-conformance-action.yml b/.github/workflows/oci-conformance-action.yml
@@ -38,8 +38,8 @@ jobs:
       with:
         # TODO: change to upstream once the foloowing PR is merged:
         # https://github.com/opencontainers/distribution-spec/pull/436
-        repository: opencontainers/distribution-spec
-        ref: main
+        repository: rchincha/distribution-spec
+        ref: fix-ref
         path: distribution-spec
     - name: build conformance binary from main
       run: |

diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go
@@ -5924,15 +5924,15 @@ func TestArtifactReferences(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(resp.StatusCode(), ShouldEqual, http.StatusOK)
 				So(resp.Header().Get("Content-Type"), ShouldEqual, ispec.MediaTypeImageIndex)
-				So(resp.Header().Get("OCI-Filters-Applied"), ShouldEqual, artifactType)
+				So(resp.Header().Get("OCI-Filters-Applied"), ShouldEqual, "artifactType")
 
 				resp, err = resty.R().SetQueryParams(map[string]string{"artifactType": artifactType +
 					",otherArtType"}).Get(baseURL + fmt.Sprintf("/v2/%s/referrers/%s", repoName,
 					digest.String()))
 				So(err, ShouldBeNil)
 				So(resp.StatusCode(), ShouldEqual, http.StatusOK)
 				So(resp.Header().Get("Content-Type"), ShouldEqual, ispec.MediaTypeImageIndex)
-				So(resp.Header().Get("OCI-Filters-Applied"), ShouldEqual, artifactType+",otherArtType")
+				So(resp.Header().Get("OCI-Filters-Applied"), ShouldEqual, "artifactType")
 			})
 		})
 	})

diff --git a/pkg/api/routes.go b/pkg/api/routes.go
@@ -624,7 +624,8 @@ func (rh *RouteHandler) GetReferrers(response http.ResponseWriter, request *http
 	}
 
 	if len(artifactTypes) > 0 {
-		response.Header().Set("OCI-Filters-Applied", strings.Join(artifactTypes, ","))
+		// currently, the only filter supported and on this end-point
+		response.Header().Set("OCI-Filters-Applied", "artifactType")
 	}
 
 	zcommon.WriteData(response, http.StatusOK, ispec.MediaTypeImageIndex, out)