Run linter

code-asher · code-asher · commit 752a55762502 · 2024-10-03T15:53:53.000-08:00
diff --git a/src/main/kotlin/com/coder/gateway/cli/CoderCLIManager.kt b/src/main/kotlin/com/coder/gateway/cli/CoderCLIManager.kt
@@ -506,10 +506,7 @@ class CoderCLIManager(
             workspace: Workspace,
             currentUser: User,
             agent: WorkspaceAgent,
-        ): String {
-            return getHostName(url, workspace, currentUser, agent) + "--bg"
-        }
-
+        ): String = getHostName(url, workspace, currentUser, agent) + "--bg"
 
         /**
          * This function returns the identifier for the workspace to pass to the
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt
@@ -8,7 +8,16 @@ import com.coder.gateway.sdk.convertors.OSConverter
 import com.coder.gateway.sdk.convertors.UUIDConverter
 import com.coder.gateway.sdk.ex.APIResponseException
 import com.coder.gateway.sdk.v2.CoderV2RestFacade
-import com.coder.gateway.sdk.v2.models.*
+import com.coder.gateway.sdk.v2.models.BuildInfo
+import com.coder.gateway.sdk.v2.models.CreateWorkspaceBuildRequest
+import com.coder.gateway.sdk.v2.models.Template
+import com.coder.gateway.sdk.v2.models.User
+import com.coder.gateway.sdk.v2.models.Workspace
+import com.coder.gateway.sdk.v2.models.WorkspaceAgent
+import com.coder.gateway.sdk.v2.models.WorkspaceBuild
+import com.coder.gateway.sdk.v2.models.WorkspaceResource
+import com.coder.gateway.sdk.v2.models.WorkspaceStatus
+import com.coder.gateway.sdk.v2.models.WorkspaceTransition
 import com.coder.gateway.settings.CoderSettings
 import com.coder.gateway.settings.CoderSettingsState
 import com.coder.gateway.util.CoderHostnameVerifier
diff --git a/src/main/kotlin/com/coder/gateway/settings/CoderSettings.kt b/src/main/kotlin/com/coder/gateway/settings/CoderSettings.kt
@@ -99,7 +99,7 @@ open class CoderSettingsState(
     // Value for --log-dir.
     open var sshLogDirectory: String = "",
     // Default filter for fetching workspaces
-    open var workspaceFilter: String = "owner:me"
+    open var workspaceFilter: String = "owner:me",
 )
 
 /**
diff --git a/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt b/src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt
@@ -244,7 +244,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
                                         foreground = Color.GRAY
                                     }
                                 }
-                                label(workspaceProjectIDE.name.replace(workspaceName+".","")).resizableColumn()
+                                label(workspaceProjectIDE.name.replace(workspaceName + ".", "")).resizableColumn()
                                 label(workspaceProjectIDE.ideName).applyToComponent {
                                     foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND
                                     font = ComponentPanelBuilder.getCommentFont(font)
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -33,7 +33,6 @@ import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.asContextElement
 import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.observable.properties.ObservableMutableProperty
 import com.intellij.openapi.rd.util.launchUnderBackgroundProgress
 import com.intellij.openapi.ui.panel.ComponentPanelBuilder
 import com.intellij.openapi.ui.setEmptyState
@@ -90,7 +89,7 @@ private const val SESSION_TOKEN_KEY = "session-token"
 private data class CoderWorkspacesFormFields(
     var coderURL: String = "",
     var token: Pair<String, Source>? = null,
-    var useExistingToken: Boolean = false
+    var useExistingToken: Boolean = false,
 )
 
 /**
diff --git a/src/test/kotlin/com/coder/gateway/cli/CoderCLIManagerTest.kt b/src/test/kotlin/com/coder/gateway/cli/CoderCLIManagerTest.kt
@@ -6,7 +6,6 @@ import com.coder.gateway.cli.ex.SSHConfigFormatException
 import com.coder.gateway.sdk.DataGen
 import com.coder.gateway.sdk.DataGen.Companion.workspace
 import com.coder.gateway.sdk.v2.models.Workspace
-import com.coder.gateway.sdk.v2.models.WorkspaceAgent
 import com.coder.gateway.settings.CODER_SSH_CONFIG_OPTIONS
 import com.coder.gateway.settings.CoderSettings
 import com.coder.gateway.settings.CoderSettingsState
@@ -308,19 +307,16 @@ internal class CoderCLIManagerTest {
         val extraConfig: String = "",
         val env: Environment = Environment(),
         val sshLogDirectory: Path? = null,
-        val url: URL? = null
+        val url: URL? = null,
     )
 
     @Test
     fun testConfigureSSH() {
-
         val workspace = workspace("foo", agents = mapOf("agent1" to UUID.randomUUID().toString()))
         val workspace2 = workspace("bar", agents = mapOf("agent1" to UUID.randomUUID().toString()))
         val betterWorkspace = workspace("foo", agents = mapOf("agent1" to UUID.randomUUID().toString()), ownerName = "bettertester")
         val workspaceWithMultipleAgents = workspace("foo", agents = mapOf("agent1" to UUID.randomUUID().toString(), "agent2" to UUID.randomUUID().toString()))
 
-
-
         val extraConfig =
             listOf(
                 "ServerAliveInterval 5",
@@ -422,7 +418,7 @@ internal class CoderCLIManagerTest {
                     input = null,
                     output = "multiple-agents",
                     remove = "blank",
-                )
+                ),
             )
 
         val newlineRe = "\r?\n".toRegex()
@@ -468,9 +464,15 @@ internal class CoderCLIManagerTest {
                     }
 
             // Add workspaces.
-            ccm.configSsh(it.workspaces.flatMap { ws -> ws.latestBuild.resources.filter { r -> r.agents != null }.flatMap { r -> r.agents!! }.map { a ->
-                ws to a
-            } }.toSet(), DataGen.user(), it.features)
+            ccm.configSsh(
+                it.workspaces.flatMap { ws ->
+                    ws.latestBuild.resources.filter { r -> r.agents != null }.flatMap { r -> r.agents!! }.map { a ->
+                        ws to a
+                    }
+                }.toSet(),
+                DataGen.user(),
+                it.features,
+            )
 
             assertEquals(expectedConf, settings.sshConfigPath.toFile().readText())
 
diff --git a/src/test/kotlin/com/coder/gateway/sdk/DataGen.kt b/src/test/kotlin/com/coder/gateway/sdk/DataGen.kt
@@ -65,7 +65,7 @@ class DataGen {
                 ),
                 outdated = false,
                 name = name,
-                ownerName = ownerName
+                ownerName = ownerName,
             )
         }
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ open class CoderSettingsState(`
`99`	`99`	`// Value for --log-dir.`
`100`	`100`	`open var sshLogDirectory: String = "",`
`101`	`101`	`// Default filter for fetching workspaces`
`102`		`- open var workspaceFilter: String = "owner:me"`
	`102`	`+ open var workspaceFilter: String = "owner:me",`
`103`	`103`	`)`
`104`	`104`
`105`	`105`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:`
`244`	`244`	`foreground = Color.GRAY`
`245`	`245`	`}`
`246`	`246`	`}`
`247`		`- label(workspaceProjectIDE.name.replace(workspaceName+".","")).resizableColumn()`
	`247`	`+ label(workspaceProjectIDE.name.replace(workspaceName + ".", "")).resizableColumn()`
`248`	`248`	`label(workspaceProjectIDE.ideName).applyToComponent {`
`249`	`249`	`foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND`
`250`	`250`	`font = ComponentPanelBuilder.getCommentFont(font)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class DataGen {`
`65`	`65`	`),`
`66`	`66`	`outdated = false,`
`67`	`67`	`name = name,`
`68`		`- ownerName = ownerName`
	`68`	`+ ownerName = ownerName,`
`69`	`69`	`)`
`70`	`70`	`}`
`71`	`71`