Skip to content

Commit 232d88e

Browse files
HweinstockHweinstock
committed
Merge branch 'ec2/loglevel' of github.com:Hweinstock/aws-toolkit-vscode into ec2/loglevel
2 parents 4e80178 + db445fb commit 232d88e

File tree

121 files changed

+801
-365
lines changed

Some content is hidden

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

121 files changed

+801
-365
lines changed

‎.eslintrc.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = {
1212
mocha: true,
1313
es2024: true,
1414
},
15-
plugins: ['@typescript-eslint', 'unicorn', 'header', 'security-node', 'aws-toolkits'],
15+
plugins: ['@typescript-eslint', '@stylistic', 'unicorn', 'header', 'security-node', 'aws-toolkits'],
1616
extends: [
1717
'eslint:recommended',
1818
'plugin:@typescript-eslint/eslint-recommended',
@@ -113,6 +113,20 @@ module.exports = {
113113
'no-constant-condition': ['error', { checkLoops: false }],
114114
'no-empty': 'off',
115115

116+
// https://eslint.style/rules/default/spaced-comment
117+
// Require space after // comment.
118+
'@stylistic/spaced-comment': [
119+
'error',
120+
'always',
121+
{
122+
block: {
123+
markers: ['!'], // Allow the /*!…*/ license header.
124+
// exceptions: ['*'],
125+
// balanced: true
126+
},
127+
},
128+
],
129+
116130
// Rules from https://github.com/sindresorhus/eslint-plugin-unicorn
117131
// TODO: 'unicorn/no-useless-promise-resolve-reject': 'error',
118132
// TODO: 'unicorn/prefer-at': 'error',

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
* @aws/aws-ides-team
22
packages/core/src/codewhisperer/ @aws/codewhisperer-team
33
packages/core/src/amazonqFeatureDev/ @aws/earlybird
4-
packages/core/src/codewhispererChat/ @aws/dexp
5-
packages/core/src/amazonq/ @aws/dexp
4+
packages/core/src/codewhispererChat/ @aws/flare
5+
packages/core/src/amazonq/ @aws/flare
66
packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer

‎.github/workflows/node.js.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
env:
8585
# Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
8686
NODE_OPTIONS: ''
87-
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
87+
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
8888
uses: codecov/codecov-action@v5
8989
with:
9090
flags: macos-toolkit-unittests
@@ -95,7 +95,7 @@ jobs:
9595
env:
9696
# Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
9797
NODE_OPTIONS: ''
98-
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
98+
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
9999
uses: codecov/codecov-action@v5
100100
with:
101101
flags: macos-amazonq-unittests
@@ -154,7 +154,7 @@ jobs:
154154
env:
155155
# Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
156156
NODE_OPTIONS: ''
157-
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.ref == 'master' }}
157+
if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
158158
uses: codecov/codecov-action@v5
159159
with:
160160
flags: windows-unittests

‎buildspec/shared/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# - "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.
11-
_ignore_pat='Timed-out waiting for browser login flow\|HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated'
11+
_ignore_pat='HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated'
1212

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

‎codecov.yml‎

Lines changed: 70 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,98 @@ codecov:
55
notify:
66
require_ci_to_pass: no
77

8+
ignore:
9+
- 'node_modules/'
10+
- 'plugins/'
11+
- 'scripts/'
12+
- 'src.gen/'
13+
814
coverage:
915
precision: 2
1016
round: down
1117
range: '70...100'
1218

1319
status:
1420
project:
21+
# Note: `default` measures the entire project.
22+
# It does NOT define defaults "inherited" by other `project` items.
23+
# https://docs.codecov.com/docs/commit-status
1524
default:
16-
target: 70%
17-
threshold: 5%
18-
informational: true
25+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
26+
target: 80
27+
threshold: 5
28+
only_pulls: true
1929
codewhisperer:
30+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
2031
paths:
21-
- packages/core/src/codewhisperer/*
32+
- 'packages/core/src/codewhisperer/'
33+
- 'packages/core/src/amazonq*/*'
34+
- 'packages/amazonq/src/'
2235
flags:
2336
- 'codewhisperer'
37+
target: 80
38+
threshold: 5
39+
only_pulls: true
2440
amazonqFeatureDev:
41+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
2542
paths:
26-
- packages/core/src/amazonqFeatureDev/*
43+
- 'packages/core/src/amazonqFeatureDev/*'
2744
flags:
2845
- 'amazonqFeatureDev'
46+
target: 80
47+
threshold: 5
48+
only_pulls: true
2949
amazonqGumby:
50+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
3051
paths:
31-
- packages/core/src/amazonqGumby/*
52+
- 'packages/core/src/amazonqGumby/*'
53+
target: 80
54+
threshold: 5
55+
only_pulls: true
3256
codewhispererChat:
57+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
3358
paths:
34-
- packages/core/src/codewhispererChat/*
59+
- 'packages/core/src/codewhispererChat/*'
60+
target: 80
61+
threshold: 5
62+
only_pulls: true
3563
applicationcomposer:
64+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
3665
paths:
37-
- packages/core/src/applicationcomposer/*
66+
- 'packages/core/src/applicationcomposer/*'
67+
target: 80
68+
threshold: 5
69+
only_pulls: true
3870
stepFunctions:
39-
target: 50%
40-
threshold: 10%
71+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
4172
paths:
42-
- packages/core/src/stepFunctions/*
73+
- 'packages/core/src/stepFunctions/*'
74+
target: 50
75+
threshold: 10
76+
only_pulls: true
4377
threatComposer:
78+
informational: true # Always pass. Ignore `target`, `threshold`, etc.
79+
paths:
80+
- 'packages/core/src/threatComposer/*'
81+
target: 80
82+
threshold: 5
83+
only_pulls: true
84+
tests:
85+
# Most code in test/ should always be "covered"!
86+
target: 95
4487
paths:
45-
- packages/core/src/threatComposer/*
46-
patch: false
88+
- '**/test/**'
89+
patch:
90+
default:
91+
# Note: `default` measures the entire project.
92+
# It does NOT define defaults "inherited" by other `project` items.
93+
# https://docs.codecov.com/docs/commit-status
94+
target: 90
95+
threshold: 5
96+
only_pulls: true
97+
informational: false # Fail if PR changes are not covered.
98+
# branches:
99+
# - master
47100
changes: false
48101

49102
comment: false
@@ -54,7 +107,9 @@ github_checks:
54107
flags:
55108
codewhisperer:
56109
paths:
57-
- packages/core/src/codewhisperer/
110+
- 'packages/core/src/codewhisperer/'
111+
- 'packages/core/src/amazonq*/*'
112+
- 'packages/amazonq/src/'
58113
amazonqFeatureDev:
59114
paths:
60-
- packages/core/src/amazonqFeatureDev/
115+
- 'packages/core/src/amazonqFeatureDev/'

0 commit comments

Comments
 (0)