Adapt to upstream changes

Author: Vampire

jit-binding-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/ArtifactRoutes.kt

@@ -119,9 +119,12 @@ private fun Route.getArtifact(
     }
 }
 
-internal fun prefetchBindingArtifacts(coords: Collection<ActionCoords>) {
+internal fun prefetchBindingArtifacts(
+    coords: Collection<ActionCoords>,
+    bindingVersion: BindingVersion = V1,
+) {
     prefetchScope.launch {
-        bindingsCache.getAll(coords)
+        bindingsCache.getAll(coords.map { CacheKey(it, bindingVersion) })
     }
 }
 
@@ -181,7 +184,7 @@ private fun incrementArtifactCounter(
     counter.increment()
 }
 
-private data class CacheKey(
+internal data class CacheKey(
     val actionCoords: ActionCoords,
     val bindingVersion: BindingVersion,
 )

jit-binding-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/MetadataRoutes.kt

@@ -4,7 +4,6 @@ import com.github.benmanes.caffeine.cache.Caffeine
 import com.sksamuel.aedile.core.asLoadingCache
 import com.sksamuel.aedile.core.refreshAfterWrite
 import io.github.oshai.kotlinlogging.KotlinLogging.logger
-import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords
 import io.github.typesafegithub.workflows.actionbindinggenerator.domain.prettyPrintWithoutVersion
 import io.github.typesafegithub.workflows.mavenbinding.buildPackageArtifacts
 import io.github.typesafegithub.workflows.shared.internal.getGithubAuthToken
@@ -26,9 +25,13 @@ private val metadataCache =
         .newBuilder()
         .refreshAfterWrite(1.hours)
         .recordStats()
-        .asLoadingCache<ActionCoords, MetadataResult> {
+        .asLoadingCache<CacheKey, MetadataResult> {
             runCatching {
-                it.buildPackageArtifacts(githubAuthToken = getGithubAuthToken(), ::prefetchBindingArtifacts)
+                it.actionCoords.buildPackageArtifacts(
+                    githubAuthToken = getGithubAuthToken(),
+                    prefetchBindingArtifacts = ::prefetchBindingArtifacts,
+                    bindingVersion = it.bindingVersion,
+                )
             }
         }
 
@@ -62,10 +65,11 @@ private fun Route.metadata(refresh: Boolean = false) {
         logger.info {
             "➡️ Requesting metadata for ${actionCoords.prettyPrintWithoutVersion} binding version $bindingVersion"
         }
+        val cacheKey = CacheKey(actionCoords, bindingVersion)
         if (refresh) {
-            metadataCache.invalidate(actionCoords)
+            metadataCache.invalidate(cacheKey)
         }
-        val metadataArtifacts = metadataCache.get(actionCoords).getOrThrow()
+        val metadataArtifacts = metadataCache.get(cacheKey).getOrThrow()
 
         if (refresh && !deliverOnRefreshRoute) return@get call.respondText(text = "OK")
 

maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/MavenMetadataBuilding.kt

@@ -5,6 +5,8 @@ import arrow.core.getOrElse
 import io.github.oshai.kotlinlogging.KotlinLogging.logger
 import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords
 import io.github.typesafegithub.workflows.actionbindinggenerator.domain.SignificantVersion.FULL
+import io.github.typesafegithub.workflows.actionbindinggenerator.versioning.BindingVersion
+import io.github.typesafegithub.workflows.actionbindinggenerator.versioning.BindingVersion.V1
 import io.github.typesafegithub.workflows.shared.internal.fetchAvailableVersions
 import io.github.typesafegithub.workflows.shared.internal.model.Version
 import java.time.format.DateTimeFormatter
@@ -18,15 +20,16 @@ internal suspend fun ActionCoords.buildMavenMetadataFile(
         name: String,
         githubAuthToken: String?,
     ) -> Either<String, List<Version>> = ::fetchAvailableVersions,
-    prefetchBindingArtifacts: (Collection<ActionCoords>) -> Unit = {},
+    prefetchBindingArtifacts: (Collection<ActionCoords>, BindingVersion) -> Unit = { _, _ -> },
+    bindingVersion: BindingVersion = V1,
 ): String? {
     val availableVersions =
         fetchAvailableVersions(owner, name, githubAuthToken)
             .getOrElse {
                 logger.error { it }
                 emptyList()
             }.filter { it.isMajorVersion() || (significantVersion < FULL) }
-    prefetchBindingArtifacts(availableVersions.map { copy(version = "$it") })
+    prefetchBindingArtifacts(availableVersions.map { copy(version = "$it") }, bindingVersion)
     val newest = availableVersions.maxOrNull() ?: return null
     val lastUpdated =
         DateTimeFormatter

maven-binding-builder/src/main/kotlin/io/github/typesafegithub/workflows/mavenbinding/PackageArtifactsBuilding.kt

@@ -1,10 +1,13 @@
 package io.github.typesafegithub.workflows.mavenbinding
 
 import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords
+import io.github.typesafegithub.workflows.actionbindinggenerator.versioning.BindingVersion
+import io.github.typesafegithub.workflows.actionbindinggenerator.versioning.BindingVersion.V1
 
 suspend fun ActionCoords.buildPackageArtifacts(
     githubAuthToken: String,
-    prefetchBindingArtifacts: (Collection<ActionCoords>) -> Unit,
+    prefetchBindingArtifacts: (Collection<ActionCoords>, BindingVersion) -> Unit,
+    bindingVersion: BindingVersion = V1,
 ): Map<String, String> {
     val mavenMetadata =
         buildMavenMetadataFile(