Skip to content

Commit

Permalink
Rename MultiArch -> MultiPlatform
Browse files Browse the repository at this point in the history
  • Loading branch information
@SgtSilvio
SgtSilvio committed Jul 16, 2024
1 parent 6485587 commit 391b77f
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 57 deletions.
30 changes: 15 additions & 15 deletions src/main/kotlin/io/github/sgtsilvio/gradle/oci/OciImagesTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ data class OciVariantInput(
@get:InputFiles @get:PathSensitive(PathSensitivity.NONE) val layerFiles: List<File>,
)

internal class OciMultiArchImage(
internal class OciMultiPlatformImage(
val index: OciData,
val platformToImage: Map<Platform, OciImage>,
)
Expand Down Expand Up @@ -71,16 +71,16 @@ abstract class OciImagesTask : DefaultTask() {
protected fun run() {
val imageInputs: Set<OciImageInput> = images.get()
val imageAndReferencesPairs = createImageAndReferencesPairs(imageInputs)
val multiArchImageAndReferencesPairs = createMultiArchImageAndReferencesPairs(imageAndReferencesPairs)
val multiPlatformImageAndReferencesPairs = createMultiPlatformImageAndReferencesPairs(imageAndReferencesPairs)
val images = imageAndReferencesPairs.map { it.first }
val digestToLayerFile = collectDigestToLayerFile(images)
run(digestToLayerFile, images, multiArchImageAndReferencesPairs)
run(digestToLayerFile, images, multiPlatformImageAndReferencesPairs)
}

internal abstract fun run( // TODO internal? protected?
digestToLayerFile: Map<OciDigest, File>,
images: List<OciImage>,
multiArchImageAndReferencesPairs: List<Pair<OciMultiArchImage, List<OciImageReference>>>,
multiPlatformImageAndReferencesPairs: List<Pair<OciMultiPlatformImage, List<OciImageReference>>>,
)

private fun createImageAndReferencesPairs(
Expand Down Expand Up @@ -124,9 +124,9 @@ abstract class OciImagesTask : DefaultTask() {
return OciVariant(metadata, layers)
}

private fun createMultiArchImageAndReferencesPairs(
private fun createMultiPlatformImageAndReferencesPairs(
imageAndReferencesPairs: Iterable<Pair<OciImage, Set<OciImageReference>>>,
): List<Pair<OciMultiArchImage, List<OciImageReference>>> {
): List<Pair<OciMultiPlatformImage, List<OciImageReference>>> {
// referenceToPlatformToImage map is linked because it will be iterated
// platformToImage map is linked to preserve the platform order
val referenceToPlatformToImage = LinkedHashMap<OciImageReference, LinkedHashMap<Platform, OciImage>>()
Expand All @@ -140,19 +140,19 @@ abstract class OciImagesTask : DefaultTask() {
}
}
}
// multiArchImageAndReferencesPairMap is linked because it will be iterated
val multiArchImageAndReferencesPairMap =
LinkedHashMap<Map<Platform, OciImage>, Pair<OciMultiArchImage, ArrayList<OciImageReference>>>() // TODO reference non multi arch images?
// multiPlatformImageAndReferencesPairMap is linked because it will be iterated
val multiPlatformImageAndReferencesPairMap =
LinkedHashMap<Map<Platform, OciImage>, Pair<OciMultiPlatformImage, ArrayList<OciImageReference>>>() // TODO reference non multi arch images?
for ((reference, platformToImage) in referenceToPlatformToImage) {
var multiArchImageAndReferencesPair = multiArchImageAndReferencesPairMap[platformToImage]
if (multiArchImageAndReferencesPair == null) {
var multiPlatformImageAndReferencesPair = multiPlatformImageAndReferencesPairMap[platformToImage]
if (multiPlatformImageAndReferencesPair == null) {
val index = createIndex(platformToImage)
multiArchImageAndReferencesPair = Pair(OciMultiArchImage(index, platformToImage), ArrayList()) // TODO ArrayList
multiArchImageAndReferencesPairMap[platformToImage] = multiArchImageAndReferencesPair
multiPlatformImageAndReferencesPair = Pair(OciMultiPlatformImage(index, platformToImage), ArrayList()) // TODO ArrayList
multiPlatformImageAndReferencesPairMap[platformToImage] = multiPlatformImageAndReferencesPair
}
multiArchImageAndReferencesPair.second += reference
multiPlatformImageAndReferencesPair.second += reference
}
return multiArchImageAndReferencesPairMap.values.toList()
return multiPlatformImageAndReferencesPairMap.values.toList()
}

private fun collectDigestToLayerFile(images: List<OciImage>): Map<OciDigest, File> {
Expand Down
10 changes: 5 additions & 5 deletions src/main/kotlin/io/github/sgtsilvio/gradle/oci/OciPushTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ abstract class OciPushTask @Inject constructor(private val workerExecutor: Worke
protected fun setRegistryCredentialsId(credentialsId: String) =
registry.credentials.set(project.providers.passwordCredentials(credentialsId))

override fun run(
final override fun run(
digestToLayerFile: Map<OciDigest, File>,
images: List<OciImage>,
multiArchImageAndReferencesPairs: List<Pair<OciMultiArchImage, List<OciImageReference>>>,
multiPlatformImageAndReferencesPairs: List<Pair<OciMultiPlatformImage, List<OciImageReference>>>,
) {
val context = Context(
pushService,
Expand All @@ -102,10 +102,10 @@ abstract class OciPushTask @Inject constructor(private val workerExecutor: Worke
)

val blobs = HashMap<OciDigest, Blob>()
for ((multiArchImage, imageReferences) in multiArchImageAndReferencesPairs) {
for ((multiPlatformImage, imageReferences) in multiPlatformImageAndReferencesPairs) {
for ((imageName, tags) in imageReferences.groupByTo(HashMap(), { it.name }, { it.tag })) {
val manifestFutures = mutableListOf<CompletableFuture<Unit>>()
for (image in multiArchImage.platformToImage.values) {
for (image in multiPlatformImage.platformToImage.values) {
val blobFutures = mutableListOf<CompletableFuture<Unit>>()
for (variant in image.variants) {
for (layer in variant.layers) {
Expand Down Expand Up @@ -171,7 +171,7 @@ abstract class OciPushTask @Inject constructor(private val workerExecutor: Worke
)
}
}
val index = multiArchImage.index
val index = multiPlatformImage.index
for (tag in tags) {
CompletableFuture.allOf(*manifestFutures.toTypedArray()).thenRun {
context.pushService.get()
Expand Down
12 changes: 6 additions & 6 deletions src/main/kotlin/io/github/sgtsilvio/gradle/oci/OciRegistryDataTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ abstract class OciRegistryDataTask : OciImagesTask() {
@get:OutputDirectory
val registryDataDirectory: DirectoryProperty = project.objects.directoryProperty()

override fun run(
final override fun run(
digestToLayerFile: Map<OciDigest, File>,
images: List<OciImage>,
multiArchImageAndReferencesPairs: List<Pair<OciMultiArchImage, List<OciImageReference>>>,
multiPlatformImageAndReferencesPairs: List<Pair<OciMultiPlatformImage, List<OciImageReference>>>,
) {
val registryDataDirectory = registryDataDirectory.get().asFile.toPath().ensureEmptyDirectory()
val blobsDirectory = registryDataDirectory.resolve("blobs").createDirectory()
Expand All @@ -35,15 +35,15 @@ abstract class OciRegistryDataTask : OciImagesTask() {
blobsDirectory.writeDigestData(image.config.data)
blobsDirectory.writeDigestData(image.manifest.data)
}
for ((multiArchImage, imageReferences) in multiArchImageAndReferencesPairs) {
blobsDirectory.writeDigestData(multiArchImage.index)
for ((multiPlatformImage, imageReferences) in multiPlatformImageAndReferencesPairs) {
blobsDirectory.writeDigestData(multiPlatformImage.index)
for ((name, tags) in imageReferences.groupBy({ it.name }, { it.tag })) {
val repositoryDirectory = repositoriesDirectory.resolve(name).createDirectories()
val layersDirectory = repositoryDirectory.resolve("_layers").createDirectories()
val manifestsDirectory = repositoryDirectory.resolve("_manifests").createDirectories()
val manifestRevisionsDirectory = manifestsDirectory.resolve("revisions").createDirectories()
val blobDigests = LinkedHashSet<OciDigest>()
for (image in multiArchImage.platformToImage.values) {
for (image in multiPlatformImage.platformToImage.values) {
manifestRevisionsDirectory.writeDigestLink(image.manifest.digest)
blobDigests += image.config.digest
for (variant in image.variants) {
Expand All @@ -55,7 +55,7 @@ abstract class OciRegistryDataTask : OciImagesTask() {
for (blobDigest in blobDigests) {
layersDirectory.writeDigestLink(blobDigest)
}
val indexDigest = multiArchImage.index.digest
val indexDigest = multiPlatformImage.index.digest
manifestRevisionsDirectory.writeDigestLink(indexDigest)
for (tag in tags) {
val tagDirectory = manifestsDirectory.resolve("tags").resolve(tag).createDirectories()
Expand Down
44 changes: 22 additions & 22 deletions src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciImageMetadataRegistry.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,39 @@ import java.util.*
*/
internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {

fun pullMultiArchImageMetadata(
fun pullMultiPlatformImageMetadata(
registry: String,
imageReference: OciImageReference,
credentials: Credentials?,
): Mono<OciMultiArchImageMetadata> =
): Mono<OciMultiPlatformImageMetadata> =
registryApi.pullManifest(registry, imageReference.name, imageReference.tag.replaceFirst('!', ':'), credentials)
.transformToMultiArchImageMetadata(registry, imageReference, credentials)
.transformToMultiPlatformImageMetadata(registry, imageReference, credentials)

fun pullMultiArchImageMetadata(
fun pullMultiPlatformImageMetadata(
registry: String,
imageReference: OciImageReference,
digest: OciDigest,
size: Int,
credentials: Credentials?,
): Mono<OciMultiArchImageMetadata> =
): Mono<OciMultiPlatformImageMetadata> =
registryApi.pullManifest(registry, imageReference.name, digest, size, credentials)
.transformToMultiArchImageMetadata(registry, imageReference, credentials)
.transformToMultiPlatformImageMetadata(registry, imageReference, credentials)

private fun Mono<OciData>.transformToMultiArchImageMetadata(
private fun Mono<OciData>.transformToMultiPlatformImageMetadata(
registry: String,
imageReference: OciImageReference,
credentials: Credentials?,
): Mono<OciMultiArchImageMetadata> = flatMap { manifest ->
transformToMultiArchImageMetadata(registry, imageReference, manifest, credentials)
): Mono<OciMultiPlatformImageMetadata> = flatMap { manifest ->
transformToMultiPlatformImageMetadata(registry, imageReference, manifest, credentials)
}

private fun transformToMultiArchImageMetadata(
private fun transformToMultiPlatformImageMetadata(
registry: String,
imageReference: OciImageReference,
manifest: OciData,
credentials: Credentials?,
): Mono<OciMultiArchImageMetadata> = when (manifest.mediaType) {
INDEX_MEDIA_TYPE -> transformIndexToMultiArchImageMetadata(
): Mono<OciMultiPlatformImageMetadata> = when (manifest.mediaType) {
INDEX_MEDIA_TYPE -> transformIndexToMultiPlatformImageMetadata(
registry,
imageReference,
manifest,
Expand All @@ -55,7 +55,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
LAYER_MEDIA_TYPE_PREFIX,
)

MANIFEST_MEDIA_TYPE -> transformManifestToMultiArchImageMetadata(
MANIFEST_MEDIA_TYPE -> transformManifestToMultiPlatformImageMetadata(
registry,
imageReference,
manifest,
Expand All @@ -64,7 +64,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
LAYER_MEDIA_TYPE_PREFIX,
)

DOCKER_MANIFEST_LIST_MEDIA_TYPE -> transformIndexToMultiArchImageMetadata(
DOCKER_MANIFEST_LIST_MEDIA_TYPE -> transformIndexToMultiPlatformImageMetadata(
registry,
imageReference,
manifest,
Expand All @@ -74,7 +74,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
DOCKER_LAYER_MEDIA_TYPE,
)

DOCKER_MANIFEST_MEDIA_TYPE -> transformManifestToMultiArchImageMetadata(
DOCKER_MANIFEST_MEDIA_TYPE -> transformManifestToMultiPlatformImageMetadata(
registry,
imageReference,
manifest,
Expand All @@ -86,15 +86,15 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
else -> throw IllegalStateException("unsupported manifest media type '${manifest.mediaType}'")
}

private fun transformIndexToMultiArchImageMetadata(
private fun transformIndexToMultiPlatformImageMetadata(
registry: String,
imageReference: OciImageReference,
index: OciData,
credentials: Credentials?,
manifestMediaType: String,
configMediaType: String,
layerMediaTypePrefix: String,
): Mono<OciMultiArchImageMetadata> {
): Mono<OciMultiPlatformImageMetadata> {
val indexJsonObject = jsonObject(String(index.bytes))
val indexAnnotations = indexJsonObject.getStringMapOrEmpty("annotations")
val metadataMonoList = indexJsonObject.get("manifests") {
Expand Down Expand Up @@ -141,17 +141,17 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
throw IllegalStateException("duplicate platform in image index: $platform")
}
}
.map { OciMultiArchImageMetadata(it, index.digest, index.bytes.size) }
.map { OciMultiPlatformImageMetadata(it, index.digest, index.bytes.size) }
}

private fun transformManifestToMultiArchImageMetadata(
private fun transformManifestToMultiPlatformImageMetadata(
registry: String,
imageReference: OciImageReference,
manifest: OciData,
credentials: Credentials?,
configMediaType: String,
layerMediaTypePrefix: String,
): Mono<OciMultiArchImageMetadata> = transformManifestToImageMetadata(
): Mono<OciMultiPlatformImageMetadata> = transformManifestToImageMetadata(
registry,
imageReference,
manifest,
Expand All @@ -160,7 +160,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
credentials,
configMediaType,
layerMediaTypePrefix,
).map { OciMultiArchImageMetadata(mapOf(it), manifest.digest, manifest.bytes.size) }
).map { OciMultiPlatformImageMetadata(mapOf(it), manifest.digest, manifest.bytes.size) }

private fun transformManifestToImageMetadata(
registry: String,
Expand Down Expand Up @@ -358,7 +358,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
}
}

internal class OciMultiArchImageMetadata(
internal class OciMultiPlatformImageMetadata(
val platformToMetadata: Map<Platform, OciMetadata>,
val digest: OciDigest,
val size: Int,
Expand Down
18 changes: 9 additions & 9 deletions src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciRepositoryHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ internal class OciRepositoryHandler(
private val credentials: Credentials?,
) : BiFunction<HttpServerRequest, HttpServerResponse, Publisher<Void>> {

private val imageMetadataCache: AsyncCache<ImageMetadataCacheKey, OciMultiArchImageMetadata> =
private val imageMetadataCache: AsyncCache<ImageMetadataCacheKey, OciMultiPlatformImageMetadata> =
Caffeine.newBuilder().maximumSize(100).expireAfterAccess(1, TimeUnit.MINUTES).buildAsync()

private data class ImageMetadataCacheKey(
Expand Down Expand Up @@ -120,7 +120,7 @@ internal class OciRepositoryHandler(
)
val componentId = ociImageComponent.componentId
val variantsMetadataMonoList = ociImageComponent.features.map { (featureName, feature) ->
getMultiArchImageMetadata(registryUri, feature.imageReference, credentials).map {
getMultiPlatformImageMetadata(registryUri, feature.imageReference, credentials).map {
OciVariantsMetadata(featureName, feature.capabilities, it.platformToMetadata, it.digest, it.size)
}
}
Expand Down Expand Up @@ -235,7 +235,7 @@ internal class OciRepositoryHandler(
return response.sendBadRequest()
}
val metadataJsonMono =
getMultiArchImageMetadata(registryUri, imageReference, digest, size, credentials).handle { it, sink ->
getMultiPlatformImageMetadata(registryUri, imageReference, digest, size, credentials).handle { it, sink ->
val metadata = it.platformToMetadata[platform]
if (metadata == null) {
response.status(400)
Expand Down Expand Up @@ -280,15 +280,15 @@ internal class OciRepositoryHandler(
}
}

private fun getMultiArchImageMetadata(
private fun getMultiPlatformImageMetadata(
registryUri: URI,
imageReference: OciImageReference,
credentials: Credentials?,
): Mono<OciMultiArchImageMetadata> {
): Mono<OciMultiPlatformImageMetadata> {
return imageMetadataCache.getMono(
ImageMetadataCacheKey(registryUri.toString(), imageReference, null, -1, credentials?.hashed())
) { key ->
imageMetadataRegistry.pullMultiArchImageMetadata(key.registry, key.imageReference, credentials).doOnNext {
imageMetadataRegistry.pullMultiPlatformImageMetadata(key.registry, key.imageReference, credentials).doOnNext {
imageMetadataCache.asMap().putIfAbsent(
key.copy(digest = it.digest, size = it.size),
CompletableFuture.completedFuture(it),
Expand All @@ -297,17 +297,17 @@ internal class OciRepositoryHandler(
}
}

private fun getMultiArchImageMetadata(
private fun getMultiPlatformImageMetadata(
registryUri: URI,
imageReference: OciImageReference,
digest: OciDigest,
size: Int,
credentials: Credentials?,
): Mono<OciMultiArchImageMetadata> {
): Mono<OciMultiPlatformImageMetadata> {
return imageMetadataCache.getMono(
ImageMetadataCacheKey(registryUri.toString(), imageReference, digest, size, credentials?.hashed())
) { (registry, imageReference) ->
imageMetadataRegistry.pullMultiArchImageMetadata(registry, imageReference, digest, size, credentials)
imageMetadataRegistry.pullMultiPlatformImageMetadata(registry, imageReference, digest, size, credentials)
}
}

Expand Down

0 comments on commit 391b77f

Please sign in to comment.