Add layer file extension only to name and not to url in OciRepository…

…Handler
SgtSilvio · May 11, 2024 · 2e6024b · 2e6024b
1 parent ca552e8
commit 2e6024b
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciRepositoryHandler.kt b/src/main/kotlin/io/github/sgtsilvio/gradle/oci/internal/registry/OciRepositoryHandler.kt
@@ -108,10 +108,13 @@ internal class OciRepositoryHandler(
             return response.sendBadRequest()
         }
         val variant = mappedComponent.variants[variantName] ?: return response.sendNotFound()
-        return if (segments[7].endsWith("oci-component.json")) {
-            getOrHeadComponent(registryUri, variant, digest, size.toInt(), credentials, isGET, response)
-        } else {
-            getOrHeadLayer(registryUri, variant.imageReference.name, digest, size, credentials, isGET, response)
+        val last = segments[7]
+        return when {
+            last.endsWith("oci-component.json") ->
+                getOrHeadComponent(registryUri, variant, digest, size.toInt(), credentials, isGET, response)
+            last.endsWith("oci-layer") ->
+                getOrHeadLayer(registryUri, variant.imageReference.name, digest, size, credentials, isGET, response)
+            else -> response.sendNotFound()
         }
     }
 
@@ -170,9 +173,8 @@ internal class OciRepositoryHandler(
                                         layerVariantName,
                                         algorithmId + '!' + encodedHash.take(5) + ".." + encodedHash.takeLast(5),
                                     )
-                                    val extension = mapLayerMediaTypeToExtension(mediaType)
-                                    val layerName = "$fileNamePrefix-$classifier$extension"
-                                    addString("name", layerName)
+                                    val layerName = "$fileNamePrefix-$classifier"
+                                    addString("name", layerName + mapLayerMediaTypeToExtension(mediaType))
                                     addString("url", "$layerVariantName/$digest/$size/$layerName")
                                     addNumber("size", size)
                                     addString(algorithmId, encodedHash)