Merge branch 'master' into fix/settings

Author: manodnyab

package-lock.json

@@ -19,9 +19,9 @@ export class AwsCredentialsService implements Disposable {
     private client: LanguageClient | undefined
 
     constructor(
-        private stacksManager: StacksManager,
-        private resourcesManager: ResourcesManager,
-        private regionManager: CloudFormationRegionManager
+        private readonly stacksManager: StacksManager,
+        private readonly resourcesManager: ResourcesManager,
+        private readonly regionManager: CloudFormationRegionManager
     ) {
         this.authChangeListener = globals.awsContext.onDidChangeContext(() => {
             void this.updateCredentialsFromActiveConnection()
@@ -53,7 +53,7 @@ export class AwsCredentialsService implements Disposable {
             await this.client.sendRequest('aws/credentials/iam/update', encryptedRequest)
         }
 
-        void this.stacksManager.reload()
+        this.stacksManager.clear()
         void this.resourcesManager.reload()
     }
 

packages/core/src/awsService/cloudformation/auth/credentials.ts

@@ -33,17 +33,23 @@ export class StacksNode extends AWSTreeNodeBase {
     }
 
     public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        await this.stacksManager.ensureLoaded()
         this.updateNode()
         const stacks = this.stacksManager.get()
         const nodes = stacks.map((stack: StackSummary) => new StackNode(stack, this.changeSetsManager))
         return this.stacksManager.hasMore() ? [...nodes, new LoadMoreStacksNode(this)] : nodes
     }
 
     private updateNode(): void {
-        const count = this.stacksManager.get().length
-        const hasMore = this.stacksManager.hasMore()
-        this.description = hasMore ? `(${count}+)` : `(${count})`
-        this.contextValue = hasMore ? 'stackSectionWithMore' : 'stackSection'
+        if (this.stacksManager.isLoaded()) {
+            const count = this.stacksManager.get().length
+            const hasMore = this.stacksManager.hasMore()
+            this.description = hasMore ? `(${count}+)` : `(${count})`
+            this.contextValue = hasMore ? 'stackSectionWithMore' : 'stackSection'
+        } else {
+            this.description = undefined
+            this.contextValue = 'stackSection'
+        }
     }
 
     public async loadMoreStacks(): Promise<void> {

packages/core/src/awsService/cloudformation/explorer/nodes/stacksNode.ts

@@ -23,15 +23,14 @@ type ListStacksResult = {
 }
 
 const ListStacksRequest = new RequestType<ListStacksParams, ListStacksResult, void>('aws/cfn/stacks')
-const PollIntervalMs = 1000
 
 type StacksChangeListener = (stacks: StackSummary[]) => void
 
 export class StacksManager implements Disposable {
     private stacks: StackSummary[] = []
     private nextToken?: string
     private readonly listeners: StacksChangeListener[] = []
-    private poller?: NodeJS.Timeout
+    private loaded = false
 
     constructor(private readonly client: LanguageClient) {}
 
@@ -51,6 +50,23 @@ export class StacksManager implements Disposable {
         void this.loadStacks()
     }
 
+    isLoaded() {
+        return this.loaded
+    }
+
+    async ensureLoaded() {
+        if (!this.loaded) {
+            await this.loadStacks()
+        }
+    }
+
+    clear() {
+        this.stacks = []
+        this.nextToken = undefined
+        this.loaded = false
+        this.notifyListeners()
+    }
+
     updateStackStatus(stackName: string, stackStatus: string) {
         const stack = this.stacks.find((s) => s.StackName === stackName)
         if (stack) {
@@ -80,21 +96,8 @@ export class StacksManager implements Disposable {
         }
     }
 
-    startPolling() {
-        this.poller ??= setInterval(() => {
-            this.reload()
-        }, PollIntervalMs)
-    }
-
-    stopPolling() {
-        if (this.poller) {
-            clearInterval(this.poller)
-            this.poller = undefined
-        }
-    }
-
     dispose() {
-        this.stopPolling()
+        // do nothing
     }
 
     private async loadStacks() {
@@ -106,16 +109,14 @@ export class StacksManager implements Disposable {
             })
             this.stacks = response.stacks
             this.nextToken = response.nextToken
+            this.loaded = true
         } catch (error) {
             await handleLspError(error, 'Error loading stacks')
             this.stacks = []
             this.nextToken = undefined
         } finally {
             await setContext('aws.cloudformation.refreshingStacks', false)
             this.notifyListeners()
-            if (this.stacks.length === 0) {
-                this.stopPolling()
-            }
         }
     }
 

packages/core/src/awsService/cloudformation/stacks/stacksManager.ts

@@ -62,6 +62,7 @@ export function supportsEventBridgeTemplates(runtime: Runtime): boolean {
         'python3.11',
         'python3.12',
         'python3.13',
+        'python3.14',
         'go1.x',
     ].includes(runtime)
 }

packages/core/src/eventSchemas/models/schemaCodeLangs.ts

@@ -30,6 +30,7 @@ export type RuntimePackageType = 'Image' | 'Zip'
 // TODO: Consolidate all of the runtime constructs into a single <Runtime, Set<Runtime>> map
 //       We should be able to eliminate a fair amount of redundancy with that.
 export const nodeJsRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
+    'nodejs24.x' as Runtime,
     'nodejs22.x' as Runtime,
     'nodejs20.x',
     'nodejs18.x',
@@ -51,6 +52,7 @@ export function getNodeMajorVersion(version?: string): number | undefined {
 }
 
 export const pythonRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
+    'python3.14' as Runtime,
     'python3.13' as Runtime,
     'python3.12',
     'python3.11',
@@ -66,6 +68,7 @@ export const javaRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
     'java8',
     'java8.al2',
     'java21',
+    'java25' as Runtime,
 ])
 export const dotNetRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['dotnet6', 'dotnet8'])
 export const rubyRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['ruby3.2', 'ruby3.3', 'ruby3.4' as Runtime])
@@ -94,12 +97,12 @@ export const deprecatedRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
     'ruby2.7',
 ])
 const defaultRuntimes = ImmutableMap<RuntimeFamily, Runtime>([
-    [RuntimeFamily.NodeJS, 'nodejs22.x' as Runtime],
-    [RuntimeFamily.Python, 'python3.13' as Runtime],
+    [RuntimeFamily.NodeJS, 'nodejs24.x' as Runtime],
+    [RuntimeFamily.Python, 'python3.14' as Runtime],
     [RuntimeFamily.DotNet, 'dotnet8'],
     [RuntimeFamily.Go, 'go1.x'],
-    [RuntimeFamily.Java, 'java21'],
-    [RuntimeFamily.Ruby, 'ruby3.3'],
+    [RuntimeFamily.Java, 'java25' as Runtime],
+    [RuntimeFamily.Ruby, 'ruby3.4' as Runtime],
 ])
 
 export const mapFamilyToDebugType = ImmutableMap<RuntimeFamily, string>([

packages/core/src/lambda/models/samLambdaRuntime.ts

@@ -31,7 +31,7 @@ export const regionToAccount: RegionAccountMapping = {
 }
 
 // Global layer version
-const globalLayerVersion = 2
+const globalLayerVersion = 3
 
 export function getRemoteDebugLayerForArch(region: string, arch: string): string | undefined {
     const account = regionToAccount[region]

packages/core/src/lambda/remoteDebugging/ldkLayers.ts

@@ -57,7 +57,8 @@
                         :disabled="
                             !initialData.runtimeSupportsRemoteDebug ||
                             !initialData.remoteDebugLayer ||
-                            !initialData.LambdaFunctionNode?.configuration.SnapStart
+                            (!initialData.LambdaFunctionNode?.configuration.SnapStart &&
+                                initialData.LambdaFunctionNode?.configuration.State !== 'Active')
                         "
                         class="remote-debug-checkbox"
                     />
@@ -94,7 +95,10 @@
                             Region {{ initialData.FunctionRegion }} doesn't support remote debugging yet
                         </info>
                         <info
-                            v-else-if="!initialData.LambdaFunctionNode?.configuration.SnapStart"
+                            v-else-if="
+                                !initialData.LambdaFunctionNode?.configuration.SnapStart &&
+                                initialData.LambdaFunctionNode?.configuration.State !== 'Active'
+                            "
                             style="color: var(--vscode-errorForeground)"
                         >
                             Doesn't support remote debugging yet

packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.vue

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Runtime } from '@aws-sdk/client-lambda'
 import { getCodeRoot, isImageLambdaConfig } from '../../../lambda/local/debugConfiguration'
 import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
 import { ExtContext } from '../../extensions'
@@ -55,9 +56,8 @@ function getJavaOptionsEnvVar(config: SamLaunchRequestArgs): string {
             // https://github.com/aws/aws-sam-cli/blob/86f88cbd7df365960f7015c5d086b0db7aedd9d5/samcli/local/docker/lambda_debug_settings.py#L53
             return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC -XX:-TieredCompilation -Djava.net.preferIPv4Stack=true`
         case 'java17':
-            // https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L86
-            return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:+UseSerialGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.net.preferIPv4Stack=true`
         case 'java21':
+        case 'java25' as Runtime:
             // https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L96
             return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:+UseSerialGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.net.preferIPv4Stack=true`
         default:

packages/core/src/shared/sam/debugger/javaSamDebug.ts

@@ -154,20 +154,13 @@ function getPythonExeAndBootstrap(runtime: Runtime) {
     // unfortunately new 'Image'-base images did not standardize the paths
     // https://github.com/aws/aws-sam-cli/blob/7d5101a8edeb575b6925f9adecf28f47793c403c/samcli/local/docker/lambda_debug_settings.py
     switch (runtime) {
-        case 'python3.7':
-            return { python: '/var/lang/bin/python3.7', bootstrap: '/var/runtime/bootstrap' }
-        case 'python3.8':
-            return { python: '/var/lang/bin/python3.8', bootstrap: '/var/runtime/bootstrap.py' }
         case 'python3.9':
-            return { python: '/var/lang/bin/python3.9', bootstrap: '/var/runtime/bootstrap.py' }
         case 'python3.10':
-            return { python: '/var/lang/bin/python3.10', bootstrap: '/var/runtime/bootstrap.py' }
         case 'python3.11':
-            return { python: '/var/lang/bin/python3.11', bootstrap: '/var/runtime/bootstrap.py' }
         case 'python3.12':
-            return { python: '/var/lang/bin/python3.12', bootstrap: '/var/runtime/bootstrap.py' }
         case 'python3.13' as Runtime:
-            return { python: '/var/lang/bin/python3.13', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.14' as Runtime:
+            return { python: `/var/lang/bin/${runtime}`, bootstrap: '/var/runtime/bootstrap.py' }
         default:
             throw new Error(`Python SAM debug logic ran for invalid Python runtime: ${runtime}`)
     }