Skip to content

Commit ef1d925

Browse files
authored
Merge branch 'master' into releasePipeline
2 parents 597d109 + 82cae41 commit ef1d925

File tree

12 files changed

+61
-23
lines changed

12 files changed

+61
-23
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-01-30",
3+
"version": "1.45.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Allow AB users with an overridden customization to go back to the default customization"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Add setting to allow Q /dev to run code and test commands"
16+
}
17+
]
18+
}

packages/amazonq/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.45.0-SNAPSHOT 2025-01-30
1+
## 1.45.0 2025-01-30
22

33
- **Bug Fix** Allow AB users with an overridden customization to go back to the default customization
44
- **Bug Fix** For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format

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.45.0-SNAPSHOT",
5+
"version": "1.46.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

packages/core/src/shared/performance/performance.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ export function performanceTest<TSetup, TExecute>(
102102
const testOption = options[process.platform as 'linux' | 'darwin' | 'win32']
103103

104104
const totalTestRuns = options.testRuns ?? 10
105-
106-
return describe(`${name} performance tests`, () => {
105+
// TODO: unskip this once flakiness is reduced.
106+
return describe.skip(`${name} performance tests`, () => {
107107
let performanceTracker: PerformanceTracker | undefined
108108
const testRunMetrics: PerformanceMetrics[] = []
109109

packages/core/src/test/shared/fs/fs.test.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,16 +411,20 @@ describe('FileSystem', function () {
411411
const oldPath = testFolder.pathFrom('oldFile.txt')
412412
const newPath = testFolder.pathFrom('newFile.txt')
413413

414-
const result = fs.rename(oldPath, newPath)
415-
// this file is created after the first "exists" check fails, the following check should pass
416-
void testutil.toFile('hello world', oldPath)
417-
await result
414+
const existsStub = Sinon.stub(FileSystem.prototype, 'exists')
415+
existsStub.onFirstCall().resolves(false)
416+
existsStub.callThrough()
417+
418+
await testutil.toFile('hello world', oldPath)
419+
await fs.rename(oldPath, newPath)
418420

419421
testutil.assertTelemetry('ide_fileSystem', {
420422
action: 'rename',
421423
result: 'Succeeded',
422424
reason: 'RenameRaceCondition',
423425
})
426+
427+
existsStub.restore()
424428
})
425429
})
426430

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-01-30",
3+
"version": "3.44.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Policy Checks selected profile is always default"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "From the Lambda treeview in AWS Explorer, you can now right-click on a function name and start a CloudWatch Logs Live Tail sessions for the selected function."
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "EC2 is now available in AWS Explorer:\n\n1. Remote-connect VSCode to your EC2 instances.\n2. Open terminal to your EC2 instances.\n3. Start, stop, and visit the Launch page."
16+
}
17+
]
18+
}

packages/toolkit/.changes/next-release/Bug Fix-2a3bed78-156a-4391-b79d-225ae6d98939.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/toolkit/.changes/next-release/Feature-48c399ea-d42f-4ea1-8f32-d8bc1486a107.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/toolkit/.changes/next-release/Feature-a7fb8317-77bc-4459-a278-2bc98fd0a5cf.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)