Skip to content

Commit 0a2b5dc

Browse files
Vampirekrzema12
andauthored
fix(abg): Only consider refs with exactly three parts (#2306)
Co-authored-by: Piotr Krzemiński <3110813+krzema12@users.noreply.github.com>
1 parent f6049ca commit 0a2b5dc

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

  • shared-internal/src
    • main/kotlin/io/github/typesafegithub/workflows/shared/internal
    • test/kotlin/io/github/typesafegithub/workflows/shared/internal/model

shared-internal/src/main/kotlin/io/github/typesafegithub/workflows/shared/internal/GithubApi.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import java.time.ZonedDateTime
2525

2626
private val logger = logger { }
2727

28+
private const val MAX_REF_PARTS = 3
29+
2830
suspend fun fetchAvailableVersions(
2931
owner: String,
3032
name: String,
@@ -38,6 +40,7 @@ suspend fun fetchAvailableVersions(
3840
apiTagsUrl(githubEndpoint = githubEndpoint, owner = owner, name = name),
3941
apiBranchesUrl(githubEndpoint = githubEndpoint, owner = owner, name = name),
4042
).flatMap { url -> fetchGithubRefs(url, githubAuthToken, httpClient).bind() }
43+
.filter { it.ref.split('/', limit = MAX_REF_PARTS + 1).size == MAX_REF_PARTS }
4144
.versions(githubAuthToken, meterRegistry = meterRegistry)
4245
}
4346
}

shared-internal/src/test/kotlin/io/github/typesafegithub/workflows/shared/internal/model/GithubApiTest.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,16 +208,12 @@ class GithubApiTest :
208208
)
209209

210210
// Then
211-
// This assertion shows current undesired behavior,
212-
// TODO fix in https://github.com/typesafegithub/github-workflows-kt/pull/2306
213211
versionsOrError shouldBe
214212
listOf(
215213
Version("v1.0.0"),
216214
Version("v1.0.1"),
217-
Version("tag"),
218215
Version("v1"),
219216
Version("v2"),
220-
Version("branch"),
221217
).right()
222218
}
223219

0 commit comments

Comments
 (0)