Skip to content

Commit 21f541f

Browse files
author
Vlad Nikolaenko
committed
Merge branch 'master' into feature/stepfunctions-workflow
2 parents bf4be27 + 46d76cb commit 21f541f

File tree

448 files changed

+24466
-22259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

448 files changed

+24466
-22259
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ module.exports = {
180180
'aws-toolkits/no-console-log': 'error',
181181
'aws-toolkits/no-json-stringify-in-log': 'error',
182182
'aws-toolkits/no-printf-mismatch': 'error',
183+
'aws-toolkits/no-index-import': 'error',
183184
'no-restricted-imports': [
184185
'error',
185186
{

.github/workflows/node.js.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,17 @@ jobs:
8484
git remote add forkUpstream https://github.com/$REPO_NAME # URL of the fork
8585
git fetch forkUpstream # Fetch fork
8686
87+
- name: Merge in target branch to avoid false negatives.
88+
env:
89+
TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
90+
# Note: "git merge" should always succeed here, because GHA won't
91+
# start the job if there are merge conflicts. https://github.com/orgs/community/discussions/11265
92+
# Also, because `git merge` makes a commit, we need to establish an identity to avoid 'Committer identity unknown' error
93+
run: |
94+
git config --global user.name "aws-toolkit-automation"
95+
git config --global user.email "<>"
96+
git merge origin/$TARGET_BRANCH
97+
8798
- name: Compute git diff
8899
env:
89100
CURRENT_BRANCH: ${{ github.head_ref }}

buildspec/release/80notify.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: 0.2
2+
3+
phases:
4+
install:
5+
runtime-versions:
6+
nodejs: 20
7+
8+
pre_build:
9+
commands:
10+
# Check for implicit env vars passed from the release pipeline.
11+
- test -n "${NOTIFY_URL}"
12+
- test -n "${TARGET_EXTENSION}"
13+
14+
build:
15+
commands:
16+
- echo "TARGET_EXTENSION=${TARGET_EXTENSION}"
17+
- EXTENSION_NAME=$([ "$TARGET_EXTENSION" = "amazonq" ] && echo "Amazon Q" || echo "AWS Toolkit")
18+
- VERSION=$(node -e "console.log(require('./packages/${TARGET_EXTENSION}/package.json').version);")
19+
- CHANGELOG=$(cat packages/${TARGET_EXTENSION}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print if $. == 2')
20+
- MESSAGE=$(envsubst < "$GITHUB_WORKSPACE/buildspec/release/notify.txt")
21+
- DATA="{'Content':'${MESSAGE}'}"
22+
- |
23+
# TODO: Enable for prod only after testing
24+
if [ "$STAGE" = "prod" ]; then
25+
echo "SKIPPED (stage=${STAGE}): 'curl -v POST \"[SLACK_URL]\" -H \"Content-Type:application/json\" --data $DATA'"
26+
exit 0
27+
fi
28+
curl -v POST "${NOTIFY_URL}" -H "Content-Type:application/json" --data $DATA

buildspec/release/notify.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Released ${EXTENSION_NAME} v${VERSION} for VSCode
2+
3+
${CHANGELOG}
4+
5+
Changelog: https://github.com/aws/aws-toolkit-vscode/blob/master/packages/${TARGET_EXTENSION}/CHANGELOG.md
6+
Release Arifact: https://github.com/aws/aws-toolkit-vscode/releases/tag/${TARGET_EXTENSION}/v${VERSION}

docs/faq-credentials.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ Issue [aws-toolkit-vscode#3667](https://github.com/aws/aws-toolkit-vscode/issues
1313
2. Attempt to sign in again with AWS Builder ID
1414
3. If sign is is successful you can remove the old folder: `rm -rf ~/.aws/sso-OLD`
1515
1. Or revert the change: `mv ~/.aws/sso-OLD ~/.aws/sso`
16+
17+
### AWS Shared Credentials File
18+
19+
When authenticating with IAM credentials, the profile name, access key, and secret key will be stored on disk at a default location of `~/.aws/credentials` on Linux and MacOS, and `%USERPROFILE%\.aws\credentials` on Windows machines. The toolkit also supports editting this file manually, with the format specified [here](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html#file-format-creds). The credentials files also supports [role assumption](https://docs.aws.amazon.com/sdkref/latest/guide/access-assume-role.html) and [MFA](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa.html). Note that this credentials file is shared between all local AWS development tools. For more information, see the full documentation [here](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html).

package-lock.json

Lines changed: 14511 additions & 17178 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@
3737
"clean": "npm run clean -w packages/ -w plugins/",
3838
"reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
40-
"mergeReports": "ts-node ./scripts/mergeReports.ts"
40+
"mergeReports": "ts-node ./scripts/mergeReports.ts",
41+
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
4142
},
4243
"devDependencies": {
43-
"@aws-toolkits/telemetry": "^1.0.295",
44+
"@aws-toolkits/telemetry": "^1.0.296",
4445
"@playwright/browser-chromium": "^1.43.1",
4546
"@stylistic/eslint-plugin": "^2.11.0",
4647
"@types/he": "^1.2.3",
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"date": "2025-02-13",
3+
"version": "1.47.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "`Send to prompt` and other context menu options not sent if chat was closed"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Amazon Q /test: Truncating user input to 4096 characters for unit test generation."
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "Amazon Q /test: Q identify active test file and infer source file for test generation."
16+
},
17+
{
18+
"type": "Bug Fix",
19+
"description": "/review: Code review starts automatically when invoked from menu"
20+
},
21+
{
22+
"type": "Feature",
23+
"description": "Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files"
24+
},
25+
{
26+
"type": "Feature",
27+
"description": "/transform: automatically download results when ready"
28+
},
29+
{
30+
"type": "Feature",
31+
"description": "/transform: support Java 21 transformations"
32+
},
33+
{
34+
"type": "Removal",
35+
"description": "Reverted prefetch logic to enable more stable inline completion"
36+
}
37+
]
38+
}
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": "/dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop"
4+
}

packages/amazonq/.changes/next-release/Bug Fix-704d175a-a99f-4ce7-bf08-b94d6f7218c0.json

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

0 commit comments

Comments
 (0)