Merge master into feature/serverlessland

buildspec/release/70checkmarketplace.yml

@@ -22,27 +22,32 @@ phases:
     build:
         commands:
             - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
-            # get extension name
+            # get extension name, if in beta, use some hard-coded recent version
             - |
                 if [ "${TARGET_EXTENSION}" = "amazonq" ]; then
                   extension_name="amazonwebservices.amazon-q-vscode"
+                  [ "$STAGE" != "prod" ] && VERSION="1.43.0" || true
                 elif [ "${TARGET_EXTENSION}" = "toolkit" ]; then
                   extension_name="amazonwebservices.aws-toolkit-vscode"
+                  [ "$STAGE" != "prod" ] && VERSION="3.42.0" || true
                 else
                   echo checkmarketplace: "Unknown TARGET_EXTENSION: ${TARGET_EXTENSION}"
                   exit 1
                 fi
-            # keep reinstalling the extension until the desired version is updated. Otherwise fail on codebuild timeout (1 hour).
+                if [ "$STAGE" != "prod" ]; then
+                  echo "checkmarketplace: Non-production stage detected. Installing hardcoded version '${VERSION}'."
+                fi
+            # keep installing the desired extension version until successful. Otherwise fail on codebuild timeout (1 hour).
             - |
                 while true; do
                   code --uninstall-extension "${extension_name}" --no-sandbox --user-data-dir /tmp/vscode
-                  code --install-extension ${extension_name} --no-sandbox --user-data-dir /tmp/vscode
+                  code --install-extension "${extension_name}@${VERSION}" --no-sandbox --user-data-dir /tmp/vscode || true
                   cur_version=$(code --list-extensions --show-versions --no-sandbox --user-data-dir /tmp/vscode | grep ${extension_name} | cut -d'@' -f2)
                   if [ "${cur_version}" = "${VERSION}" ]; then
                     echo "checkmarketplace: Extension ${extension_name} is updated to version '${cur_version}.'"
                     break
                   else
-                    echo "checkmarketplace: Current version '${cur_version}' does not match expected version '${VERSION}'. Retrying..."
+                    echo "checkmarketplace: Expected extension version '${VERSION}' has not been successfully installed. Retrying..."
                   fi
                   sleep 120 # Wait for 2 minutes before retrying
                 done

packages/amazonq/.changes/1.45.0-SNAPSHOT.json

@@ -0,0 +1,18 @@
+{
+	"date": "2025-01-30",
+	"version": "1.45.0-SNAPSHOT",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Allow AB users with an overridden customization to go back to the default customization"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
+		},
+		{
+			"type": "Feature",
+			"description": "Add setting to allow Q /dev to run code and test commands"
+		}
+	]
+}