Merge remote-tracking branch 'upstream/main' into sigv4

Author: Will-ShaoHua

.changes/3.56.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-02-20",
+  "version" : "3.56",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q /doc: support making changes to architecture diagrams"
+  } ]
+}

.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"
+  } ]
+}

.changes/3.58.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2025-03-06",
+  "version" : "3.58",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs"
+  }, {
+    "type" : "removal",
+    "description" : "The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing."
+  } ]
+}

.changes/next-release/bugfix-fd9065e5-2661-4250-852c-ec51deedd10f.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "fix Q chat request timeout"
+}

CHANGELOG.md

@@ -1,3 +1,17 @@
+# _3.58_ (2025-03-06)
+- **(Bug Fix)** Amazon Q: Fix data isolation between tabs to prevent interference when using /doc in multiple tabs
+- **(Removal)** The Amazon Q inline suggestion popup goes back to being under the suggestions and is always showing.
+
+# _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
+
 # _3.55_ (2025-02-13)
 - **(Feature)** /transform: support transformations to Java 21
 - **(Bug Fix)** Enable syntax highlighting when viewing diff for /test

CONTRIBUTING.md

@@ -31,6 +31,7 @@ reported the issue. Please try to include as much information as you can. Detail
     brew install dotnet@6
     ```
   * If Gradle cannot find `dotnet`, run `./gradlew --stop` and `./gradlew projects` to reload the daemon. Note that this should be done in your terminal as invoking Gradle through the IDE will use the IDE's cached PATH.
+* It is recommended to [launch your IDE from the terminal](https://www.jetbrains.com/help/idea/working-with-the-ide-features-from-command-line.html) due to a known issue with Gradle/Java 21 where the Gradle daemon does not respect your PATH variable when the IDE is started from the desktop/Toolbox.
 
 ### Instructions
 

buildspec/linuxIntegrationTests.yml

@@ -15,10 +15,6 @@ phases:
   install:
     commands:
       - startDocker.sh
-      # login to DockerHub so we don't get throttled
-      - export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`
-      - export DOCKER_PASSWORD=`echo $DOCKER_HUB_TOKEN | jq -r '.password'`
-      - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD || true
       # should probably be managed as an extension/rule in any tests that need a screen available
       - /usr/bin/Xvfb :22 -screen 0 1920x1080x24 &
 

buildspec/linuxUiTests.yml

@@ -21,11 +21,6 @@ phases:
     commands:
       - dnf install -y marco mate-media e2fsprogs
       - startDesktop.sh
-
-      # login to DockerHub so we don't get throttled
-      - export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`
-      - export DOCKER_PASSWORD=`echo $DOCKER_HUB_TOKEN | jq -r '.password'`
-      - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD || true
       - export PATH="$PATH:$HOME/.dotnet/tools"
       - dotnet codeartifact-creds install
 
@@ -47,7 +42,7 @@ phases:
       - chmod +x gradlew
 
       - ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:test coverageReport --console plain --info
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:uiTest coverageReport --console plain --info
 
   post_build:
     commands:

buildspec/windowsTests.yml

@@ -8,6 +8,12 @@ env:
 phases:
   install:
     commands:
+      # force install java21 while we work throuh 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

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