Skip to content

Commit ea4e35a

Browse files
committed
Merge branch 'feature/amazonqLSP' into telemetry/setup
2 parents 42ed745 + 30cc909 commit ea4e35a

32 files changed

+255
-111
lines changed

buildspec/release/70checkmarketplace.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,32 @@ phases:
2222
build:
2323
commands:
2424
- VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
25-
# get extension name
25+
# get extension name, if in beta, use some hard-coded recent version
2626
- |
2727
if [ "${TARGET_EXTENSION}" = "amazonq" ]; then
2828
extension_name="amazonwebservices.amazon-q-vscode"
29+
[ "$STAGE" != "prod" ] && VERSION="1.43.0" || true
2930
elif [ "${TARGET_EXTENSION}" = "toolkit" ]; then
3031
extension_name="amazonwebservices.aws-toolkit-vscode"
32+
[ "$STAGE" != "prod" ] && VERSION="3.42.0" || true
3133
else
3234
echo checkmarketplace: "Unknown TARGET_EXTENSION: ${TARGET_EXTENSION}"
3335
exit 1
3436
fi
35-
# keep reinstalling the extension until the desired version is updated. Otherwise fail on codebuild timeout (1 hour).
37+
if [ "$STAGE" != "prod" ]; then
38+
echo "checkmarketplace: Non-production stage detected. Installing hardcoded version '${VERSION}'."
39+
fi
40+
# keep installing the desired extension version until successful. Otherwise fail on codebuild timeout (1 hour).
3641
- |
3742
while true; do
3843
code --uninstall-extension "${extension_name}" --no-sandbox --user-data-dir /tmp/vscode
39-
code --install-extension ${extension_name} --no-sandbox --user-data-dir /tmp/vscode
44+
code --install-extension "${extension_name}@${VERSION}" --no-sandbox --user-data-dir /tmp/vscode || true
4045
cur_version=$(code --list-extensions --show-versions --no-sandbox --user-data-dir /tmp/vscode | grep ${extension_name} | cut -d'@' -f2)
4146
if [ "${cur_version}" = "${VERSION}" ]; then
4247
echo "checkmarketplace: Extension ${extension_name} is updated to version '${cur_version}.'"
4348
break
4449
else
45-
echo "checkmarketplace: Current version '${cur_version}' does not match expected version '${VERSION}'. Retrying..."
50+
echo "checkmarketplace: Expected extension version '${VERSION}' has not been successfully installed. Retrying..."
4651
fi
4752
sleep 120 # Wait for 2 minutes before retrying
4853
done

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-01-30",
3+
"version": "1.45.0-SNAPSHOT",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Allow AB users with an overridden customization to go back to the default customization"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Add setting to allow Q /dev to run code and test commands"
16+
}
17+
]
18+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-01-30",
3+
"version": "1.45.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Allow AB users with an overridden customization to go back to the default customization"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Add setting to allow Q /dev to run code and test commands"
16+
}
17+
]
18+
}

packages/amazonq/.changes/next-release/Bug Fix-1d7e776d-333a-4f39-a8e6-29ea2ecb19c9.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.changes/next-release/Bug Fix-8212e8e4-f65f-4594-a04f-76d47c61b41e.json

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "Inline: Typos in the first example suggestion"
4+
}

packages/amazonq/.changes/next-release/Feature-10418729-4b46-4126-b1af-623a08f0223c.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.45.0 2025-01-30
2+
3+
- **Bug Fix** Allow AB users with an overridden customization to go back to the default customization
4+
- **Bug Fix** For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format
5+
- **Feature** Add setting to allow Q /dev to run code and test commands
6+
17
## 1.44.0 2025-01-23
28

39
- **Bug Fix** Amazon Q: word duplication when pressing tab on context selector fixed

0 commit comments

Comments
 (0)