test(lambda): improve tests

Author: valerena

packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samCoreLogic.test.ts

@@ -431,10 +431,7 @@ describe('lambda2samCoreLogic', function () {
             } as any
 
             // Setup Lambda node
-            const lambdaNode = {
-                name: 'test-function',
-                regionCode: 'us-west-2',
-            } as LambdaFunctionNode
+            const lambdaNode = mockLambdaNode()
 
             const resourceToImport: ResourcesToImport = [
                 {
@@ -490,10 +487,7 @@ describe('lambda2samCoreLogic', function () {
             } as any
 
             // Setup Lambda node
-            const lambdaNode = {
-                name: 'test-function',
-                regionCode: 'us-west-2',
-            } as LambdaFunctionNode
+            const lambdaNode = mockLambdaNode()
 
             // Make createChangeSet fail
             cfnClientStub.createChangeSet.resolves({}) // No Id
@@ -522,24 +516,10 @@ describe('lambda2samCoreLogic', function () {
     describe('callExternalApiForCfnTemplate', function () {
         it('extracts function name from ARN in ResourceIdentifier', async function () {
             // Setup Lambda node
-            const lambdaNode = {
-                name: 'test-function',
-                regionCode: 'us-east-2',
-                arn: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
-            } as LambdaFunctionNode
+            const lambdaNode = mockLambdaNode(true)
 
             // Mock IAM connection
-            const mockConnection = {
-                type: 'iam' as const,
-                id: 'test-connection',
-                label: 'Test Connection',
-                state: 'valid' as const,
-                getCredentials: sandbox.stub().resolves({
-                    accessKeyId: 'test-key',
-                    secretAccessKey: 'test-secret',
-                }),
-                endpointUrl: undefined,
-            }
+            const mockConnection = mockIamConnection()
             sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
 
             // Mock fetch response
@@ -581,24 +561,10 @@ describe('lambda2samCoreLogic', function () {
 
         it('preserves function name when not an ARN', async function () {
             // Setup Lambda node
-            const lambdaNode = {
-                name: 'test-function',
-                regionCode: 'us-east-2',
-                arn: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
-            } as LambdaFunctionNode
+            const lambdaNode = mockLambdaNode(true)
 
             // Mock IAM connection
-            const mockConnection = {
-                type: 'iam' as const,
-                id: 'test-connection',
-                label: 'Test Connection',
-                state: 'valid' as const,
-                getCredentials: sandbox.stub().resolves({
-                    accessKeyId: 'test-key',
-                    secretAccessKey: 'test-secret',
-                }),
-                endpointUrl: undefined,
-            }
+            const mockConnection = mockIamConnection()
             sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
 
             // Mock fetch response
@@ -633,24 +599,10 @@ describe('lambda2samCoreLogic', function () {
 
         it('handles non-Lambda resources without modification', async function () {
             // Setup Lambda node
-            const lambdaNode = {
-                name: 'test-function',
-                regionCode: 'us-east-2',
-                arn: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
-            } as LambdaFunctionNode
+            const lambdaNode = mockLambdaNode(true)
 
             // Mock IAM connection
-            const mockConnection = {
-                type: 'iam' as const,
-                id: 'test-connection',
-                label: 'Test Connection',
-                state: 'valid' as const,
-                getCredentials: sandbox.stub().resolves({
-                    accessKeyId: 'test-key',
-                    secretAccessKey: 'test-secret',
-                }),
-                endpointUrl: undefined,
-            }
+            const mockConnection = mockIamConnection()
             sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
 
             // Mock fetch response
@@ -699,10 +651,7 @@ describe('lambda2samCoreLogic', function () {
     describe('lambdaToSam', function () {
         it('converts a Lambda function to a SAM project', async function () {
             // Setup Lambda node
-            const lambdaNode = {
-                name: 'test-function',
-                regionCode: 'us-west-2',
-            } as LambdaFunctionNode
+            const lambdaNode = mockLambdaNode()
 
             // Setup AWS Lambda client responses
             lambdaClientStub.getFunction.resolves({
@@ -784,4 +733,33 @@ describe('lambda2samCoreLogic', function () {
             )
         })
     })
+
+    function mockLambdaNode(withArn: boolean = false) {
+        if (withArn) {
+            return {
+                name: 'test-function',
+                regionCode: 'us-east-2',
+                arn: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
+            } as LambdaFunctionNode
+        } else {
+            return {
+                name: 'test-function',
+                regionCode: 'us-east-2',
+            } as LambdaFunctionNode
+        }
+    }
+
+    function mockIamConnection() {
+        return {
+            type: 'iam' as const,
+            id: 'test-connection',
+            label: 'Test Connection',
+            state: 'valid' as const,
+            getCredentials: sandbox.stub().resolves({
+                accessKeyId: 'test-key',
+                secretAccessKey: 'test-secret',
+            }),
+            endpointUrl: undefined,
+        }
+    }
 })

packages/core/src/test/lambda/remoteDebugging/localStackLambdaDebugger.test.ts

@@ -60,7 +60,7 @@ describe('RemoteDebugController with LocalStackLambdaDebugger', () => {
             layerArn: undefined,
             lambdaTimeout: undefined,
         })
-        mockFunctionConfig = createMockFunctionConfig()
+        mockFunctionConfig = createMockFunctionConfig({ Runtime: 'nodejs22.x' })
     })
 
     afterEach(() => {
@@ -128,14 +128,13 @@ describe('RemoteDebugController with LocalStackLambdaDebugger', () => {
                 )
             )
 
-            await controller.startDebugging(mockConfig.functionArn, 'nodejs18.x', mockConfig)
+            await controller.startDebugging(mockConfig.functionArn, 'nodejs22.x', mockConfig)
 
             // Assert state changes
             assert.strictEqual(controller.isDebugging, true, 'Should be in debugging state')
-            // Qualifier is only set for version publishing, not for $LATEST
+            // Qualifier is not set for LocalStack
             assert.strictEqual(controller.qualifier, undefined, 'Should not set qualifier for $LATEST')
 
-            // Verify LdkClient calls
             assert(mockLdkClient.getFunctionDetail.calledWith(mockConfig.functionArn), 'Should get function details')
 
             assert(fetchStubHealth.calledOnce, 'Should call LocalStack health check once')
@@ -146,7 +145,7 @@ describe('RemoteDebugController with LocalStackLambdaDebugger', () => {
                 result: 'Succeeded',
                 source: 'LocalStackDebug',
                 action: '{"remoteRoot":"/var/task","skipFiles":[],"shouldPublishVersion":false,"isLambdaRemote":false}',
-                runtimeString: 'nodejs18.x',
+                runtimeString: 'nodejs22.x',
             })
         })
 
@@ -186,11 +185,10 @@ describe('RemoteDebugController with LocalStackLambdaDebugger', () => {
             // Mock revertExistingConfig
             setupMockRevertExistingConfig(sandbox)
 
-            let errorThrown = false
             try {
-                await controller.startDebugging(mockConfig.functionArn, 'nodejs18.x', mockConfig)
+                await controller.startDebugging(mockConfig.functionArn, 'nodejs22.x', mockConfig)
+                assert.fail('Should have thrown an error')
             } catch (error) {
-                errorThrown = true
                 assert(error instanceof Error, 'Should throw an error')
                 assert(
                     error.message.includes('Error StartDebugging') ||
@@ -201,8 +199,6 @@ describe('RemoteDebugController with LocalStackLambdaDebugger', () => {
                 )
             }
 
-            assert(errorThrown, 'Should have thrown an error')
-
             // Assert state is cleaned up
             assert.strictEqual(controller.isDebugging, false, 'Should not be in debugging state after failure')
             assert(fetchStubCleanup.calledOnce, 'Should attempt cleanup')