Skip to content

fix(251): fix 251 gateway compilation #5514

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

Merged
merged 3 commits into from
Mar 26, 2025
Merged

fix(251): fix 251 gateway compilation #5514

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
983107e
fix(251): fix 251 gateway compilation
rli Mar 26, 2025
8ca7c94
drop 242
rli Mar 26, 2025
4f2fc40
drop 242
rli Mar 26, 2025
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
10 changes: 10 additions & 0 deletions ...t/jetbrains-gateway/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package compat.com.jetbrains.gateway.thinClientLink

import com.jetbrains.gateway.thinClientLink.LinkedClientManager
import com.jetbrains.rd.util.lifetime.Lifetime
import java.net.URI

fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, onStarted)
10 changes: 10 additions & 0 deletions ...ns-gateway/src-251+/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package compat.com.jetbrains.gateway.thinClientLink

Check notice

Code scanning / QDJVMC

Package name does not match containing directory Note

Package directive does not match the file location

import com.jetbrains.gateway.thinClientLink.LinkedClientManager
import com.jetbrains.rd.util.lifetime.Lifetime
import java.net.URI

fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, null, onStarted)

Check warning

Code scanning / QDJVMC

Unstable API Usage Warning

'com.jetbrains.gateway.thinClientLink.LinkedClientManager.Companion' is declared in unstable 'com.jetbrains.gateway.thinClientLink.LinkedClientManager' marked with @ApiStatus.Experimental

Check warning

Code scanning / QDJVMC

Unstable API Usage Warning

'getInstance()' is declared in unstable 'com.jetbrains.gateway.thinClientLink.LinkedClientManager' marked with @ApiStatus.Experimental

Check warning

Code scanning / QDJVMC

Unstable API Usage Warning

'startNewClient(com.jetbrains.rd.util.lifetime.Lifetime, java.net.URI, java.lang.String, java.lang.String, kotlin.jvm.functions.Function0)' is declared in unstable 'com.jetbrains.gateway.thinClientLink.LinkedClientManager' marked with @ApiStatus.Experimental
22 changes: 10 additions & 12 deletions ...s-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
package software.aws.toolkits.jetbrains.gateway.connection.workflow

import com.jetbrains.gateway.api.GatewayConnectionHandle
import com.jetbrains.gateway.thinClientLink.LinkedClientManager
import com.jetbrains.rd.util.lifetime.LifetimeDefinition
import com.jetbrains.rd.util.lifetime.onTermination
import com.jetbrains.rd.util.reactive.adviseEternal
import compat.com.jetbrains.gateway.thinClientLink.startNewClient
import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
import software.aws.toolkits.core.utils.getLogger
Expand Down Expand Up @@ -50,16 +49,15 @@
val clientHandle = ThinClientTrackerService.getInstance().associate(envId) {
val start = System.currentTimeMillis()
val thinClientHandle = try {
LinkedClientManager.getInstance()
.startNewClient(lifetime, localLink, URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8)) {
CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
project = null,
userId = lazilyGetUserId(),
result = TelemetryResult.Succeeded,
duration = System.currentTimeMillis() - start.toDouble(),
codecatalystDevEnvironmentWorkflowStep = "startThinClient",
)
}
startNewClient(lifetime, localLink, URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8)) {
CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
project = null,
userId = lazilyGetUserId(),
result = TelemetryResult.Succeeded,
duration = System.currentTimeMillis() - start.toDouble(),
codecatalystDevEnvironmentWorkflowStep = "startThinClient",

Check warning on line 58 in plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt

View check run for this annotation

Codecov / codecov/patch

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt#L52-L58 

Added lines #L52 - L58 were not covered by tests
)
}

Check warning on line 60 in plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt

View check run for this annotation

Codecov / codecov/patch

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt#L60 

Added line #L60 was not covered by tests
} catch (e: Throwable) {
CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
project = null,
Expand Down
Loading