Skip to content

fix ContainerFactory #36574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2024
Merged

fix ContainerFactory #36574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f80a76
fix ContainerFactory
stephane-airbyte Mar 27, 2024
b2bfdf0
fix ContainerFactory
stephane-airbyte Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.28.17
version=0.28.18
5 changes: 3 additions & 2 deletions ...dk/core/src/testFixtures/kotlin/io/airbyte/cdk/extensions/LoggingInvocationInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ class LoggingInvocationInterceptor : InvocationInterceptor {
if (timeoutTask.wasTriggered) {
t1 =
TimeoutException(
"Execution was cancelled after %s. If you think your test should be given more time to complete, you can use the @Timeout annotation. If all the test of a connector are slow, " +
" you can override the property 'JunitMethodExecutionTimeout' in your gradle.properties.".formatted(
("Execution was cancelled after %s. If you think your test should be given more time to complete, you can use the @Timeout annotation. If all the test of a connector are slow, " +
" you can override the property 'JunitMethodExecutionTimeout' in your gradle.properties.")
.formatted(
DurationFormatUtils.formatDurationWords(elapsedMs, true, true)
)
)
Expand Down
16 changes: 9 additions & 7 deletions ...ava/airbyte-cdk/core/src/testFixtures/kotlin/io/airbyte/cdk/testutils/ContainerFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import org.testcontainers.utility.DockerImageName
abstract class ContainerFactory<C : GenericContainer<*>> {
@JvmRecord
private data class ContainerKey<C : GenericContainer<*>>(
val clazz: Class<out ContainerFactory<*>?>?,
val imageName: DockerImageName?,
val methods: MutableList<out NamedContainerModifier<C>>
val clazz: Class<out ContainerFactory<*>>,
val imageName: DockerImageName,
val methods: kotlin.collections.List<String>
)

private class ContainerOrException(
Expand Down Expand Up @@ -90,7 +90,6 @@ abstract class ContainerFactory<C : GenericContainer<*>> {
*
* @Deprecated use shared(String, NamedContainerModifier) instead
*/
@Deprecated("")
fun shared(imageName: String, vararg methods: String): C {
return shared(
imageName,
Expand All @@ -110,7 +109,11 @@ abstract class ContainerFactory<C : GenericContainer<*>> {
namedContainerModifiers: MutableList<out NamedContainerModifier<C>> = ArrayList()
): C {
val containerKey =
ContainerKey<C>(javaClass, DockerImageName.parse(imageName), namedContainerModifiers)
ContainerKey<C>(
javaClass,
DockerImageName.parse(imageName),
namedContainerModifiers.map { it.name() }.toList()
)
// We deliberately avoid creating the container itself eagerly during the evaluation of the
// map
// value.
Expand All @@ -119,7 +122,7 @@ abstract class ContainerFactory<C : GenericContainer<*>> {
val containerOrError =
SHARED_CONTAINERS!!.computeIfAbsent(containerKey) { key: ContainerKey<*>? ->
ContainerOrException {
createAndStartContainer(key!!.imageName, (key as ContainerKey<C>)!!.methods)
createAndStartContainer(key!!.imageName, namedContainerModifiers)
}
}
// Instead, the container creation (if applicable) is deferred to here.
Expand All @@ -131,7 +134,6 @@ abstract class ContainerFactory<C : GenericContainer<*>> {
*
* @Deprecated use exclusive(String, NamedContainerModifier) instead
*/
@Deprecated("")
fun exclusive(imageName: String, vararg methods: String): C {
return exclusive(
imageName,
Expand Down