Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix JetBrains Gateway Plugin to work on v222.2889.2 #10505

Merged
merged 1 commit into from
Jun 7, 2022
Merged

Fix JetBrains Gateway Plugin to work on v222.2889.2 #10505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...ns/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/gateway/GitpodConnectionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.openapi.progress.ProgressManager
import com.intellij.remote.RemoteCredentialsHolder
import com.intellij.ssh.AskAboutHostKey
import com.intellij.ssh.OpenSshLikeHostKeyVerifier
Expand Down Expand Up @@ -301,7 +302,11 @@ class GitpodConnectionProvider : GatewayConnectionProvider {
credentials.port = 22
credentials.userName = userName
credentials.password = password
credentials.connectionBuilder().withSshConnectionConfig {
credentials.connectionBuilder(
null,
ProgressManager.getGlobalProgressIndicator(),
false
).withSshConnectionConfig {
val hostKeyVerifier = it.hostKeyVerifier
if (hostKeyVerifier is OpenSshLikeHostKeyVerifier) {
val acceptHostKey = acceptHostKey(ideUrl, hostKeys)
Expand Down