Merge branch 'feature/q-lsp' into lodogga/downloadIndicator

aws · Feb 28, 2025 · 2b42b78 · 2b42b78
2 parents bad2661 + 6bfc0e5
commit 2b42b78
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 23 deletions.
diff --git a/.changes/3.57.json b/.changes/3.57.json
@@ -0,0 +1,20 @@
+{
+  "date" : "2025-02-28",
+  "version" : "3.57",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix suggestion not visible in remote for 2024.3"
+  }, {
+    "type" : "bugfix",
+    "description" : "/test: update capability card text"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /doc: update workspace too large error message"
+  }, {
+    "type" : "bugfix",
+    "description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
+  }, {
+    "type" : "bugfix",
+    "description" : "/transform: skip running tests locally when user chooses to do so"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-1a22ff93-2d99-4527-a73b-26dba66c4f71.json b/.changes/next-release/bugfix-1a22ff93-2d99-4527-a73b-26dba66c4f71.json
diff --git a/.changes/next-release/bugfix-2d7fabbf-8b6b-4a9d-8764-fb0286a5ea23.json b/.changes/next-release/bugfix-2d7fabbf-8b6b-4a9d-8764-fb0286a5ea23.json
diff --git a/.changes/next-release/bugfix-3adca794-d149-4f2e-bf7c-6f748f339849.json b/.changes/next-release/bugfix-3adca794-d149-4f2e-bf7c-6f748f339849.json
diff --git a/.changes/next-release/bugfix-8878216c-a256-4459-80de-8334711c8d53.json b/.changes/next-release/bugfix-8878216c-a256-4459-80de-8334711c8d53.json
diff --git a/.changes/next-release/bugfix-ce55123f-2437-4740-b9c8-c1069856e316.json b/.changes/next-release/bugfix-ce55123f-2437-4740-b9c8-c1069856e316.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# _3.57_ (2025-02-28)
+- **(Bug Fix)** Fix suggestion not visible in remote for 2024.3
+- **(Bug Fix)** /test: update capability card text
+- **(Bug Fix)** Amazon Q /doc: update workspace too large error message
+- **(Bug Fix)** Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message
+- **(Bug Fix)** /transform: skip running tests locally when user chooses to do so
+
 # _3.56_ (2025-02-20)
 - **(Feature)** Amazon Q /doc: support making changes to architecture diagrams
 

diff --git a/buildspec/windowsTestsForAmazonQ.yml b/buildspec/windowsTestsForAmazonQ.yml
@@ -8,6 +8,12 @@ env:
 phases:
   install:
     commands:
+      # force install java21 while we work through path issues
+      - |
+        $javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
+          ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
+        }
+        $JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
       - |
         if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
             [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
         # See https://github.com/NuGet/NuGet.Client/pull/4259
         $Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
 
+        $Env:JAVA_HOME = $JAVA_HOME
+
         if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
           $Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
           # $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

diff --git a/buildspec/windowsTestsForCore.yml b/buildspec/windowsTestsForCore.yml
@@ -8,6 +8,12 @@ env:
 phases:
   install:
     commands:
+      # force install java21 while we work through path issues
+      - |
+        $javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
+          ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
+        }
+        $JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
       - |
         if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
             [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
         # See https://github.com/NuGet/NuGet.Client/pull/4259
         $Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
 
+        $Env:JAVA_HOME = $JAVA_HOME
+
         if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
           $Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
           # $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

diff --git a/buildspec/windowsTestsForToolkit.yml b/buildspec/windowsTestsForToolkit.yml
@@ -8,6 +8,12 @@ env:
 phases:
   install:
     commands:
+      # force install java21 while we work through path issues
+      - |
+        $javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
+          ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
+        }
+        $JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
       - |
         if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
             [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
         # See https://github.com/NuGet/NuGet.Client/pull/4259
         $Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
 
+        $Env:JAVA_HOME = $JAVA_HOME
+
         if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
           $Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
           # $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.57-SNAPSHOT
+toolkitVersion=3.58-SNAPSHOT
 
 # Publish Settings
 publishToken=

diff --git a/...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt b/...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
@@ -45,6 +45,7 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.isDeveloperMode
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.auth.DefaultAuthCredentialsService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.createExtendedClientMetadata
 import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
@@ -303,6 +304,8 @@ private class AmazonQServerInstance(private val project: Project, private val cs
             }
             languageServer.initialized(InitializedParams())
         }
+
+        DefaultAuthCredentialsService(project, encryptionManager, this)
     }
 
     override fun dispose() {

diff --git a/...oftware/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt b/...oftware/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsService.kt
@@ -3,8 +3,14 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.auth
 
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
+import software.aws.toolkits.core.TokenConnectionSettings
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
+import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
+import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.BearerCredentials
@@ -15,7 +21,31 @@ import java.util.concurrent.CompletableFuture
 class DefaultAuthCredentialsService(
     private val project: Project,
     private val encryptionManager: JwtEncryptionManager,
-) : AuthCredentialsService {
+    serverInstance: Disposable,
+) : AuthCredentialsService,
+    BearerTokenProviderListener {
+    init {
+        project.messageBus.connect(serverInstance).subscribe(BearerTokenProviderListener.TOPIC, this)
+    }
+
+    override fun onChange(providerId: String, newScopes: List<String>?) {
+        val connection = ToolkitConnectionManager.getInstance(project)
+            .activeConnectionForFeature(QConnection.getInstance())
+            ?: return
+
+        val provider = (connection.getConnectionSettings() as? TokenConnectionSettings)
+            ?.tokenProvider
+            ?.delegate as? BearerTokenProvider
+            ?: return
+
+        provider.currentToken()?.accessToken?.let { token ->
+            updateTokenCredentials(token, false)
+        }
+    }
+
+    override fun invalidate(providerId: String) {
+        deleteTokenCredentials()
+    }
 
     override fun updateTokenCredentials(accessToken: String, encrypted: Boolean): CompletableFuture<ResponseMessage> {
         val token = if (encrypted) {

diff --git a/...are/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsServiceTest.kt b/...are/aws/toolkits/jetbrains/services/amazonq/lsp/auth/DefaultAuthCredentialsServiceTest.kt
@@ -3,10 +3,15 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.auth
 
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.project.Project
+import com.intellij.util.messages.MessageBus
+import com.intellij.util.messages.MessageBusConnection
 import io.mockk.every
+import io.mockk.just
 import io.mockk.mockk
+import io.mockk.runs
 import io.mockk.verify
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
 import org.junit.Before
@@ -42,7 +47,14 @@ class DefaultAuthCredentialsServiceTest {
             func.invoke(mockLanguageServer)
         }
 
-        sut = DefaultAuthCredentialsService(project, this.mockEncryptionManager)
+        // Mock message bus
+        val messageBus = mockk<MessageBus>()
+        every { project.messageBus } returns messageBus
+        val mockConnection = mockk<MessageBusConnection>()
+        every { messageBus.connect(any<Disposable>()) } returns mockConnection
+        every { mockConnection.subscribe(any(), any()) } just runs
+
+        sut = DefaultAuthCredentialsService(project, this.mockEncryptionManager, mockk())
     }
 
     @Test