From 9513b1d9fbf7fd38a8469e1d03d11451a183430c Mon Sep 17 00:00:00 2001 From: tomzu Date: Thu, 30 Jan 2025 11:42:51 -0500 Subject: [PATCH 1/3] added beta check and dummy version logics --- buildspec/release/70checkmarketplace.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/buildspec/release/70checkmarketplace.yml b/buildspec/release/70checkmarketplace.yml index c4c2314b98f..d2419f3decf 100644 --- a/buildspec/release/70checkmarketplace.yml +++ b/buildspec/release/70checkmarketplace.yml @@ -22,21 +22,31 @@ phases: build: commands: - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);") - # get extension name + # get extension name, also an old version for beta testing - | if [ "${TARGET_EXTENSION}" = "amazonq" ]; then extension_name="amazonwebservices.amazon-q-vscode" + beta_version="@1.43.0" elif [ "${TARGET_EXTENSION}" = "toolkit" ]; then extension_name="amazonwebservices.aws-toolkit-vscode" + beta_version="@3.42.0" else echo checkmarketplace: "Unknown TARGET_EXTENSION: ${TARGET_EXTENSION}" exit 1 fi + # If in beta, install specific extension versions + - | + if [ "$STAGE" != "prod" ]; then + VERSION=${beta_version#@} + echo "checkmarketplace: Non-production stage detected. Installing beta version '${VERSION}'." + else + beta_version="" + fi # keep reinstalling the extension until the desired version is updated. 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}${beta_version}" --no-sandbox --user-data-dir /tmp/vscode 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}.'" From c45ead051f8920e1a32e824093c90e0cbcf69bca Mon Sep 17 00:00:00 2001 From: tomzu Date: Thu, 30 Jan 2025 12:44:07 -0500 Subject: [PATCH 2/3] delete beta_version variable --- buildspec/release/70checkmarketplace.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/buildspec/release/70checkmarketplace.yml b/buildspec/release/70checkmarketplace.yml index d2419f3decf..3f1960965c6 100644 --- a/buildspec/release/70checkmarketplace.yml +++ b/buildspec/release/70checkmarketplace.yml @@ -22,37 +22,33 @@ phases: build: commands: - VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);") - # get extension name, also an old version for beta testing + # get extension name, if in beta, use some hard-coded recent version - | if [ "${TARGET_EXTENSION}" = "amazonq" ]; then extension_name="amazonwebservices.amazon-q-vscode" - beta_version="@1.43.0" + [ "$STAGE" != "prod" ] && VERSION="1.43.0" || true elif [ "${TARGET_EXTENSION}" = "toolkit" ]; then extension_name="amazonwebservices.aws-toolkit-vscode" - beta_version="@3.42.0" + [ "$STAGE" != "prod" ] && VERSION="3.42.0" || true else echo checkmarketplace: "Unknown TARGET_EXTENSION: ${TARGET_EXTENSION}" exit 1 fi - # If in beta, install specific extension versions - | if [ "$STAGE" != "prod" ]; then - VERSION=${beta_version#@} - echo "checkmarketplace: Non-production stage detected. Installing beta version '${VERSION}'." - else - beta_version="" + echo "checkmarketplace: Non-production stage detected. Installing hardcoded version '${VERSION}'." fi - # keep reinstalling the extension until the desired version is updated. Otherwise fail on codebuild timeout (1 hour). + # 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}${beta_version}" --no-sandbox --user-data-dir /tmp/vscode + code --install-extension "${extension_name}@${VERSION}" --no-sandbox --user-data-dir /tmp/vscode 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 From 597d1094aec89ddb3509dd6c8819516b3c8a49ff Mon Sep 17 00:00:00 2001 From: tomzu Date: Thu, 30 Jan 2025 18:20:03 -0500 Subject: [PATCH 3/3] add || true to install --- buildspec/release/70checkmarketplace.yml | 3 +-- packages/amazonq/.changes/1.45.0-SNAPSHOT.json | 18 ++++++++++++++++++ ...x-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json | 4 ---- ...x-8212e8e4-f65f-4594-a04f-76d47c61b41e.json | 4 ---- ...e-10418729-4b46-4126-b1af-623a08f0223c.json | 4 ---- packages/amazonq/CHANGELOG.md | 6 ++++++ 6 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 packages/amazonq/.changes/1.45.0-SNAPSHOT.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json delete mode 100644 packages/amazonq/.changes/next-release/Bug Fix-8212e8e4-f65f-4594-a04f-76d47c61b41e.json delete mode 100644 packages/amazonq/.changes/next-release/Feature-10418729-4b46-4126-b1af-623a08f0223c.json diff --git a/buildspec/release/70checkmarketplace.yml b/buildspec/release/70checkmarketplace.yml index 3f1960965c6..670dd2c7508 100644 --- a/buildspec/release/70checkmarketplace.yml +++ b/buildspec/release/70checkmarketplace.yml @@ -34,7 +34,6 @@ phases: echo checkmarketplace: "Unknown TARGET_EXTENSION: ${TARGET_EXTENSION}" exit 1 fi - - | if [ "$STAGE" != "prod" ]; then echo "checkmarketplace: Non-production stage detected. Installing hardcoded version '${VERSION}'." fi @@ -42,7 +41,7 @@ phases: - | while true; do code --uninstall-extension "${extension_name}" --no-sandbox --user-data-dir /tmp/vscode - code --install-extension "${extension_name}@${VERSION}" --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}.'" diff --git a/packages/amazonq/.changes/1.45.0-SNAPSHOT.json b/packages/amazonq/.changes/1.45.0-SNAPSHOT.json new file mode 100644 index 00000000000..881d3e94e5a --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json b/packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json deleted file mode 100644 index 385dab866b7..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "Allow AB users with an overridden customization to go back to the default customization" -} diff --git a/packages/amazonq/.changes/next-release/Bug Fix-8212e8e4-f65f-4594-a04f-76d47c61b41e.json b/packages/amazonq/.changes/next-release/Bug Fix-8212e8e4-f65f-4594-a04f-76d47c61b41e.json deleted file mode 100644 index 4ce7a420280..00000000000 --- a/packages/amazonq/.changes/next-release/Bug Fix-8212e8e4-f65f-4594-a04f-76d47c61b41e.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Bug Fix", - "description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format" -} diff --git a/packages/amazonq/.changes/next-release/Feature-10418729-4b46-4126-b1af-623a08f0223c.json b/packages/amazonq/.changes/next-release/Feature-10418729-4b46-4126-b1af-623a08f0223c.json deleted file mode 100644 index c957071b238..00000000000 --- a/packages/amazonq/.changes/next-release/Feature-10418729-4b46-4126-b1af-623a08f0223c.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "Feature", - "description": "Add setting to allow Q /dev to run code and test commands" -} diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md index 668eb5726ac..df419071b65 100644 --- a/packages/amazonq/CHANGELOG.md +++ b/packages/amazonq/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.45.0-SNAPSHOT 2025-01-30 + +- **Bug Fix** Allow AB users with an overridden customization to go back to the default customization +- **Bug Fix** For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format +- **Feature** Add setting to allow Q /dev to run code and test commands + ## 1.44.0 2025-01-23 - **Bug Fix** Amazon Q: word duplication when pressing tab on context selector fixed