Skip to content

Commit 1da9067

Browse files
Will-ShaoHuaWill-ShaoHua
committed
Merge remote-tracking branch 'upstream/master' into edits-as-completion
2 parents 91c7d84 + 23a25d1 commit 1da9067

File tree

37 files changed

+1777
-566
lines changed

37 files changed

+1777
-566
lines changed

‎package-lock.json‎

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

‎packages/amazonq/.changes/1.97.0.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-09-29",
3+
"version": "1.97.0",
4+
"entries": []
5+
}

‎packages/amazonq/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.97.0 2025-09-29
2+
3+
- Miscellaneous non-user-facing changes
4+
15
## 1.96.0 2025-09-25
26

37
- **Bug Fix** Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2.

‎packages/amazonq/package.json‎

Lines changed: 1 addition & 7 deletions
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 software development.",
5-
"version": "1.97.0-SNAPSHOT",
5+
"version": "1.98.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],
@@ -593,12 +593,6 @@
593593
"category": "%AWS.amazonq.title%",
594594
"enablement": "aws.codewhisperer.connected"
595595
},
596-
{
597-
"command": "aws.amazonq.security.scan-statusbar",
598-
"title": "%AWS.command.amazonq.security.scan%",
599-
"category": "%AWS.amazonq.title%",
600-
"enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
601-
},
602596
{
603597
"command": "aws.amazonq.refactorCode",
604598
"title": "%AWS.command.amazonq.refactorCode%",

‎packages/amazonq/src/lsp/auth.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ export class AmazonQLspAuth {
118118
)
119119
if (credentials) {
120120
getLogger().info(
121-
`[SageMaker Debug] IAM credentials structure: accessKeyId=${credentials.accessKeyId ? 'present' : 'missing'}, secretAccessKey=${credentials.secretAccessKey ? 'present' : 'missing'}, sessionToken=${credentials.sessionToken ? 'present' : 'missing'}, expiration=${credentials.expiration} ? 'pr
122-
esent' : 'missing'}`
121+
`[SageMaker Debug] IAM credentials structure: accessKeyId=${credentials.accessKeyId ? 'present' : 'missing'}, secretAccessKey=${credentials.secretAccessKey ? 'present' : 'missing'}, sessionToken=${credentials.sessionToken ? 'present' : 'missing'}, expiration=${credentials.expiration ? 'present' : 'missing'}`
123122
)
124123
}
125124

‎packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ import {
1111
session,
1212
AuthUtil,
1313
DefaultCodeWhispererClient,
14-
RecommendationsList,
1514
ConfigurationEntry,
1615
RecommendationHandler,
17-
CodeWhispererCodeCoverageTracker,
1816
supplementalContextUtil,
1917
} from 'aws-core-vscode/codewhisperer'
2018
import {
@@ -54,35 +52,35 @@ describe('recommendationHandler', function () {
5452
sinon.restore()
5553
})
5654

57-
it('should assign correct recommendations given input', async function () {
58-
assert.strictEqual(CodeWhispererCodeCoverageTracker.instances.size, 0)
59-
assert.strictEqual(
60-
CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
61-
0
62-
)
55+
// it('should assign correct recommendations given input', async function () {
56+
// assert.strictEqual(CodeWhispererCodeCoverageTracker.instances.size, 0)
57+
// assert.strictEqual(
58+
// CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
59+
// 0
60+
// )
6361

64-
const mockServerResult = {
65-
recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
66-
$response: {
67-
requestId: 'test_request',
68-
httpResponse: {
69-
headers: {
70-
'x-amzn-sessionid': 'test_request',
71-
},
72-
},
73-
},
74-
}
75-
const handler = new RecommendationHandler()
76-
sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
77-
await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
78-
const actual = session.recommendations
79-
const expected: RecommendationsList = [{ content: "print('Hello World!')" }, { content: '' }]
80-
assert.deepStrictEqual(actual, expected)
81-
assert.strictEqual(
82-
CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
83-
1
84-
)
85-
})
62+
// const mockServerResult = {
63+
// recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
64+
// $response: {
65+
// requestId: 'test_request',
66+
// httpResponse: {
67+
// headers: {
68+
// 'x-amzn-sessionid': 'test_request',
69+
// },
70+
// },
71+
// },
72+
// }
73+
// const handler = new RecommendationHandler()
74+
// sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
75+
// await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
76+
// const actual = session.recommendations
77+
// const expected: RecommendationsList = [{ content: "print('Hello World!')" }, { content: '' }]
78+
// assert.deepStrictEqual(actual, expected)
79+
// assert.strictEqual(
80+
// CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
81+
// 1
82+
// )
83+
// })
8684

8785
it('should assign request id correctly', async function () {
8886
const mockServerResult = {

‎packages/core/package.json‎

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -323,159 +323,173 @@
323323
"fontCharacter": "\\f1d2"
324324
}
325325
},
326-
"aws-lambda-function": {
326+
"aws-lambda-deployed-function": {
327327
"description": "AWS Contributed Icon",
328328
"default": {
329329
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
330330
"fontCharacter": "\\f1d3"
331331
}
332332
},
333-
"aws-mynah-MynahIconBlack": {
333+
"aws-lambda-function": {
334334
"description": "AWS Contributed Icon",
335335
"default": {
336336
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
337337
"fontCharacter": "\\f1d4"
338338
}
339339
},
340-
"aws-mynah-MynahIconWhite": {
340+
"aws-lambda-invoke-remotely": {
341341
"description": "AWS Contributed Icon",
342342
"default": {
343343
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
344344
"fontCharacter": "\\f1d5"
345345
}
346346
},
347-
"aws-mynah-logo": {
347+
"aws-mynah-MynahIconBlack": {
348348
"description": "AWS Contributed Icon",
349349
"default": {
350350
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
351351
"fontCharacter": "\\f1d6"
352352
}
353353
},
354-
"aws-redshift-cluster": {
354+
"aws-mynah-MynahIconWhite": {
355355
"description": "AWS Contributed Icon",
356356
"default": {
357357
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
358358
"fontCharacter": "\\f1d7"
359359
}
360360
},
361-
"aws-redshift-cluster-connected": {
361+
"aws-mynah-logo": {
362362
"description": "AWS Contributed Icon",
363363
"default": {
364364
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
365365
"fontCharacter": "\\f1d8"
366366
}
367367
},
368-
"aws-redshift-database": {
368+
"aws-redshift-cluster": {
369369
"description": "AWS Contributed Icon",
370370
"default": {
371371
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
372372
"fontCharacter": "\\f1d9"
373373
}
374374
},
375-
"aws-redshift-redshift-cluster-connected": {
375+
"aws-redshift-cluster-connected": {
376376
"description": "AWS Contributed Icon",
377377
"default": {
378378
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
379379
"fontCharacter": "\\f1da"
380380
}
381381
},
382-
"aws-redshift-schema": {
382+
"aws-redshift-database": {
383383
"description": "AWS Contributed Icon",
384384
"default": {
385385
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
386386
"fontCharacter": "\\f1db"
387387
}
388388
},
389-
"aws-redshift-table": {
389+
"aws-redshift-redshift-cluster-connected": {
390390
"description": "AWS Contributed Icon",
391391
"default": {
392392
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
393393
"fontCharacter": "\\f1dc"
394394
}
395395
},
396-
"aws-s3-bucket": {
396+
"aws-redshift-schema": {
397397
"description": "AWS Contributed Icon",
398398
"default": {
399399
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
400400
"fontCharacter": "\\f1dd"
401401
}
402402
},
403-
"aws-s3-create-bucket": {
403+
"aws-redshift-table": {
404404
"description": "AWS Contributed Icon",
405405
"default": {
406406
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
407407
"fontCharacter": "\\f1de"
408408
}
409409
},
410-
"aws-sagemaker-code-editor": {
410+
"aws-s3-bucket": {
411411
"description": "AWS Contributed Icon",
412412
"default": {
413413
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
414414
"fontCharacter": "\\f1df"
415415
}
416416
},
417-
"aws-sagemaker-jupyter-lab": {
417+
"aws-s3-create-bucket": {
418418
"description": "AWS Contributed Icon",
419419
"default": {
420420
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
421421
"fontCharacter": "\\f1e0"
422422
}
423423
},
424-
"aws-sagemakerunifiedstudio-catalog": {
424+
"aws-sagemaker-code-editor": {
425425
"description": "AWS Contributed Icon",
426426
"default": {
427427
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
428428
"fontCharacter": "\\f1e1"
429429
}
430430
},
431-
"aws-sagemakerunifiedstudio-spaces": {
431+
"aws-sagemaker-jupyter-lab": {
432432
"description": "AWS Contributed Icon",
433433
"default": {
434434
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
435435
"fontCharacter": "\\f1e2"
436436
}
437437
},
438-
"aws-sagemakerunifiedstudio-spaces-dark": {
438+
"aws-sagemakerunifiedstudio-catalog": {
439439
"description": "AWS Contributed Icon",
440440
"default": {
441441
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
442442
"fontCharacter": "\\f1e3"
443443
}
444444
},
445-
"aws-sagemakerunifiedstudio-symbol-int": {
445+
"aws-sagemakerunifiedstudio-spaces": {
446446
"description": "AWS Contributed Icon",
447447
"default": {
448448
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
449449
"fontCharacter": "\\f1e4"
450450
}
451451
},
452-
"aws-sagemakerunifiedstudio-table": {
452+
"aws-sagemakerunifiedstudio-spaces-dark": {
453453
"description": "AWS Contributed Icon",
454454
"default": {
455455
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
456456
"fontCharacter": "\\f1e5"
457457
}
458458
},
459-
"aws-schemas-registry": {
459+
"aws-sagemakerunifiedstudio-symbol-int": {
460460
"description": "AWS Contributed Icon",
461461
"default": {
462462
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
463463
"fontCharacter": "\\f1e6"
464464
}
465465
},
466-
"aws-schemas-schema": {
466+
"aws-sagemakerunifiedstudio-table": {
467467
"description": "AWS Contributed Icon",
468468
"default": {
469469
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
470470
"fontCharacter": "\\f1e7"
471471
}
472472
},
473-
"aws-stepfunctions-preview": {
473+
"aws-schemas-registry": {
474474
"description": "AWS Contributed Icon",
475475
"default": {
476476
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
477477
"fontCharacter": "\\f1e8"
478478
}
479+
},
480+
"aws-schemas-schema": {
481+
"description": "AWS Contributed Icon",
482+
"default": {
483+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
484+
"fontCharacter": "\\f1e9"
485+
}
486+
},
487+
"aws-stepfunctions-preview": {
488+
"description": "AWS Contributed Icon",
489+
"default": {
490+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
491+
"fontCharacter": "\\f1ea"
492+
}
479493
}
480494
}
481495
},

‎packages/core/package.nls.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
"AWS.command.ssmDocument.openLocalDocumentJson": "Download as JSON",
250250
"AWS.command.ssmDocument.openLocalDocumentYaml": "Download as YAML",
251251
"AWS.command.ssmDocument.publishDocument": "Publish a Systems Manager Document",
252-
"AWS.command.launchConfigForm.title": "Local Invoke and Debug Configuration",
252+
"AWS.command.launchConfigForm.title": "Invoke Locally",
253253
"AWS.command.addSamDebugConfig": "Add Local Invoke and Debug Configuration",
254254
"AWS.command.toggleSamCodeLenses": "Toggle SAM hints in source files",
255255
"AWS.command.apprunner.createService": "Create Service",

‎packages/core/resources/icons/aws/lambda/deployed-function.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎packages/core/resources/icons/aws/lambda/invoke-remotely.svg‎

Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)