Skip to content

Commit 752a557

Browse files
committed
Run linter
1 parent 2cccef3 commit 752a557

File tree

7 files changed

+26
-19
lines changed

7 files changed

+26
-19
lines changed

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,7 @@ class CoderCLIManager(
506506
workspace: Workspace,
507507
currentUser: User,
508508
agent: WorkspaceAgent,
509-
): String {
510-
return getHostName(url, workspace, currentUser, agent) + "--bg"
511-
}
512-
509+
): String = getHostName(url, workspace, currentUser, agent) + "--bg"
513510

514511
/**
515512
* This function returns the identifier for the workspace to pass to the

src/main/kotlin/com/coder/gateway/sdk/CoderRestClient.kt

+10-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@ import com.coder.gateway.sdk.convertors.OSConverter
88
import com.coder.gateway.sdk.convertors.UUIDConverter
99
import com.coder.gateway.sdk.ex.APIResponseException
1010
import com.coder.gateway.sdk.v2.CoderV2RestFacade
11-
import com.coder.gateway.sdk.v2.models.*
11+
import com.coder.gateway.sdk.v2.models.BuildInfo
12+
import com.coder.gateway.sdk.v2.models.CreateWorkspaceBuildRequest
13+
import com.coder.gateway.sdk.v2.models.Template
14+
import com.coder.gateway.sdk.v2.models.User
15+
import com.coder.gateway.sdk.v2.models.Workspace
16+
import com.coder.gateway.sdk.v2.models.WorkspaceAgent
17+
import com.coder.gateway.sdk.v2.models.WorkspaceBuild
18+
import com.coder.gateway.sdk.v2.models.WorkspaceResource
19+
import com.coder.gateway.sdk.v2.models.WorkspaceStatus
20+
import com.coder.gateway.sdk.v2.models.WorkspaceTransition
1221
import com.coder.gateway.settings.CoderSettings
1322
import com.coder.gateway.settings.CoderSettingsState
1423
import com.coder.gateway.util.CoderHostnameVerifier

src/main/kotlin/com/coder/gateway/settings/CoderSettings.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ open class CoderSettingsState(
9999
// Value for --log-dir.
100100
open var sshLogDirectory: String = "",
101101
// Default filter for fetching workspaces
102-
open var workspaceFilter: String = "owner:me"
102+
open var workspaceFilter: String = "owner:me",
103103
)
104104

105105
/**

src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
244244
foreground = Color.GRAY
245245
}
246246
}
247-
label(workspaceProjectIDE.name.replace(workspaceName+".","")).resizableColumn()
247+
label(workspaceProjectIDE.name.replace(workspaceName + ".", "")).resizableColumn()
248248
label(workspaceProjectIDE.ideName).applyToComponent {
249249
foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND
250250
font = ComponentPanelBuilder.getCommentFont(font)

src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import com.intellij.openapi.application.ModalityState
3333
import com.intellij.openapi.application.asContextElement
3434
import com.intellij.openapi.components.service
3535
import com.intellij.openapi.diagnostic.Logger
36-
import com.intellij.openapi.observable.properties.ObservableMutableProperty
3736
import com.intellij.openapi.rd.util.launchUnderBackgroundProgress
3837
import com.intellij.openapi.ui.panel.ComponentPanelBuilder
3938
import com.intellij.openapi.ui.setEmptyState
@@ -90,7 +89,7 @@ private const val SESSION_TOKEN_KEY = "session-token"
9089
private data class CoderWorkspacesFormFields(
9190
var coderURL: String = "",
9291
var token: Pair<String, Source>? = null,
93-
var useExistingToken: Boolean = false
92+
var useExistingToken: Boolean = false,
9493
)
9594

9695
/**

src/test/kotlin/com/coder/gateway/cli/CoderCLIManagerTest.kt

+11-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.coder.gateway.cli.ex.SSHConfigFormatException
66
import com.coder.gateway.sdk.DataGen
77
import com.coder.gateway.sdk.DataGen.Companion.workspace
88
import com.coder.gateway.sdk.v2.models.Workspace
9-
import com.coder.gateway.sdk.v2.models.WorkspaceAgent
109
import com.coder.gateway.settings.CODER_SSH_CONFIG_OPTIONS
1110
import com.coder.gateway.settings.CoderSettings
1211
import com.coder.gateway.settings.CoderSettingsState
@@ -308,19 +307,16 @@ internal class CoderCLIManagerTest {
308307
val extraConfig: String = "",
309308
val env: Environment = Environment(),
310309
val sshLogDirectory: Path? = null,
311-
val url: URL? = null
310+
val url: URL? = null,
312311
)
313312

314313
@Test
315314
fun testConfigureSSH() {
316-
317315
val workspace = workspace("foo", agents = mapOf("agent1" to UUID.randomUUID().toString()))
318316
val workspace2 = workspace("bar", agents = mapOf("agent1" to UUID.randomUUID().toString()))
319317
val betterWorkspace = workspace("foo", agents = mapOf("agent1" to UUID.randomUUID().toString()), ownerName = "bettertester")
320318
val workspaceWithMultipleAgents = workspace("foo", agents = mapOf("agent1" to UUID.randomUUID().toString(), "agent2" to UUID.randomUUID().toString()))
321319

322-
323-
324320
val extraConfig =
325321
listOf(
326322
"ServerAliveInterval 5",
@@ -422,7 +418,7 @@ internal class CoderCLIManagerTest {
422418
input = null,
423419
output = "multiple-agents",
424420
remove = "blank",
425-
)
421+
),
426422
)
427423

428424
val newlineRe = "\r?\n".toRegex()
@@ -468,9 +464,15 @@ internal class CoderCLIManagerTest {
468464
}
469465

470466
// Add workspaces.
471-
ccm.configSsh(it.workspaces.flatMap { ws -> ws.latestBuild.resources.filter { r -> r.agents != null }.flatMap { r -> r.agents!! }.map { a ->
472-
ws to a
473-
} }.toSet(), DataGen.user(), it.features)
467+
ccm.configSsh(
468+
it.workspaces.flatMap { ws ->
469+
ws.latestBuild.resources.filter { r -> r.agents != null }.flatMap { r -> r.agents!! }.map { a ->
470+
ws to a
471+
}
472+
}.toSet(),
473+
DataGen.user(),
474+
it.features,
475+
)
474476

475477
assertEquals(expectedConf, settings.sshConfigPath.toFile().readText())
476478

src/test/kotlin/com/coder/gateway/sdk/DataGen.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class DataGen {
6565
),
6666
outdated = false,
6767
name = name,
68-
ownerName = ownerName
68+
ownerName = ownerName,
6969
)
7070
}
7171

0 commit comments

Comments
 (0)