Skip to content

Revert 5800 rli/bid hack revert #5806

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

Closed
wants to merge 12 commits into from
Closed

Revert 5800 rli/bid hack revert #5806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
37d60c0
feat(amazonq): expose 'Manage Subscriptions' action for builder id pa…
rli Jun 3, 2025
c14839f
hack for bugbash
rli Jun 3, 2025
aaf892e
Merge main into feature/bid-paid
aws-toolkit-automation Jun 3, 2025
1f0be54
fix(amazonq): update login copy for builder id / IdC
rli Jun 4, 2025
c2fc89f
Merge remote-tracking branch 'origin/main' into HEAD
rli Jun 5, 2025
8cb5ea2
Merge pull request #5791 from aws/autoMerge/feature/bid-paid
rli Jun 6, 2025
f8cd8a4
fix(amazonq): revert builder id "hack for bugbash" (#5800)
rli Jun 9, 2025
c6f87aa
changelog
rli Jun 9, 2025
4cd8626
Merge main into feature/bid-paid
aws-toolkit-automation Jun 9, 2025
f65dbd2
Merge main into feature/bid-paid
aws-toolkit-automation Jun 9, 2025
e6a33d3
Merge main into feature/bid-paid
aws-toolkit-automation Jun 10, 2025
396c4b4
Revert "fix(amazonq): revert builder id "hack for bugbash" (#5800)"
rli Jun 10, 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
6 changes: 3 additions & 3 deletions ...community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import com.intellij.idea.AppMode
import com.intellij.openapi.Disposable
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.ui.components.JBLoadingPanel
Expand All @@ -20,14 +19,14 @@
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import software.amazon.awssdk.utils.UserHomeDirectoryUtils
import software.aws.toolkits.jetbrains.core.coroutines.EDT
import software.aws.toolkits.jetbrains.isDeveloperMode
import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
import software.aws.toolkits.jetbrains.services.amazonq.apps.AppConnection
import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageTypeRegistry
import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
Expand All @@ -44,6 +43,7 @@
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
import software.aws.toolkits.resources.message
import java.nio.file.Paths
import java.util.concurrent.CompletableFuture
import javax.swing.JButton

Expand Down Expand Up @@ -116,7 +116,7 @@
wrapper.setContent(loadingPanel)

scope.launch {
val webUri = service<ArtifactManager>().fetchArtifact(project).resolve("amazonq-ui.js").toUri()
val webUri = Paths.get(UserHomeDirectoryUtils.userHomeDirectory(), "amazonq-ui.js").toAbsolutePath().toUri()

Check warning on line 119 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt#L119 

Added line #L119 was not covered by tests
// wait for server to be running
AmazonQLspService.getInstance(project).instanceFlow.first()

Expand Down
4 changes: 3 additions & 1 deletion ...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
import org.eclipse.lsp4j.launch.LSPLauncher
import org.slf4j.event.Level
import software.amazon.awssdk.utils.UserHomeDirectoryUtils
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.info
Expand Down Expand Up @@ -94,6 +95,7 @@
import java.nio.charset.StandardCharsets
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
import java.util.concurrent.Future
import java.util.concurrent.TimeUnit
import kotlin.time.Duration.Companion.seconds
Expand Down Expand Up @@ -391,7 +393,7 @@

val cmd = NodeExePatcher.patch(nodePath)
.withParameters(
LspSettings.getInstance().getArtifactPath() ?: artifact.resolve("aws-lsp-codewhisperer.js").toString(),
Paths.get(UserHomeDirectoryUtils.userHomeDirectory(), "aws-lsp-codewhisperer.js").toAbsolutePath().toString(),

Check warning on line 396 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt#L396 

Added line #L396 was not covered by tests
"--stdio",
"--set-credentials-encryption-key",
).withEnvironment(
Expand Down
Loading