Skip to content

Commit 165096c

Browse files
committed
Merge branch 'master' into noForEach2
2 parents 117a8f9 + 9f9ff90 commit 165096c

File tree

75 files changed

+806
-283
lines changed

Some content is hidden

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

75 files changed

+806
-283
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88

99
- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
1010
- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
11-
12-
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
11+
- License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

.github/workflows/lintcommit.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Invalid pull request title: \`${title}\`
130130
* scope: lowercase, <30 chars
131131
* subject: must be <100 chars
132132
* documentation: https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title
133+
* Hint: *close and re-open the PR* to re-trigger CI (after fixing the PR title).
133134
`
134135
: `Pull request title matches the [expected format](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title).`
135136

.github/workflows/node.js.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@ on:
77
push:
88
branches: [master, staging]
99
pull_request:
10-
branches: [master, feature/*, staging]
11-
# Default = opened + synchronize + reopened.
12-
# We also want "edited" so that lint-commits runs when PR title is updated.
10+
# By default, CI will trigger on opened/synchronize/reopened event types.
1311
# https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
14-
types:
15-
- edited
16-
- opened
17-
- reopened
18-
- synchronize
12+
# Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
13+
branches: [master, feature/*, staging]
1914

2015
# Cancel old jobs when a pull request is updated.
2116
concurrency:
@@ -24,6 +19,7 @@ concurrency:
2419

2520
jobs:
2621
lint-commits:
22+
# Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
2723
runs-on: ubuntu-latest
2824
steps:
2925
- uses: actions/checkout@v4

.github/workflows/notification.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@ name: Notifications
66
on:
77
# `pull_request_target` (as opposed to `pull_request`) gives permissions to comment on PRs.
88
pull_request_target:
9-
branches: [master, feature/*, staging]
10-
# Default = opened + synchronize + reopened.
11-
# We also want "edited" so that changelog notifications runs when PR title is updated.
9+
# By default, CI will trigger on opened/synchronize/reopened event types.
1210
# https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
13-
types:
14-
- edited
15-
- opened
16-
- reopened
17-
- synchronize
11+
# Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
12+
branches: [master, feature/*, staging]
1813

1914
# Cancel old jobs when a pull request is updated.
2015
concurrency:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ AWS Toolkit is a [VS Code extension](https://marketplace.visualstudio.com/itemde
2727
- Connect with [IAM credentials](https://docs.aws.amazon.com/sdkref/latest/guide/access-users.html),
2828
[IAM Identity Center (SSO)](https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html),
2929
or [AWS Builder ID](https://docs.aws.amazon.com/signin/latest/userguide/differences-aws_builder_id.html)
30+
- Connect VSCode to your EC2 instances
3031
- Connect to your [CodeCatalyst](https://codecatalyst.aws/) Dev Environments
3132
- Debug your Lambda functions using [SAM CLI](https://github.com/aws/aws-sam-cli)
3233
- Check and autocomplete code in SAM/CFN (CloudFormation) `template.yaml` files
33-
- `Open Terminal` on your ECS tasks
34+
- `Open Terminal` on your EC2 instances or ECS tasks
3435
- `Search Log Group` on your CloudWatch logs
3536
- Browse your AWS resources
3637

package-lock.json

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"date": "2024-12-17",
3+
"version": "1.41.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "/review: Apply fix removes other issues in the same file."
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "Improve when the welcome page is shown in amazon q chat"
16+
},
17+
{
18+
"type": "Bug Fix",
19+
"description": "Code Review: Cleaned up output logs when running /review"
20+
},
21+
{
22+
"type": "Bug Fix",
23+
"description": "Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file."
24+
},
25+
{
26+
"type": "Bug Fix",
27+
"description": "Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly"
28+
},
29+
{
30+
"type": "Bug Fix",
31+
"description": "/review: Diagnostics in the problems panel are mapped to the wrong code"
32+
},
33+
{
34+
"type": "Bug Fix",
35+
"description": "Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities"
36+
},
37+
{
38+
"type": "Bug Fix",
39+
"description": "Auth: SSO session was bad, but no reauth prompt given"
40+
},
41+
{
42+
"type": "Bug Fix",
43+
"description": "Reduce frequency of system status poll"
44+
},
45+
{
46+
"type": "Bug Fix",
47+
"description": "Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt."
48+
},
49+
{
50+
"type": "Bug Fix",
51+
"description": "Code Review: Fixed a bug where projects with repeated path names did not scan properly."
52+
},
53+
{
54+
"type": "Feature",
55+
"description": "/review: Code fix automatically scrolls into view after generation."
56+
},
57+
{
58+
"type": "Feature",
59+
"description": "Chat: improve font size and line-height in footer (below prompt input field)"
60+
}
61+
]
62+
}

packages/amazonq/.changes/next-release/Bug Fix-1fd5992c-cc2e-49ac-8afc-360d7f0a3966.json

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

packages/amazonq/.changes/next-release/Bug Fix-3fa18fc3-cf5c-4816-86fa-07d9a90077c5.json

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

packages/amazonq/.changes/next-release/Bug Fix-49ee4921-044b-48b0-b51c-4e7054e84e6a.json

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

0 commit comments

Comments
 (0)