From 86bd3733fd763c19ef855e8a391892ecaf9c14b4 Mon Sep 17 00:00:00 2001 From: Jeff Hwang Date: Mon, 4 Aug 2025 11:02:45 -0400 Subject: [PATCH 1/3] add fix to envoy connector --- .../backfila/client/EnvoyCallbackConnectorProvider.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt b/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt index a62ed8101..b6c5bd525 100644 --- a/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt +++ b/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt @@ -22,7 +22,7 @@ class EnvoyCallbackConnectorProvider @Inject constructor( private val moshi: Moshi, ) : BackfilaCallbackConnectorProvider { @com.google.inject.Inject(optional = true) - lateinit var envoyClientEndpointProvider: EnvoyClientEndpointProvider + var envoyClientEndpointProvider: EnvoyClientEndpointProvider? = null override fun validateExtraData(connectorExtraData: String?) { connectorExtraData?.let { @@ -54,7 +54,14 @@ class EnvoyCallbackConnectorProvider @Inject constructor( app = serviceName, env = env, ) - val baseUrl = URL(envoyClientEndpointProvider.url(envoyConfig)) + + val baseUrl = if (envoyClientEndpointProvider != null) { + URL(envoyClientEndpointProvider!!.url(envoyConfig)) + } else { + // Fallback: construct a basic URL when EnvoyClientEndpointProvider is not available + // This typically happens in development/testing environments + URL("http://localhost:8080/") + } val httpClientEndpointConfig = httpClientsConfig[baseUrl] var okHttpClient = httpClientFactory.create(httpClientEndpointConfig) From 9ae4de6a37f331977ad000ce05c86c5799cde8b9 Mon Sep 17 00:00:00 2001 From: Jeff Hwang Date: Mon, 4 Aug 2025 11:14:51 -0400 Subject: [PATCH 2/3] modify comment --- .../app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt b/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt index b6c5bd525..f3553bf0d 100644 --- a/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt +++ b/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt @@ -59,7 +59,6 @@ class EnvoyCallbackConnectorProvider @Inject constructor( URL(envoyClientEndpointProvider!!.url(envoyConfig)) } else { // Fallback: construct a basic URL when EnvoyClientEndpointProvider is not available - // This typically happens in development/testing environments URL("http://localhost:8080/") } val httpClientEndpointConfig = httpClientsConfig[baseUrl] From 9bfaba7599d9b3530c02498932e4928dd911c7c3 Mon Sep 17 00:00:00 2001 From: Jeff Hwang Date: Mon, 4 Aug 2025 15:40:06 -0400 Subject: [PATCH 3/3] update client to misk --- gradle/libs.versions.toml | 2 +- .../client/EnvoyCallbackConnectorProvider.kt | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8601ae40..2d5743c4b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ jooq = "3.18.25" kotlin = "2.1.20" kotlinxCoroutines = "1.10.1" ktlint = "0.47.1" -misk = "2025.07.28.164255-11cc719" +misk = "2025.08.01.102836-90afb48" okhttp = "5.1.0" sqldelight = "2.1.0" wire = "5.3.5" diff --git a/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt b/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt index f3553bf0d..892f38a72 100644 --- a/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt +++ b/service/src/main/kotlin/app/cash/backfila/client/EnvoyCallbackConnectorProvider.kt @@ -12,8 +12,8 @@ import misk.moshi.adapter import retrofit2.Retrofit import retrofit2.adapter.guava.GuavaCallAdapterFactory import retrofit2.converter.wire.WireConverterFactory -import wisp.client.EnvoyClientEndpointProvider -import wisp.client.HttpClientEnvoyConfig +import misk.client.EnvoyClientEndpointProvider +import misk.client.HttpClientEnvoyConfig @Singleton class EnvoyCallbackConnectorProvider @Inject constructor( @@ -22,7 +22,7 @@ class EnvoyCallbackConnectorProvider @Inject constructor( private val moshi: Moshi, ) : BackfilaCallbackConnectorProvider { @com.google.inject.Inject(optional = true) - var envoyClientEndpointProvider: EnvoyClientEndpointProvider? = null + private lateinit var envoyClientEndpointProvider: EnvoyClientEndpointProvider override fun validateExtraData(connectorExtraData: String?) { connectorExtraData?.let { @@ -54,13 +54,7 @@ class EnvoyCallbackConnectorProvider @Inject constructor( app = serviceName, env = env, ) - - val baseUrl = if (envoyClientEndpointProvider != null) { - URL(envoyClientEndpointProvider!!.url(envoyConfig)) - } else { - // Fallback: construct a basic URL when EnvoyClientEndpointProvider is not available - URL("http://localhost:8080/") - } + val baseUrl = URL(envoyClientEndpointProvider.url(envoyConfig)) val httpClientEndpointConfig = httpClientsConfig[baseUrl] var okHttpClient = httpClientFactory.create(httpClientEndpointConfig)