Skip to content

Commit cba36d2

Browse files
committed
resolve merge conflict
2 parents c57c0fa + 337959a commit cba36d2

File tree

233 files changed

+17280
-2019
lines changed

Some content is hidden

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

233 files changed

+17280
-2019
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
---
88

9-
<!--- REMINDER: Ensure that your PR meets the guidelines in CONTRIBUTING.md -->
9+
- Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time.
10+
- Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
1011

1112
License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
1-
# github actions: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-nodejs
2-
# setup-node: https://github.com/actions/setup-node
1+
# # github actions: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-nodejs
2+
# # setup-node: https://github.com/actions/setup-node
33

4-
name: Copy-Paste Detection
4+
# name: Copy-Paste Detection
55

6-
on:
7-
pull_request:
8-
branches: [master, feature/*, staging]
6+
# on:
7+
# pull_request:
8+
# branches: [master, feature/*, staging]
99

10-
jobs:
11-
jscpd:
12-
runs-on: ubuntu-latest
13-
strategy:
14-
matrix:
15-
node-version: [18.x]
16-
env:
17-
NODE_OPTIONS: '--max-old-space-size=8192'
10+
# jobs:
11+
# jscpd:
12+
# runs-on: ubuntu-latest
13+
# strategy:
14+
# matrix:
15+
# node-version: [18.x]
16+
# env:
17+
# NODE_OPTIONS: '--max-old-space-size=8192'
1818

19-
steps:
20-
- uses: actions/checkout@v4
21-
with:
22-
fetch-depth: 0
19+
# steps:
20+
# - uses: actions/checkout@v4
21+
# with:
22+
# fetch-depth: 0
2323

24-
- name: Use Node.js ${{ matrix.node-version }}
25-
uses: actions/setup-node@v4
26-
with:
27-
node-version: ${{ matrix.node-version }}
24+
# - name: Use Node.js ${{ matrix.node-version }}
25+
# uses: actions/setup-node@v4
26+
# with:
27+
# node-version: ${{ matrix.node-version }}
2828

29-
- name: Fetch fork upstream
30-
run: |
31-
git remote add forkUpstream https://github.com/${{ github.event.pull_request.head.repo.full_name }} # URL of the fork
32-
git fetch forkUpstream # Fetch fork
29+
# - name: Fetch fork upstream
30+
# run: |
31+
# git remote add forkUpstream https://github.com/${{ github.event.pull_request.head.repo.full_name }} # URL of the fork
32+
# git fetch forkUpstream # Fetch fork
3333

34-
- name: Determine base and target branches for comparison.
35-
run: |
36-
echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
37-
echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
38-
- run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt
39-
- run: |
40-
npm install -g jscpd
34+
# - name: Determine base and target branches for comparison.
35+
# run: |
36+
# echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
37+
# echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
38+
# - run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt
39+
# - run: |
40+
# npm install -g jscpd
4141

42-
- run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json"
42+
# - run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json"
4343

44-
- if: always()
45-
uses: actions/upload-artifact@v4
46-
with:
47-
name: unfiltered-jscpd-report
48-
path: ./jscpd-report.json
44+
# - if: always()
45+
# uses: actions/upload-artifact@v4
46+
# with:
47+
# name: unfiltered-jscpd-report
48+
# path: ./jscpd-report.json
4949

50-
- name: Filter jscpd report for changed files
51-
run: |
52-
if [ ! -f ./jscpd-report.json ]; then
53-
echo "jscpd-report.json not found"
54-
exit 1
55-
fi
56-
echo "Filtering jscpd report for changed files..."
57-
CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt)
58-
echo "Changed files: $CHANGED_FILES"
59-
jq --argjson changed_files "$CHANGED_FILES" '
60-
.duplicates | map(select(
61-
(.firstFile?.name as $fname | $changed_files | any(. == $fname)) or
62-
(.secondFile?.name as $sname | $changed_files | any(. == $sname))
63-
))
64-
' ./jscpd-report.json > filtered-jscpd-report.json
65-
cat filtered-jscpd-report.json
50+
# - name: Filter jscpd report for changed files
51+
# run: |
52+
# if [ ! -f ./jscpd-report.json ]; then
53+
# echo "jscpd-report.json not found"
54+
# exit 1
55+
# fi
56+
# echo "Filtering jscpd report for changed files..."
57+
# CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt)
58+
# echo "Changed files: $CHANGED_FILES"
59+
# jq --argjson changed_files "$CHANGED_FILES" '
60+
# .duplicates | map(select(
61+
# (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or
62+
# (.secondFile?.name as $sname | $changed_files | any(. == $sname))
63+
# ))
64+
# ' ./jscpd-report.json > filtered-jscpd-report.json
65+
# cat filtered-jscpd-report.json
6666

67-
- name: Check for duplicates
68-
run: |
69-
if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then
70-
echo "filtered_report_exists=true" >> $GITHUB_ENV
71-
else
72-
echo "filtered_report_exists=false" >> $GITHUB_ENV
73-
fi
74-
- name: upload filtered report (if applicable)
75-
if: env.filtered_report_exists == 'true'
76-
uses: actions/upload-artifact@v4
77-
with:
78-
name: filtered-jscpd-report
79-
path: ./filtered-jscpd-report.json
67+
# - name: Check for duplicates
68+
# run: |
69+
# if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then
70+
# echo "filtered_report_exists=true" >> $GITHUB_ENV
71+
# else
72+
# echo "filtered_report_exists=false" >> $GITHUB_ENV
73+
# fi
74+
# - name: upload filtered report (if applicable)
75+
# if: env.filtered_report_exists == 'true'
76+
# uses: actions/upload-artifact@v4
77+
# with:
78+
# name: filtered-jscpd-report
79+
# path: ./filtered-jscpd-report.json
8080

81-
- name: Fail and log found duplicates.
82-
if: env.filtered_report_exists == 'true'
83-
run: |
84-
cat ./filtered-jscpd-report.json
85-
echo "Duplications found, failing the check."
86-
exit 1
81+
# - name: Fail and log found duplicates.
82+
# if: env.filtered_report_exists == 'true'
83+
# run: |
84+
# cat ./filtered-jscpd-report.json
85+
# echo "Duplications found, failing the check."
86+
# exit 1

.github/workflows/node.js.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
# Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
8686
NODE_OPTIONS: ''
8787
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
88-
uses: codecov/codecov-action@v4
88+
uses: codecov/codecov-action@v5
8989
with:
9090
flags: macos-toolkit-unittests
9191
verbose: true
@@ -96,7 +96,7 @@ jobs:
9696
# Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
9797
NODE_OPTIONS: ''
9898
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
99-
uses: codecov/codecov-action@v4
99+
uses: codecov/codecov-action@v5
100100
with:
101101
flags: macos-amazonq-unittests
102102
verbose: true
@@ -155,7 +155,7 @@ jobs:
155155
# Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
156156
NODE_OPTIONS: ''
157157
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
158-
uses: codecov/codecov-action@v4
158+
uses: codecov/codecov-action@v5
159159
with:
160160
flags: windows-unittests
161161
verbose: true

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,12 @@ You can find documentation to create VSCode IDE settings for CodeCatalyst bluepr
238238
239239
Before sending a pull request:
240240
241+
1. Treat all work as PUBLIC. Private `feature/x` branches will _not_ be squash-merged at release time. This has several benefits:
242+
- Avoids mistakes (accidental exposure to public)!
243+
- Avoids needing to erase (squash-merge) history.
241244
1. Check that you are working against the latest source on the `master` branch.
242-
2. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
243-
3. Open an issue to discuss any significant work.
245+
1. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
246+
1. Open an issue to discuss any significant work.
244247
245248
To send a pull request:
246249

buildspec/release/35opengate.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 0.2
2+
3+
phases:
4+
install:
5+
runtime-versions:
6+
nodejs: 16
7+
8+
pre_build:
9+
commands:
10+
- STAGE_NAME=SourceWithGit
11+
- PIPELINE=$(echo $CODEBUILD_INITIATOR | sed -e 's/codepipeline\///')
12+
build:
13+
commands:
14+
- |
15+
aws codepipeline enable-stage-transition \
16+
--pipeline-name "$PIPELINE" \
17+
--stage-name "$STAGE_NAME" \
18+
--transition-type "Inbound"

buildspec/shared/common.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
# . buildspec/shared/common.sh
66

77
# Ignore these patterns when deciding if the build should fail.
8-
# - "Webview is disposed": only happens on vscode "minimum" (1.68.0)
8+
# - "waiting for browser": from `ssoAccessTokenProvider.test.ts`, unclear how to fix it.
99
# - "HTTPError: Response code …": caused by github rate-limiting.
1010
# - "npm WARN deprecated querystring": transitive dep of aws sdk v2 (check `npm ls querystring`), so that's blocked until we migrate to v3.
1111
_ignore_pat='HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated'
12-
if [ "$VSCODE_TEST_VERSION" = 'minimum' ]; then
13-
_ignore_pat="$_ignore_pat"'\|Webview is disposed'
14-
fi
1512

1613
# Do not print (noisy) lines matching these patterns.
1714
# - "ERROR:bus… Failed to connect to the bus": noise related to "xvfb". https://github.com/cypress-io/cypress/issues/19299

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
4040
},
4141
"devDependencies": {
42-
"@aws-toolkits/telemetry": "^1.0.282",
42+
"@aws-toolkits/telemetry": "^1.0.284",
4343
"@playwright/browser-chromium": "^1.43.1",
4444
"@types/he": "^1.2.3",
4545
"@types/vscode": "^1.68.0",
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"date": "2024-11-22",
3+
"version": "1.37.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q Feature Dev: display limit reached error message"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Amazon Q chat: `@workspace` command shown in all tab types"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "Chat container exceeds width of container"
16+
},
17+
{
18+
"type": "Bug Fix",
19+
"description": "amazon q inline: skip indexing when no workspace folders are found"
20+
},
21+
{
22+
"type": "Bug Fix",
23+
"description": "file details and name unneccessary cropping"
24+
},
25+
{
26+
"type": "Bug Fix",
27+
"description": "Amazon Q /dev: update diff window behavior after a change is accepted"
28+
},
29+
{
30+
"type": "Feature",
31+
"description": "Amazon Q /dev: support `.gradle` files"
32+
},
33+
{
34+
"type": "Feature",
35+
"description": "Code Transform: Enable support for Java 17 projects."
36+
},
37+
{
38+
"type": "Feature",
39+
"description": "Notifications: Support for delivering critical alerts and product updates"
40+
},
41+
{
42+
"type": "Feature",
43+
"description": "Retrieve and display a customization name when a customization is overridden in an AB test"
44+
},
45+
{
46+
"type": "Feature",
47+
"description": "Feature(Amazon Q Code Transformation): support conversions of embedded SQL from Oracle to PostgreSQL"
48+
}
49+
]
50+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2024-11-27",
3+
"version": "1.38.0",
4+
"entries": [
5+
{
6+
"type": "Feature",
7+
"description": "Amazon Q /dev: support `Dockerfile` files"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "Introduce @workspace command to enhance context fetching for Chat"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Feature(Amazon Q Code Transformation): allow users to view results in 5 smaller diffs"
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)