Skip to content

Commit 5468d3d

Browse files
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents b5540e2 + fbf8bd0 commit 5468d3d

File tree

22 files changed

+685
-1497
lines changed

22 files changed

+685
-1497
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,9 @@ If you need to report an issue attach these to give the most detailed informatio
387387
4. Open the Command Palette again and select `Reload Window`.
388388
5. Now you should see additional `[debug]` prefixed logs in the output.
389389
- ![](./docs/images/logsDebugLog.png)
390+
6. To export logs, click the kebab (`...`), select `Export Logs`, and then select the appropriate channel (`Amazon Q Logs` for Amazon Q)
391+
- ![](./docs/images/openExportLogs.png)
392+
- ![](./docs/images/exportAmazonQLogs.png)
390393
391394
### Telemetry
392395

docs/images/exportAmazonQLogs.png

114 KB
Loading

docs/images/openExportLogs.png

108 KB
Loading

package-lock.json

Lines changed: 386 additions & 1279 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
@@ -41,7 +41,7 @@
4141
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
4242
},
4343
"devDependencies": {
44-
"@aws-toolkits/telemetry": "^1.0.319",
44+
"@aws-toolkits/telemetry": "^1.0.322",
4545
"@playwright/browser-chromium": "^1.43.1",
4646
"@stylistic/eslint-plugin": "^2.11.0",
4747
"@types/he": "^1.2.3",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-05-14",
3+
"version": "1.67.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Previous and subsequent cells are used as context for completion in a Jupyter notebook"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Support chat in AL2 aarch64"
12+
}
13+
]
14+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-05-15",
3+
"version": "1.68.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Fix Error: 'Amazon Q service is not signed in'"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Fix Error: 'Amazon Q Profile is not selected for IDC connection type'"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Add inline completion support for abap language"
16+
}
17+
]
18+
}

packages/amazonq/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 1.68.0 2025-05-15
2+
3+
- **Bug Fix** Fix Error: 'Amazon Q service is not signed in'
4+
- **Bug Fix** Fix Error: 'Amazon Q Profile is not selected for IDC connection type'
5+
- **Feature** Add inline completion support for abap language
6+
7+
## 1.67.0 2025-05-14
8+
9+
- **Bug Fix** Previous and subsequent cells are used as context for completion in a Jupyter notebook
10+
- **Bug Fix** Support chat in AL2 aarch64
11+
112
## 1.66.0 2025-05-09
213

314
- **Bug Fix** Avoid inline completion 'Improperly formed request' errors when file is too large

packages/amazonq/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
5-
"version": "1.67.0-SNAPSHOT",
5+
"version": "1.69.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

packages/amazonq/src/lsp/auth.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { AuthUtil } from 'aws-core-vscode/codewhisperer'
1818
import { Writable } from 'stream'
1919
import { onceChanged } from 'aws-core-vscode/utils'
2020
import { getLogger, oneMinute } from 'aws-core-vscode/shared'
21+
import { isSsoConnection } from 'aws-core-vscode/auth'
2122

2223
export const encryptionKey = crypto.randomBytes(32)
2324

@@ -76,8 +77,8 @@ export class AmazonQLspAuth {
7677
* @param force bypass memoization, and forcefully update the bearer token
7778
*/
7879
async refreshConnection(force: boolean = false) {
79-
const activeConnection = this.authUtil.auth.activeConnection
80-
if (activeConnection?.state === 'valid' && activeConnection?.type === 'sso') {
80+
const activeConnection = this.authUtil.conn
81+
if (this.authUtil.isConnectionValid() && isSsoConnection(activeConnection)) {
8182
// send the token to the language server
8283
const token = await this.authUtil.getBearerToken()
8384
await (force ? this._updateBearerToken(token) : this.updateBearerToken(token))
@@ -118,7 +119,7 @@ export class AmazonQLspAuth {
118119
data: jwt,
119120
metadata: {
120121
sso: {
121-
startUrl: AuthUtil.instance.auth.startUrl,
122+
startUrl: AuthUtil.instance.startUrl,
122123
},
123124
},
124125
encrypted: true,

0 commit comments

Comments
 (0)