Make pluginVersion an constructor option

code-asher · code-asher · commit 72332105a6b3 · 2023-10-18T10:39:38.000-08:00
PluginManagerCore is throwing a null pointer exception when used in the
tests.
diff --git a/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt b/src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt
@@ -140,7 +140,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
         if (token == null) { // User aborted.
             throw IllegalArgumentException("Unable to connect to $deploymentURL, $TOKEN is missing")
         }
-        val client = CoderRestClient(deploymentURL, token.first, settings.headerCommand)
+        val client = CoderRestClient(deploymentURL, token.first, settings.headerCommand, null)
         return try {
             Pair(client, client.me().username)
         } catch (ex: AuthenticationResponseException) {
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -45,25 +45,30 @@ class CoderRestClientService {
      * @throws [AuthenticationResponseException] if authentication failed.
      */
     fun initClientSession(url: URL, token: String, headerCommand: String?): User {
-        client = CoderRestClient(url, token, headerCommand)
+        client = CoderRestClient(url, token, headerCommand, null)
         me = client.me()
         buildVersion = client.buildInfo().version
         isReady = true
         return me
     }
 }
 
-class CoderRestClient(var url: URL, var token: String, var headerCommand: String?) {
+class CoderRestClient(var url: URL, var token: String,
+    private var headerCommand: String?,
+    private var pluginVersion: String?,
+) {
     private var httpClient: OkHttpClient
     private var retroRestClient: CoderV2RestFacade
 
     init {
         val gson: Gson = GsonBuilder().registerTypeAdapter(Instant::class.java, InstantConverter()).setPrettyPrinting().create()
-        val pluginVersion = PluginManagerCore.getPlugin(PluginId.getId("com.coder.gateway"))!! // this is the id from the plugin.xml
+        if (pluginVersion.isNullOrBlank()) {
+            pluginVersion = PluginManagerCore.getPlugin(PluginId.getId("com.coder.gateway"))!!.version // this is the id from the plugin.xml
+        }
 
         httpClient = OkHttpClient.Builder()
             .addInterceptor { it.proceed(it.request().newBuilder().addHeader("Coder-Session-Token", token).build()) }
-            .addInterceptor { it.proceed(it.request().newBuilder().addHeader("User-Agent", "Coder Gateway/${pluginVersion.version} (${SystemInfo.getOsNameAndVersion()}; ${SystemInfo.OS_ARCH})").build()) }
+            .addInterceptor { it.proceed(it.request().newBuilder().addHeader("User-Agent", "Coder Gateway/${pluginVersion} (${SystemInfo.getOsNameAndVersion()}; ${SystemInfo.OS_ARCH})").build()) }
             .addInterceptor {
                 var request = it.request()
                 val headers = getHeaders(url, headerCommand)
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt b/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
@@ -256,7 +256,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
                 deployments[dir] ?: try {
                     val url = Path.of(dir).resolve("url").readText()
                     val token = Path.of(dir).resolve("session").readText()
-                    DeploymentInfo(CoderRestClient(url.toURL(), token, settings.headerCommand))
+                    DeploymentInfo(CoderRestClient(url.toURL(), token, settings.headerCommand, null))
                 } catch (e: Exception) {
                     logger.error("Unable to create client from $dir", e)
                     DeploymentInfo(error = "Error trying to read $dir: ${e.message}")

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {`
`140`	`140`	`if (token == null) { // User aborted.`
`141`	`141`	`throw IllegalArgumentException("Unable to connect to $deploymentURL, $TOKEN is missing")`
`142`	`142`	`}`
`143`		`- val client = CoderRestClient(deploymentURL, token.first, settings.headerCommand)`
	`143`	`+ val client = CoderRestClient(deploymentURL, token.first, settings.headerCommand, null)`
`144`	`144`	`return try {`
`145`	`145`	`Pair(client, client.me().username)`
`146`	`146`	`} catch (ex: AuthenticationResponseException) {`