Skip to content

Commit 2a3540a

Browse files
authored
fix!: remove legacy settings #3444
1 parent 8760e41 commit 2a3540a

File tree

5 files changed

+14
-30
lines changed

5 files changed

+14
-30
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Removal",
3+
"description": "Removed legacy setting `aws.sam.enableCodeLenses` (use `aws.samcli.enableCodeLenses` instead)"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Removal",
3+
"description": "Removed legacy setting `aws.manuallySelectedBuckets` (use `aws.samcli.manuallySelectedBuckets` instead)"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Removal",
3+
"description": "Removed legacy setting `aws.samcli.lambda.timeout` (use `aws.samcli.lambdaTimeout` instead)"
4+
}

src/shared/sam/activation.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import { addSamDebugConfiguration } from './debugger/commands/addSamDebugConfigu
3737
import { lazyLoadSamTemplateStrings } from '../../lambda/models/samTemplates'
3838
import { PromptSettings } from '../settings'
3939
import { shared } from '../utilities/functionUtils'
40-
import { migrateLegacySettings, SamCliSettings } from './cli/samCliSettings'
40+
import { SamCliSettings } from './cli/samCliSettings'
4141
import { Commands } from '../vscode/commands2'
4242
import { registerSync } from './sync'
4343

@@ -48,7 +48,6 @@ const sharedDetectSamCli = shared(detectSamCli)
4848
*/
4949
export async function activate(ctx: ExtContext): Promise<void> {
5050
await createYamlExtensionPrompt()
51-
await migrateLegacySettings()
5251
const config = SamCliSettings.instance
5352

5453
ctx.extensionContext.subscriptions.push(

src/shared/sam/cli/samCliSettings.ts

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,12 @@
44
*/
55

66
import { getLogger } from '../../logger'
7-
import { fromExtensionManifest, migrateSetting, Settings } from '../../settings'
7+
import { fromExtensionManifest, Settings } from '../../settings'
88
import { stripUndefined, toRecord } from '../../utilities/collectionUtils'
99
import { ClassToInterfaceType, keys } from '../../utilities/tsUtils'
1010
import { DefaultSamCliLocationProvider, SamCliLocationProvider } from './samCliLocator'
1111
import { onceChanged } from '../../utilities/functionUtils'
1212

13-
// TODO(sijaden): remove after a few releases
14-
export async function migrateLegacySettings() {
15-
await migrateSetting(
16-
{
17-
key: 'aws.manuallySelectedBuckets',
18-
type: SavedBuckets,
19-
},
20-
{ key: 'aws.samcli.manuallySelectedBuckets' }
21-
)
22-
23-
await migrateSetting(
24-
{
25-
key: 'aws.sam.enableCodeLenses',
26-
type: Boolean,
27-
},
28-
{ key: 'aws.samcli.enableCodeLenses' }
29-
)
30-
31-
await migrateSetting(
32-
{
33-
key: 'aws.samcli.lambda.timeout',
34-
type: Number,
35-
},
36-
{ key: 'aws.samcli.lambdaTimeout' }
37-
)
38-
}
39-
4013
const localTimeoutDefaultMillis: number = 90000
4114
interface SavedBuckets {
4215
[profile: string]: { [region: string]: string }

0 commit comments

Comments
 (0)