Fix encoding GCS objects (#90)

Author: martinbonnin

librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/internal/task/generateMarkerFiles.kt

@@ -16,6 +16,7 @@ import gratatouille.tasks.GLogger
 import gratatouille.tasks.GOutputDirectory
 import gratatouille.tasks.GTask
 import java.io.File
+import java.time.Instant
 import java.util.zip.ZipInputStream
 
 
@@ -100,7 +101,13 @@ fun generateMarkerFiles(
             )
           )
 
-          val file = resolve("$artifactId-$mainVersion.pom")
+          val v = if (mainVersion.endsWith("-SNAPSHOT")) {
+            // Do like Gradle and replace -SNAPSHOT by a timestamp and a buildNumber of 1
+            "${mainVersion.substringBefore("-SNAPSHOT")}-${timestampNow()}-1"
+          } else {
+            mainVersion
+          }
+          val file = resolve("$artifactId-$v.pom")
           file.writeText(project.serialize())
           file.writeChecksums()
           if (privateKey != null) {
@@ -136,3 +143,8 @@ private fun File.writeChecksums() {
   }
 }
 
+internal fun timestampNow(): String {
+  val now = Instant.now().atZone(java.time.ZoneOffset.UTC)
+
+  return String.format("%04d%02d%02d.%02d%02d%02d", now.year, now.monthValue, now.dayOfMonth, now.hour, now.minute, now.second)
+}

librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/internal/task/publishToGcs.kt

@@ -12,6 +12,7 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okio.BufferedSource
+import java.net.URLEncoder
 import java.time.Duration
 import kotlin.math.pow
 import kotlin.time.Duration.Companion.seconds
@@ -57,9 +58,14 @@ internal class GcsTransport(
 
     val name = "${prefix}${path}"
     logger.info("Librarian: gcs-get $name")
+
     val url = getBaseUrl
       .newBuilder()
-      .addPathSegments(name)
+      /**
+       * Send the object name as a single segment as this is required by GCP:
+       * https://cloud.google.com/storage/docs/request-endpoints#encoding
+       */
+      .addPathSegment(name)
       .addQueryParameter("alt", "media")
       .build()
     val request = Request.Builder()

librarian-gradle-plugin/src/test/kotlin/UrlTest.kt

@@ -0,0 +1,19 @@
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import java.net.URLEncoder
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class UrlTest {
+  @Test
+  fun test() {
+    val name = "m2/com/gradleup/compat/patrouille/compat-patrouille-gradle-plugin/0.0.1-SNAPSHOT/maven-metadata.xml"
+
+    val httpUrl = "https://example.com".toHttpUrl().newBuilder()
+      .addPathSegment(name)
+      .build()
+      .toString()
+
+    val usingUrlEncode = "https://example.com/" + URLEncoder.encode(name, "UTF-8")
+    assertEquals(httpUrl, usingUrlEncode)
+  }
+}