Merge branch 'main' into eap

- include all bugfixes and enhancements
  released with `2.1.3`

Author: fioan89

.github/readme/compatibility_check.png

@@ -105,7 +105,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2022.2.3
+        uses: JetBrains/qodana-action@v2022.2.4
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact

.github/workflows/build.yml

@@ -4,6 +4,46 @@
 
 ## Unreleased
 
+Bug fixes and enhancements included in `2.1.3` release:
+
+### Added
+- warning system when plugin might not be compatible with Coder REST API
+- a `Create workspace` button which links to Coder's templates page
+- workspace icons
+- quick toolbar action to open Coder Dashboard in the browser
+- custom user agent for the HTTP client
+
+### Changed
+- redesigned the information&warning banner. Messages can now include hyperlinks
+
+### Removed
+- connection handle window is no longer displayed
+
+### Fixed
+- outdated Coder CLI binaries are cleaned up
+- workspace status color style: running workspaces are green, failed ones should be red, everything else is gray
+- typos in plugin description
+
+## 2.1.3 - 2022-12-09
+
+### Added
+- warning system when plugin might not be compatible with Coder REST API
+- a `Create workspace` button which links to Coder's templates page
+- workspace icons
+- quick toolbar action to open Coder Dashboard in the browser
+- custom user agent for the HTTP client
+
+### Changed
+- redesigned the information&warning banner. Messages can now include hyperlinks
+
+### Removed
+- connection handle window is no longer displayed
+
+### Fixed
+- outdated Coder CLI binaries are cleaned up
+- workspace status color style: running workspaces are green, failed ones should be red, everything else is gray
+- typos in plugin description
+
 ## 2.1.2-eap.0 - 2022-11-29
 
 ### Added

CHANGELOG.md

@@ -7,7 +7,7 @@ Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=soc
 [![Coder Gateway Plugin Build](https://github.com/coder/coder-jetbrains/actions/workflows/build.yml/badge.svg)](https://github.com/coder/coder-jetbrains/actions/workflows/build.yml)
 
 <!-- Plugin description -->
-**Coder Gateway** connects your Jetbrains IDE to your [Coder Workspaces](https://coder.com/docs/coder-oss/latest/workspaces) so that you can develop from anywhere.
+**Coder Gateway** connects your JetBrains IDE to your [Coder Workspaces](https://coder.com/docs/coder-oss/latest/workspaces) so that you can develop from anywhere.
 
 **Manage less**
 
@@ -226,6 +226,16 @@ versions of Gateway we've decided:
   different release channels (ex: `eap` or `beta`), but all of them except the stable channel have to be
   manually configured by users in Gateway - which is super inconvenient.
 
+## Supported Coder versions
+
+`Coder Gateway` includes checks for compatibility with a specified version range. A warning is raised when
+the Coder deployment build version is outside of compatibility range:
+![Compatibility Check with Coder deployment](.github/readme/compatibility_check.png)
+
+The range needs to be manually updated as often as possible. The lowest bound is specified by `minCompatibleCoderVersion`
+property in the [CoderSupportedVersions.properties](src/main/resources/version/CoderSupportedVersions.properties)
+while `maxCompatibleCoderVersion` specifies the upper bound.
+
 [docs:qodana-github-action]: https://www.jetbrains.com/help/qodana/qodana-intellij-github-action.html
 
 [docs:plugin-signing]: https://plugins.jetbrains.com/docs/intellij/plugin-signing.html?from=IJPluginTemplate

README.md

@@ -6,8 +6,10 @@ fun properties(key: String) = project.findProperty(key).toString()
 plugins {
     // Java support
     id("java")
+    // Groovy support
+    id("groovy")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.21"
+    id("org.jetbrains.kotlin.jvm") version "1.7.22"
     // Gradle IntelliJ Plugin
     id("org.jetbrains.intellij") version "1.10.0"
     // Gradle Changelog Plugin
@@ -19,7 +21,6 @@ plugins {
 group = properties("pluginGroup")
 version = properties("pluginVersion")
 
-val ktorVersion = properties("ktorVersion")
 dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     // define a BOM and its version
@@ -31,6 +32,11 @@ dependencies {
     implementation("org.zeroturnaround:zt-exec:1.12") {
         exclude("org.slf4j")
     }
+
+    testImplementation(platform("org.apache.groovy:groovy-bom:4.0.6"))
+    testImplementation("org.apache.groovy:groovy")
+    testImplementation(platform("org.spockframework:spock-bom:2.3-groovy-4.0"))
+    testImplementation("org.spockframework:spock-core")
 }
 
 // Configure project's dependencies
@@ -91,7 +97,8 @@ tasks {
         compilerVersion.set(properties("instrumentationCompiler"))
     }
 
-    // TODO - this fails with linkage error, remove when it works
+    // TODO - this fails with linkage error, but we don't need it now
+    // because the plugin does not provide anything to search for in Preferences
     buildSearchableOptions {
         isEnabled = false
     }
@@ -122,6 +129,10 @@ tasks {
         })
     }
 
+    runIde {
+        autoReloadPlugins.set(true)
+    }
+
     // Configure UI tests plugin
     // Read more: https://github.com/JetBrains/intellij-ui-test-robot
     runIdeForUiTests {
@@ -135,4 +146,8 @@ tasks {
         dependsOn("patchChangelog")
         token.set(System.getenv("PUBLISH_TOKEN"))
     }
+
+    test {
+        useJUnitPlatform()
+    }
 }

build.gradle.kts

@@ -3,7 +3,7 @@
 pluginGroup=com.coder.gateway
 pluginName=coder-gateway
 # SemVer format -> https://semver.org
-pluginVersion=2.1.2-eap.0
+pluginVersion=2.1.3-eap.0
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild=223.7571.70

gradle.properties

@@ -5,14 +5,14 @@ package com.coder.gateway
 import com.coder.gateway.models.RecentWorkspaceConnection
 import com.coder.gateway.services.CoderRecentWorkspaceConnectionsService
 import com.intellij.openapi.components.service
-import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.rd.util.launchUnderBackgroundProgress
 import com.intellij.remote.AuthType
 import com.intellij.remote.RemoteCredentialsHolder
 import com.intellij.ssh.config.unified.SshConfig
 import com.jetbrains.gateway.api.ConnectionRequestor
 import com.jetbrains.gateway.api.GatewayConnectionHandle
 import com.jetbrains.gateway.api.GatewayConnectionProvider
+import com.jetbrains.gateway.api.GatewayUI
 import com.jetbrains.gateway.ssh.HighLevelHostAccessor
 import com.jetbrains.gateway.ssh.HostDeployInputs
 import com.jetbrains.gateway.ssh.IdeInfo
@@ -30,7 +30,6 @@ import java.time.format.DateTimeFormatter
 class CoderGatewayConnectionProvider : GatewayConnectionProvider {
     private val recentConnectionsService = service<CoderRecentWorkspaceConnectionsService>()
 
-    private val connections = mutableSetOf<CoderConnectionMetadata>()
     private val localTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MMM-dd HH:mm")
 
     override suspend fun connect(parameters: Map<String, String>, requestor: ConnectionRequestor): GatewayConnectionHandle? {
@@ -42,11 +41,6 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
         val webTerminalLink = parameters["web_terminal_link"]!!
 
         if (coderWorkspaceHostname != null && projectPath != null) {
-            val connection = CoderConnectionMetadata(coderWorkspaceHostname)
-            if (connection in connections) {
-                logger.warn("There is already a connection started on ${connection.workspaceHostname}")
-                return null
-            }
             val sshConfiguration = SshConfig(true).apply {
                 setHost(coderWorkspaceHostname)
                 setUsername("coder")
@@ -89,27 +83,12 @@ class CoderGatewayConnectionProvider : GatewayConnectionProvider {
             }
 
             recentConnectionsService.addRecentConnection(RecentWorkspaceConnection(coderWorkspaceHostname, projectPath, localTimeFormatter.format(LocalDateTime.now()), ideProductCode, ideBuildNumber, ideDownloadLink, webTerminalLink))
-
-            return object : GatewayConnectionHandle(clientLifetime) {
-                override fun getTitle(): String {
-                    return "Connection to Coder Workspaces"
-                }
-
-                override fun hideToTrayOnStart(): Boolean {
-                    return false
-                }
-            }
+            GatewayUI.getInstance().reset()
         }
         return null
     }
 
     override fun isApplicable(parameters: Map<String, String>): Boolean {
         return parameters["type"] == "coder"
     }
-
-    companion object {
-        val logger = Logger.getInstance(CoderGatewayConnectionProvider::class.java.simpleName)
-    }
-}
-
-internal data class CoderConnectionMetadata(val workspaceHostname: String)
+}

src/main/kotlin/com/coder/gateway/CoderGatewayConnectionProvider.kt

@@ -0,0 +1,18 @@
+package com.coder.gateway
+
+import com.coder.gateway.sdk.CoderSemVer
+import com.intellij.DynamicBundle
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.annotations.PropertyKey
+
+@NonNls
+private const val BUNDLE = "version.CoderSupportedVersions"
+
+object CoderSupportedVersions : DynamicBundle(BUNDLE) {
+    val minCompatibleCoderVersion = CoderSemVer.parse(message("minCompatibleCoderVersion"))
+    val maxCompatibleCoderVersion = CoderSemVer.parse(message("maxCompatibleCoderVersion"))
+
+    @JvmStatic
+    @Suppress("SpreadOperator")
+    private fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) = getMessage(key, *params)
+}

src/main/kotlin/com/coder/gateway/CoderSupportedVersions.kt

@@ -5,22 +5,54 @@ import com.intellij.openapi.util.IconLoader
 object CoderIcons {
     val LOGO = IconLoader.getIcon("coder_logo.svg", javaClass)
     val LOGO_16 = IconLoader.getIcon("coder_logo_16.svg", javaClass)
-    val LOGO_52 = IconLoader.getIcon("coder_logo_52.svg", javaClass)
 
     val OPEN_TERMINAL = IconLoader.getIcon("open_terminal.svg", javaClass)
 
+    val HOME = IconLoader.getIcon("homeFolder.svg", javaClass)
+    val CREATE = IconLoader.getIcon("create.svg", javaClass)
     val RUN = IconLoader.getIcon("run.svg", javaClass)
     val STOP = IconLoader.getIcon("stop.svg", javaClass)
     val UPDATE = IconLoader.getIcon("update.svg", javaClass)
+    val DELETE = IconLoader.getIcon("delete.svg", javaClass)
 
-    val WINDOWS = IconLoader.getIcon("windows.svg", javaClass)
-    val MACOS = IconLoader.getIcon("macOS.svg", javaClass)
-    val LINUX = IconLoader.getIcon("linux.svg", javaClass)
     val UNKNOWN = IconLoader.getIcon("unknown.svg", javaClass)
 
-    val GREEN_CIRCLE = IconLoader.getIcon("green_circle.svg", javaClass)
-    val GRAY_CIRCLE = IconLoader.getIcon("gray_circle.svg", javaClass)
-    val RED_CIRCLE = IconLoader.getIcon("red_circle.svg", javaClass)
+    val ZERO = IconLoader.getIcon("0.svg", javaClass)
+    val ONE = IconLoader.getIcon("1.svg", javaClass)
+    val TWO = IconLoader.getIcon("2.svg", javaClass)
+    val THREE = IconLoader.getIcon("3.svg", javaClass)
+    val FOUR = IconLoader.getIcon("4.svg", javaClass)
+    val FIVE = IconLoader.getIcon("5.svg", javaClass)
+    val SIX = IconLoader.getIcon("6.svg", javaClass)
+    val SEVEN = IconLoader.getIcon("7.svg", javaClass)
+    val EIGHT = IconLoader.getIcon("8.svg", javaClass)
+    val NINE = IconLoader.getIcon("9.svg", javaClass)
+
+    val A = IconLoader.getIcon("a.svg", javaClass)
+    val B = IconLoader.getIcon("b.svg", javaClass)
+    val C = IconLoader.getIcon("c.svg", javaClass)
+    val D = IconLoader.getIcon("d.svg", javaClass)
+    val E = IconLoader.getIcon("e.svg", javaClass)
+    val F = IconLoader.getIcon("f.svg", javaClass)
+    val G = IconLoader.getIcon("g.svg", javaClass)
+    val H = IconLoader.getIcon("h.svg", javaClass)
+    val I = IconLoader.getIcon("i.svg", javaClass)
+    val J = IconLoader.getIcon("j.svg", javaClass)
+    val K = IconLoader.getIcon("k.svg", javaClass)
+    val L = IconLoader.getIcon("l.svg", javaClass)
+    val M = IconLoader.getIcon("m.svg", javaClass)
+    val N = IconLoader.getIcon("n.svg", javaClass)
+    val O = IconLoader.getIcon("o.svg", javaClass)
+    val P = IconLoader.getIcon("p.svg", javaClass)
+    val Q = IconLoader.getIcon("q.svg", javaClass)
+    val R = IconLoader.getIcon("r.svg", javaClass)
+    val S = IconLoader.getIcon("s.svg", javaClass)
+    val T = IconLoader.getIcon("t.svg", javaClass)
+    val U = IconLoader.getIcon("u.svg", javaClass)
+    val V = IconLoader.getIcon("v.svg", javaClass)
+    val W = IconLoader.getIcon("w.svg", javaClass)
+    val X = IconLoader.getIcon("x.svg", javaClass)
+    val Y = IconLoader.getIcon("y.svg", javaClass)
+    val Z = IconLoader.getIcon("z.svg", javaClass)
 
-    val DELETE = IconLoader.getIcon("delete.svg", javaClass)
 }

src/main/kotlin/com/coder/gateway/icons/CoderIcons.kt

@@ -4,13 +4,15 @@ import com.coder.gateway.sdk.Arch
 import com.coder.gateway.sdk.OS
 import com.coder.gateway.sdk.v2.models.WorkspaceTransition
 import java.util.UUID
+import javax.swing.Icon
 
 data class WorkspaceAgentModel(
     val workspaceID: UUID,
     val workspaceName: String,
     val name: String,
     val templateID: UUID,
     val templateName: String,
+    val templateIcon: Icon,
     val status: WorkspaceVersionStatus,
     val agentStatus: WorkspaceAgentStatus,
     val lastBuildTransition: WorkspaceTransition,