Skip to content

Commit 4a59da4

Browse files
authored
Merge branch 'aws:master' into master
2 parents be2f397 + 2c8d666 commit 4a59da4

19 files changed

+4887
-1910
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## [Unreleased]
2+
3+
### Fixed
4+
- Addressed high-severity vulnerabilities in dependencies by updating `elliptic` to 6.5.4, `es5-ext` to 0.10.62, and `fast-xml-parser` to 4.4.1. [#5511](https://github.com/aws/aws-toolkit-vscode/pull/5511)

CONTRIBUTING.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,6 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
344344
- Use `getLogger()` to log debugging messages, warnings, etc.
345345
- Example: `getLogger().error('topic: widget failed: %O', { foo: 'bar', baz: 42 })`
346346
- Log messages are written to the extension Output channel, which you can view in vscode by visiting the "Output" panel and selecting `AWS Toolkit Logs` or `Amazon Q Logs`.
347-
- While viewing the Output channel (`AWS Toolkit Logs` or `Amazon Q Logs`) in vscode:
348-
- Click the "gear" icon to [select a log level](https://github.com/aws/aws-toolkit-vscode/pull/4859) ("Debug", "Info", "Error", …).
349-
- Click the "..." icon to open the log file.
350347
- Use the `aws.dev.logfile` setting to set the logfile path to a fixed location, so you can follow
351348
and filter logs using shell tools like `tail` and `grep`. For example in settings.json,
352349
```
@@ -362,6 +359,21 @@ The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Witho
362359
- Enter text in the Debug Console filter box to show only log messages with that text. <br/>
363360
<img src="./docs/images/debug-console-filter.png" alt="VSCode Debug Console" width="320"/>
364361
362+
#### Enabling Debug Logs
363+
364+
How to enable more detailed debug logs in the extensions.
365+
If you need to report an issue attach these to give the most detailed information.
366+
367+
1. Open the Command Palette (`cmd/ctrl` + `shift` + `p`), then search for "View Logs". Choose the correct option for the extension you want, eg: `AWS: View Logs` or `Amazon Q: View Logs`
368+
![](./docs/images/logsView.png)
369+
2. Click the gear icon on the bottom right and select `Debug`
370+
![](./docs/images/logsSetDebug.png)
371+
3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed
372+
![](./docs/images/logsSetDefault.png)
373+
4. Open the Command Palette again and select `Reload Window`.
374+
5. Now you should see additional `[debug]` prefixed logs in the output.
375+
![](./docs/images/logsDebugLog.png)
376+
365377
### Telemetry
366378
367379
- See [docs/telemetry.md](./docs/telemetry.md) for guidelines on developing telemetry in this project.

docs/faq-credentials.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# FAQ / Troubleshooting
1+
# FAQ / Troubleshooting - Auth/SSO/Credentials
22

33
### AWS Builder ID "Invalid client provided"
44

docs/faq-debug.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# FAQ / Troubleshooting - Debugging/Development
2+
3+
### Enabling Debug Logs
4+
5+
[See steps here to enable more detailed debug logs for the extension.](../CONTRIBUTING.md#enabling-debug-logs)

docs/images/logsDebugLog.png

126 KB
Loading

docs/images/logsSetDebug.png

173 KB
Loading

docs/images/logsSetDefault.png

147 KB
Loading

docs/images/logsView.png

164 KB
Loading

package-lock.json

Lines changed: 4830 additions & 1802 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.247",
42+
"@aws-toolkits/telemetry": "^1.0.250",
4343
"@playwright/browser-chromium": "^1.43.1",
4444
"@types/vscode": "^1.68.0",
4545
"@types/vscode-webview": "^1.57.1",

0 commit comments

Comments
 (0)