fix(abg): do not use double slash for top-level action URL

typesafegithub · Aug 19, 2024 · 269f4f4 · 269f4f4
1 parent 426e7f4
commit 269f4f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/...n/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords.kt b/...n/kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/domain/ActionCoords.kt
@@ -27,7 +27,7 @@ public val ActionCoords.repoName: String get() =
  * action lives.
  */
 public val ActionCoords.subName: String get() =
-    if (isTopLevel) "" else name.substringAfter("/")
+    if (isTopLevel) "" else "/${name.substringAfter("/")}"
 
 internal fun String.toActionCoords(): ActionCoords {
     val (ownerAndName, version) = this.split('@')

diff --git a/...kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/typing/TypesProviding.kt b/...kotlin/io/github/typesafegithub/workflows/actionbindinggenerator/typing/TypesProviding.kt
@@ -29,18 +29,18 @@ internal fun ActionCoords.provideTypes(
         ?: Pair(emptyMap(), null)
 
 private fun ActionCoords.actionTypesYmlUrl(gitRef: String) =
-    "https://raw.githubusercontent.com/$owner/$repoName/$gitRef/$subName/action-types.yml"
+    "https://raw.githubusercontent.com/$owner/$repoName/$gitRef$subName/action-types.yml"
 
 private fun ActionCoords.actionTypesFromCatalog() =
     "https://raw.githubusercontent.com/typesafegithub/github-actions-typing-catalog/" +
-        "main/typings/$owner/$repoName/$version/$subName/action-types.yml"
+        "main/typings/$owner/$repoName/$version$subName/action-types.yml"
 
 private fun ActionCoords.catalogMetadata() =
     "https://raw.githubusercontent.com/typesafegithub/github-actions-typing-catalog/" +
         "main/typings/$owner/$repoName/metadata.yml"
 
 private fun ActionCoords.actionTypesYamlUrl(gitRef: String) =
-    "https://raw.githubusercontent.com/$owner/$repoName/$gitRef/$subName/action-types.yaml"
+    "https://raw.githubusercontent.com/$owner/$repoName/$gitRef$subName/action-types.yaml"
 
 private fun ActionCoords.fetchTypingMetadata(
     metadataRevision: MetadataRevision,

diff --git a/...in/io/github/typesafegithub/workflows/actionbindinggenerator/typing/TypesProvidingTest.kt b/...in/io/github/typesafegithub/workflows/actionbindinggenerator/typing/TypesProvidingTest.kt
@@ -103,7 +103,7 @@ class TypesProvidingTest :
                 // Given
                 val fetchUri: (URI) -> String = {
                     when (it) {
-                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash//action-types.yml") -> hostedByActionYml
+                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash/action-types.yml") -> hostedByActionYml
                         else -> throw IOException()
                     }
                 }
@@ -120,7 +120,7 @@ class TypesProvidingTest :
                 // Given
                 val fetchUri: (URI) -> String = {
                     when (it) {
-                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash//action-types.yaml") -> hostedByActionYaml
+                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash/action-types.yaml") -> hostedByActionYaml
                         else -> throw IOException()
                     }
                 }
@@ -137,8 +137,8 @@ class TypesProvidingTest :
                 // Given
                 val fetchUri: (URI) -> String = {
                     when (it) {
-                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash//action-types.yml") -> hostedByActionYml
-                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash//action-types.yaml") -> hostedByActionYaml
+                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash/action-types.yml") -> hostedByActionYml
+                        URI("https://raw.githubusercontent.com/some-owner/some-name/some-hash/action-types.yaml") -> hostedByActionYaml
                         else -> throw IOException()
                     }
                 }
@@ -157,7 +157,7 @@ class TypesProvidingTest :
                     when (it) {
                         URI(
                             "https://raw.githubusercontent.com/typesafegithub/github-actions-typing-catalog/" +
-                                "main/typings/some-owner/some-name/v3//action-types.yml",
+                                "main/typings/some-owner/some-name/v3/action-types.yml",
                         ),
                         -> storedInTypingCatalog
                         else -> throw IOException()
@@ -178,12 +178,12 @@ class TypesProvidingTest :
                     when (it) {
                         URI(
                             "https://raw.githubusercontent.com/some-owner/some-name/" +
-                                "some-hash//action-types.yml",
+                                "some-hash/action-types.yml",
                         ),
                         -> hostedByActionYml
                         URI(
                             "https://raw.githubusercontent.com/typesafegithub/github-actions-typing-catalog/" +
-                                "main/typings/some-owner/some-name/v3//action-types.yml",
+                                "main/typings/some-owner/some-name/v3/action-types.yml",
                         ),
                         -> storedInTypingCatalog
                         else -> throw IOException()
@@ -209,7 +209,7 @@ class TypesProvidingTest :
                         -> metadata
                         URI(
                             "https://raw.githubusercontent.com/typesafegithub/github-actions-typing-catalog/" +
-                                "main/typings/some-owner/some-name/v4//action-types.yml",
+                                "main/typings/some-owner/some-name/v4/action-types.yml",
                         ),
                         -> storedInTypingCatalogForOlderVersion
                         else -> throw IOException()