impl: get rid of last remaining of internal logger

- JetBrains recommendation is to use its own diagnostic logger available via service locator
- gets rid of slf4j api library

Author: fioan89

build.gradle.kts

@@ -55,14 +55,15 @@ dependencies {
     compileOnly(libs.bundles.toolbox.plugin.api)
     compileOnly(libs.bundles.serialization)
     compileOnly(libs.coroutines.core)
-    implementation(libs.slf4j)
     implementation(libs.okhttp)
     implementation(libs.exec)
     implementation(libs.moshi)
     ksp(libs.moshi.codegen)
     implementation(libs.retrofit)
     implementation(libs.retrofit.moshi)
     testImplementation(kotlin("test"))
+    testImplementation(libs.mokk)
+    testImplementation(libs.bundles.toolbox.plugin.api)
 }
 
 val extension = ExtensionJson(

gradle/libs.versions.toml

@@ -4,7 +4,6 @@ kotlin = "2.1.0"
 coroutines = "1.10.1"
 serialization = "1.8.0"
 okhttp = "4.10.0"
-slf4j = "2.0.3"
 dependency-license-report = "2.5"
 marketplace-client = "2.0.38"
 gradle-wrapper = "0.14.0"
@@ -15,6 +14,7 @@ retrofit = "2.8.2"
 changelog = "2.2.1"
 gettext = "0.7.0"
 plugin-structure = "3.298"
+mockk = "1.13.17"
 
 [libraries]
 toolbox-core-api = { module = "com.jetbrains.toolbox:core-api", version.ref = "toolbox-plugin-api" }
@@ -25,14 +25,13 @@ serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cor
 serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
 serialization-json-okio = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-okio", version.ref = "serialization" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
-slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 exec = { module = "org.zeroturnaround:zt-exec", version.ref = "exec" }
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
 plugin-structure = { module = "org.jetbrains.intellij.plugins:structure-toolbox", version.ref = "plugin-structure" }
-
+mokk = { module = "io.mockk:mockk", version.ref = "mockk" }
 marketplace-client = { module = "org.jetbrains.intellij:plugin-repository-rest-client", version.ref = "marketplace-client" }
 
 [bundles]

src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt

@@ -48,7 +48,7 @@ class CoderRemoteProvider(
 
     // Create our services from the Toolbox ones.
     private val settingsService = CoderSettingsService(context.settingsStore)
-    private val settings: CoderSettings = CoderSettings(settingsService)
+    private val settings: CoderSettings = CoderSettings(settingsService, context.logger)
     private val secrets: CoderSecretsService = CoderSecretsService(context.secretsStore)
     private val settingsPage: CoderSettingsPage = CoderSettingsPage(context, settingsService)
     private val dialogUi = DialogUi(context, settings)

src/main/kotlin/com/coder/toolbox/CoderToolboxExtension.kt

@@ -1,6 +1,5 @@
 package com.coder.toolbox
 
-import com.coder.toolbox.logger.CoderLoggerFactory
 import com.jetbrains.toolbox.api.core.PluginSecretStore
 import com.jetbrains.toolbox.api.core.PluginSettingsStore
 import com.jetbrains.toolbox.api.core.ServiceLocator
@@ -20,9 +19,6 @@ import okhttp3.OkHttpClient
 class CoderToolboxExtension : RemoteDevExtension {
     // All services must be passed in here and threaded as necessary.
     override fun createRemoteProviderPluginInstance(serviceLocator: ServiceLocator): RemoteProvider {
-        // initialize logger factory
-        CoderLoggerFactory.tLogger = serviceLocator.getService(Logger::class.java)
-
         return CoderRemoteProvider(
             CoderToolboxContext(
                 serviceLocator.getService(ToolboxUi::class.java),

src/main/kotlin/com/coder/toolbox/cli/CoderCLIManager.kt

@@ -1,9 +1,9 @@
 package com.coder.toolbox.cli
 
+import com.coder.toolbox.CoderToolboxContext
 import com.coder.toolbox.cli.ex.MissingVersionException
 import com.coder.toolbox.cli.ex.ResponseException
 import com.coder.toolbox.cli.ex.SSHConfigFormatException
-import com.coder.toolbox.logger.CoderLoggerFactory
 import com.coder.toolbox.settings.CoderSettings
 import com.coder.toolbox.settings.CoderSettingsState
 import com.coder.toolbox.util.CoderHostnameVerifier
@@ -17,6 +17,7 @@ import com.coder.toolbox.util.getHeaders
 import com.coder.toolbox.util.getOS
 import com.coder.toolbox.util.safeHost
 import com.coder.toolbox.util.sha1
+import com.jetbrains.toolbox.api.core.diagnostics.Logger
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
@@ -55,12 +56,13 @@ internal data class Version(
  *    from step 2 with the data directory.
  */
 fun ensureCLI(
+    context: CoderToolboxContext,
     deploymentURL: URL,
     buildVersion: String,
     settings: CoderSettings,
     indicator: ((t: String) -> Unit)? = null,
 ): CoderCLIManager {
-    val cli = CoderCLIManager(deploymentURL, settings)
+    val cli = CoderCLIManager(deploymentURL, context.logger, settings)
 
     // Short-circuit if we already have the expected version.  This
     // lets us bypass the 304 which is slower and may not be
@@ -89,7 +91,7 @@ fun ensureCLI(
     }
 
     // Try falling back to the data directory.
-    val dataCLI = CoderCLIManager(deploymentURL, settings, true)
+    val dataCLI = CoderCLIManager(deploymentURL, context.logger, settings, true)
     val dataCLIMatches = dataCLI.matchesVersion(buildVersion)
     if (dataCLIMatches == true) {
         return dataCLI
@@ -120,14 +122,13 @@ data class Features(
 class CoderCLIManager(
     // The URL of the deployment this CLI is for.
     private val deploymentURL: URL,
+    private val logger: Logger,
     // Plugin configuration.
-    private val settings: CoderSettings = CoderSettings(CoderSettingsState()),
+    private val settings: CoderSettings = CoderSettings(CoderSettingsState(), logger),
     // If the binary directory is not writable, this can be used to force the
     // manager to download to the data directory instead.
     forceDownloadToData: Boolean = false,
 ) {
-    private val logger = CoderLoggerFactory.getLogger(javaClass)
-
     val remoteBinaryURL: URL = settings.binSource(deploymentURL)
     val localBinaryPath: Path = settings.binPath(deploymentURL, forceDownloadToData)
     val coderConfigPath: Path = settings.dataDir(deploymentURL).resolve("config")
@@ -196,7 +197,7 @@ class CoderCLIManager(
     } catch (e: FileNotFoundException) {
         null
     } catch (e: Exception) {
-        logger.warn("Unable to calculate hash for $localBinaryPath", e)
+        logger.warn(e, "Unable to calculate hash for $localBinaryPath")
         null
     }
 
@@ -275,7 +276,8 @@ class CoderCLIManager(
             if (settings.sshLogDirectory.isNotBlank()) escape(settings.sshLogDirectory) else null,
             if (feats.reportWorkspaceUsage) "--usage-app=jetbrains" else null,
         )
-        val backgroundProxyArgs = baseArgs + listOfNotNull(if (feats.reportWorkspaceUsage) "--usage-app=disable" else null)
+        val backgroundProxyArgs =
+            baseArgs + listOfNotNull(if (feats.reportWorkspaceUsage) "--usage-app=disable" else null)
         val extraConfig =
             if (settings.sshConfigOptions.isNotBlank()) {
                 "\n" + settings.sshConfigOptions.prependIndent("  ")
@@ -417,6 +419,7 @@ class CoderCLIManager(
             is InvalidVersionException -> {
                 logger.info("Got invalid version from $localBinaryPath: ${e.message}")
             }
+
             else -> {
                 // An error here most likely means the CLI does not exist or
                 // it executed successfully but output no version which