Skip to content

Commit 745c296

Browse files
committed
Fix: ssh config is not updated
- this happened if there was already a coder configuration present in the .ssh/config - coder cli was prompting for a yes/no in order to override the config but the plugin was not sending anything on stdin - the latest version of coder cli can provide a `--yes` flag for all prompts on config-ssh command - resolves #11
1 parent 299b260 commit 745c296

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

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

+4-13
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@ package com.coder.gateway.views.steps
33
import com.coder.gateway.CoderGatewayBundle
44
import com.coder.gateway.icons.CoderIcons
55
import com.coder.gateway.models.CoderWorkspacesWizardModel
6-
import com.coder.gateway.sdk.CoderCLIManager
7-
import com.coder.gateway.sdk.CoderRestClientService
8-
import com.coder.gateway.sdk.OS
9-
import com.coder.gateway.sdk.getOS
10-
import com.coder.gateway.sdk.toURL
11-
import com.coder.gateway.sdk.withPath
6+
import com.coder.gateway.sdk.*
127
import com.intellij.ide.BrowserUtil
138
import com.intellij.ide.IdeBundle
149
import com.intellij.openapi.Disposable
@@ -24,11 +19,7 @@ import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
2419
import com.intellij.ui.AppIcon
2520
import com.intellij.ui.components.JBTextField
2621
import com.intellij.ui.components.dialog
27-
import com.intellij.ui.dsl.builder.BottomGap
28-
import com.intellij.ui.dsl.builder.RightGap
29-
import com.intellij.ui.dsl.builder.TopGap
30-
import com.intellij.ui.dsl.builder.bindText
31-
import com.intellij.ui.dsl.builder.panel
22+
import com.intellij.ui.dsl.builder.*
3223
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
3324
import com.intellij.util.ui.JBFont
3425
import kotlinx.coroutines.CoroutineScope
@@ -110,8 +101,8 @@ class CoderAuthStepView : CoderWorkspacesWizardStep, Disposable {
110101
val loginOutput = ProcessExecutor().command(cli.toAbsolutePath().toString(), "login", model.coderURL, "--token", model.token).readOutput(true).execute().outputUTF8()
111102
logger.info("coder-cli login output: $loginOutput")
112103
pi.fraction = 0.8
113-
val sshConfigOutput = ProcessExecutor().command(cli.toAbsolutePath().toString(), "config-ssh").readOutput(true).execute().outputUTF8()
114-
logger.info("coder-cli config-ssh output: $sshConfigOutput")
104+
val sshConfigOutput = ProcessExecutor().command(cli.toAbsolutePath().toString(), "config-ssh", "--yes", "--use-previous-options").readOutput(true).execute().outputUTF8()
105+
logger.info("Result of `${cli.toAbsolutePath()} config-ssh --yes --use-previous-options`: $sshConfigOutput")
115106
pi.fraction = 1.0
116107
}
117108
}

0 commit comments

Comments
 (0)