Skip to content

Commit 20dc55a

Browse files
committed
Simplify OciMetadataFiles createIndex
1 parent 0b23210 commit 20dc55a

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

src/main/kotlin/io/github/sgtsilvio/gradle/oci/image/OciImagesTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ abstract class OciImagesTask : DefaultTask() {
146146
for ((reference, platformToImage) in referenceToPlatformToImage) {
147147
var multiPlatformImageAndReferencesPair = multiPlatformImageAndReferencesPairMap[platformToImage]
148148
if (multiPlatformImageAndReferencesPair == null) {
149-
val index = createIndex(platformToImage)
149+
val index = createIndex(platformToImage.values)
150150
multiPlatformImageAndReferencesPair = Pair(OciMultiPlatformImage(index, platformToImage), ArrayList())
151151
multiPlatformImageAndReferencesPairMap[platformToImage] = multiPlatformImageAndReferencesPair
152152
}

src/main/kotlin/io/github/sgtsilvio/gradle/oci/metadata/OciMetadataFiles.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,8 @@ internal fun createManifest(configDescriptor: OciDescriptor, variants: List<OciV
109109
)
110110
}
111111

112-
internal fun createIndex(platformToImage: Map<Platform, OciImage>): OciData {
112+
internal fun createIndex(images: Collection<OciImage>): OciData {
113113
val indexAnnotations = TreeMap<String, String>()
114-
val images = platformToImage.values
115114
if (images.isNotEmpty()) {
116115
for (indexAnnotation in images.first().variants.last().metadata.indexAnnotations) {
117116
if (images.all { indexAnnotation in it.variants.last().metadata.indexAnnotations.entries }) {
@@ -123,8 +122,8 @@ internal fun createIndex(platformToImage: Map<Platform, OciImage>): OciData {
123122
// sorted for canonical json: annotations, manifests, mediaType, schemaVersion
124123
addObjectIfNotEmpty("annotations", indexAnnotations)
125124
addArray("manifests") {
126-
for ((platform, image) in platformToImage) {
127-
addObject { encodeOciManifestDescriptor(image.manifest, platform) }
125+
for (image in images) {
126+
addObject { encodeOciManifestDescriptor(image.manifest, image.platform) }
128127
}
129128
}
130129
addString("mediaType", INDEX_MEDIA_TYPE)

0 commit comments

Comments
 (0)