Deduplicate created blob responses

SgtSilvio · Jan 10, 2025 · 41a17e6 · 41a17e6
1 parent 21e0b86
commit 41a17e6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/io/github/sgtsilvio/oci/registry/OciRegistryHandler.kt b/src/main/kotlin/io/github/sgtsilvio/oci/registry/OciRegistryHandler.kt
@@ -337,8 +337,7 @@ class OciRegistryHandler(
             return response.sendBadRequest()
         }
         return if (storage.mountBlob(repositoryName, digest, fromRepositoryName)) {
-            response.header(LOCATION, "/v2/$repositoryName/blobs/$digest")
-            response.status(CREATED).send()
+            response.sendBlobCreated(repositoryName, digest)
         } else {
             createBlobUpload(repositoryName, response)
         }
@@ -362,8 +361,7 @@ class OciRegistryHandler(
         }
         val id = storage.createBlobUpload(repositoryName)
         return storage.finishBlobUpload(repositoryName, id, request.receive(), 0, digest).flatMap {
-            response.header(LOCATION, "/v2/$repositoryName/blobs/$digest")
-            response.status(CREATED).send()
+            response.sendBlobCreated(repositoryName, digest)
         }.onErrorResume { error -> // TODO error handling after flatMap not 100% correct, would also handle errors from the flattened mono
             when (error) {
                 is DigestException -> response.sendBadRequest()
@@ -456,8 +454,7 @@ class OciRegistryHandler(
             currentSize
         }
         return storage.finishBlobUpload(repositoryName, id, request.receive(), offset, digest).flatMap {
-            response.header(LOCATION, "/v2/$repositoryName/blobs/$digest")
-            response.status(CREATED).send()
+            response.sendBlobCreated(repositoryName, digest)
         }.onErrorResume { error -> // TODO error handling after flatMap not 100% correct, would also handle errors from the flattened mono
             when (error) {
                 is NoSuchElementException -> response.sendNotFound()
@@ -466,6 +463,9 @@ class OciRegistryHandler(
             }
         }
     }
+
+    private fun HttpServerResponse.sendBlobCreated(repositoryName: String, digest: OciDigest) =
+        status(CREATED).header(LOCATION, "/v2/$repositoryName/blobs/$digest").send()
 }
 
 private val URI.queryParameters: Map<String, String> // TODO move to UriExtensions