[WIP] Artifact with empty json layer

Signed-off-by: Brandon Mitchell <[email protected]>

Author: sudo-bmitch

conformance2/run.go

@@ -232,6 +232,25 @@ func (r *runner) GenerateData() error {
 			return fmt.Errorf("failed to generate test data: %w", err)
 		}
 	}
+	// artifact without layers
+	if r.Config.Data.Artifact {
+		tdName = "artifact-without-layers"
+		r.State.Data[tdName] = newTestData("Artifact without Layers")
+		r.State.DataStatus[tdName] = statusUnknown
+		dataTests = append(dataTests, tdName)
+		_, err = r.State.Data[tdName].genManifestFull(
+			genWithTag("artifact-without-layers"),
+			genWithArtifactType(mtExampleConf),
+			genWithConfigMediaType(mtOCIEmptyJSON),
+			genWithConfigBytes([]byte("{}")),
+			genWithLayerCount(1),
+			genWithLayerBytes([]byte("{}")),
+			genWithLayerMediaType(mtOCIEmptyJSON),
+		)
+		if err != nil {
+			return fmt.Errorf("failed to generate test data: %w", err)
+		}
+	}
 	// image and two referrers
 	if r.Config.Data.Subject {
 		tdName = "artifacts-with-subject"

conformance2/testdata.go

@@ -73,6 +73,7 @@ type genOptS struct {
 	configMediaType     string
 	descriptorMediaType string
 	extraField          bool
+	layerBytes          []byte
 	layerCount          int
 	layerMediaType      string
 	platform            image.Platform
@@ -149,6 +150,13 @@ func genWithExtraField() genOpt {
 		opt.extraField = true
 	}
 }
+
+func genWithLayerBytes(b []byte) genOpt {
+	return func(opt *genOptS) {
+		opt.layerBytes = b
+	}
+}
+
 func genWithLayerCount(count int) genOpt {
 	return func(opt *genOptS) {
 		opt.layerCount = count
@@ -437,12 +445,21 @@ func (td *testData) genManifestFull(opts ...genOpt) (digest.Digest, error) {
 				genWithDescriptorMediaType(gOpt.layerMediaType),
 			}
 			lOpts = append(lOpts, opts...)
-			dig, _, err := td.genBlob(lOpts...)
-			if err != nil {
-				return "", fmt.Errorf("failed to generate test artifact blob: %w", err)
+			if gOpt.layerBytes != nil {
+				dig, err := td.addBlob(gOpt.layerBytes, lOpts...)
+				if err != nil {
+					return "", fmt.Errorf("failed to generate test artifact layer: %w", err)
+				}
+				digCList = append(digCList, dig)
+				digUCList = append(digUCList, dig)
+			} else {
+				dig, _, err := td.genBlob(lOpts...)
+				if err != nil {
+					return "", fmt.Errorf("failed to generate test artifact blob: %w", err)
+				}
+				digCList = append(digCList, dig)
+				digUCList = append(digUCList, dig)
 			}
-			digCList = append(digCList, dig)
-			digUCList = append(digUCList, dig)
 		}
 	}
 	cDig := digest.Digest("")