Remove/inline LAYER_MEDIA_TYPE_PREFIX constant

SgtSilvio · Dec 11, 2024 · 9640ae2 · 9640ae2
1 parent 9ba9c18
commit 9640ae2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciImageMetadataRegistry.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciImageMetadataRegistry.kt
@@ -60,7 +60,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
             credentials,
             MANIFEST_MEDIA_TYPE,
             CONFIG_MEDIA_TYPE,
-            LAYER_MEDIA_TYPE_PREFIX,
+            UNCOMPRESSED_LAYER_MEDIA_TYPE,
         )
 
         MANIFEST_MEDIA_TYPE -> transformManifestToMultiPlatformImageMetadata(
@@ -69,7 +69,7 @@ internal class OciImageMetadataRegistry(val registryApi: OciRegistryApi) {
             manifest,
             credentials,
             CONFIG_MEDIA_TYPE,
-            LAYER_MEDIA_TYPE_PREFIX,
+            UNCOMPRESSED_LAYER_MEDIA_TYPE,
         )
 
         DOCKER_MANIFEST_LIST_MEDIA_TYPE -> transformIndexToMultiPlatformImageMetadata(

diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/metadata/OciMediaTypes.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/metadata/OciMediaTypes.kt
@@ -3,10 +3,9 @@ package io.github.sgtsilvio.gradle.oci.metadata
 internal const val INDEX_MEDIA_TYPE = "application/vnd.oci.image.index.v1+json"
 internal const val MANIFEST_MEDIA_TYPE = "application/vnd.oci.image.manifest.v1+json"
 internal const val CONFIG_MEDIA_TYPE = "application/vnd.oci.image.config.v1+json"
-internal const val LAYER_MEDIA_TYPE_PREFIX = "application/vnd.oci.image.layer.v1"
-internal const val UNCOMPRESSED_LAYER_MEDIA_TYPE = "$LAYER_MEDIA_TYPE_PREFIX.tar"
-internal const val GZIP_COMPRESSED_LAYER_MEDIA_TYPE = "$LAYER_MEDIA_TYPE_PREFIX.tar+gzip"
-//internal const val ZSTD_COMPRESSED_LAYER_MEDIA_TYPE = "$LAYER_MEDIA_TYPE_PREFIX.tar+zstd"
+internal const val UNCOMPRESSED_LAYER_MEDIA_TYPE = "application/vnd.oci.image.layer.v1.tar"
+internal const val GZIP_COMPRESSED_LAYER_MEDIA_TYPE = "$UNCOMPRESSED_LAYER_MEDIA_TYPE+gzip"
+//internal const val ZSTD_COMPRESSED_LAYER_MEDIA_TYPE = "UNCOMPRESSED_LAYER_MEDIA_TYPE+zstd"
 
 internal const val DOCKER_MANIFEST_LIST_MEDIA_TYPE = "application/vnd.docker.distribution.manifest.list.v2+json"
 internal const val DOCKER_MANIFEST_MEDIA_TYPE = "application/vnd.docker.distribution.manifest.v2+json"