Merge branch 'main' into scan-name

aws · Feb 28, 2025 · 55d169d · 55d169d
2 parents c693fa4 + 21aba02
commit 55d169d
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 21 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=