list: ListUpdate add Platform field

`c/image` uses `Instance(` API to get the required details of an instance while performing replication `Platform` of instance is needed hence `ListUpdate` must include platform. Needed by: containers#1987 Signed-off-by: Aditya R <[email protected]>
flouthoc · Jul 7, 2023 · 7494bfa · 7494bfa
1 parent 1b8551e
commit 7494bfa
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/internal/manifest/docker_schema2_list.go b/internal/manifest/docker_schema2_list.go
@@ -61,6 +61,13 @@ func (list *Schema2ListPublic) Instance(instanceDigest digest.Digest) (ListUpdat
 				Digest:    manifest.Digest,
 				Size:      manifest.Size,
 				MediaType: manifest.MediaType,
+				platform: imgspecv1.Platform{
+					OS:           manifest.Platform.OS,
+					Architecture: manifest.Platform.Architecture,
+					OSVersion:    manifest.Platform.OSVersion,
+					OSFeatures:   manifest.Platform.OSFeatures,
+					Variant:      manifest.Platform.Variant,
+				},
 			}, nil
 		}
 	}

diff --git a/internal/manifest/docker_schema2_list_test.go b/internal/manifest/docker_schema2_list_test.go
@@ -55,6 +55,8 @@ func TestSchema2ListEditInstances(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, "something", instance.MediaType)
 	assert.Equal(t, int64(32), instance.Size)
+	// platform must match with instance platform set in `v2list.manifest.json` for the first instance
+	assert.Equal(t, imgspecv1.Platform{Architecture: "ppc64le", OS: "linux", OSVersion: "", OSFeatures: []string(nil), Variant: ""}, instance.GetPlatform())
 
 	// Create a fresh list
 	list, err = ListFromBlob(validManifest, GuessMIMEType(validManifest))

diff --git a/internal/manifest/list.go b/internal/manifest/list.go
@@ -68,6 +68,12 @@ type ListUpdate struct {
 	Digest    digest.Digest
 	Size      int64
 	MediaType string
+	platform  imgspecv1.Platform // stores platform for the instance, read-only field
+}
+
+// Allows to access private read-only field `platform`.
+func (listUpdate ListUpdate) GetPlatform() imgspecv1.Platform {
+	return listUpdate.platform
 }
 
 type ListOp int

diff --git a/internal/manifest/oci_index.go b/internal/manifest/oci_index.go
@@ -57,6 +57,7 @@ func (index *OCI1IndexPublic) Instance(instanceDigest digest.Digest) (ListUpdate
 				Digest:    manifest.Digest,
 				Size:      manifest.Size,
 				MediaType: manifest.MediaType,
+				platform:  *manifest.Platform,
 			}, nil
 		}
 	}

diff --git a/internal/manifest/oci_index_test.go b/internal/manifest/oci_index_test.go
@@ -77,6 +77,8 @@ func TestOCI1EditInstances(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, "something", instance.MediaType)
 	assert.Equal(t, int64(32), instance.Size)
+	// platform must match with what was set in `ociv1.image.index.json` for the first instance
+	assert.Equal(t, imgspecv1.Platform{Architecture: "ppc64le", OS: "linux", OSVersion: "", OSFeatures: []string(nil), Variant: ""}, instance.GetPlatform())
 
 	// Create a fresh list
 	list, err = ListFromBlob(validManifest, GuessMIMEType(validManifest))