Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli): lambda hotswap fails if lambda:GetFunctionConfiguration action is not allowed #32301

Merged
merged 4 commits into from
Nov 27, 2024
Merged

fix(cli): lambda hotswap fails if lambda:GetFunctionConfiguration action is not allowed #32301

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
410e99a
use v2
iliapolo Nov 27, 2024
0c7146b
fix tests
iliapolo Nov 27, 2024
54efe09
Merge branch 'main' into epolon/wait-for-function-perms
mergify[bot] Nov 27, 2024
c577d35
Update lambda-functions-hotswap-deployments.test.ts
rix0rrr Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/aws-cdk/lib/api/aws-auth/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ import {
UpdateFunctionConfigurationCommand,
type UpdateFunctionConfigurationCommandInput,
type UpdateFunctionConfigurationCommandOutput,
waitUntilFunctionUpdated,
waitUntilFunctionUpdatedV2,
} from '@aws-sdk/client-lambda';
import {
GetHostedZoneCommand,
Expand Down Expand Up @@ -841,7 +841,7 @@ export class SDK {
delaySeconds: number,
input: UpdateFunctionConfigurationCommandInput,
): Promise<WaiterResult> => {
return waitUntilFunctionUpdated(
return waitUntilFunctionUpdatedV2(
{
client,
maxDelay: delaySeconds,
Expand Down
8 changes: 5 additions & 3 deletions packages/aws-cdk/test/api/hotswap/hotswap-test-setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as cxapi from '@aws-cdk/cx-api';
import { ListStackResourcesCommand, StackResourceSummary, StackStatus } from '@aws-sdk/client-cloudformation';
import { GetFunctionConfigurationCommand } from '@aws-sdk/client-lambda';
import { GetFunctionCommand } from '@aws-sdk/client-lambda';
import { ICloudFormationClient, SuccessfulDeployStackResult } from '../../../lib/api';
import { HotswapMode, HotswapPropertyOverrides } from '../../../lib/api/hotswap/common';
import * as deployments from '../../../lib/api/hotswap-deployments';
Expand Down Expand Up @@ -109,8 +109,10 @@ export class HotswapMockSdkProvider extends MockSdkProvider {
constructor(rootStackName?: string) {
super();

mockLambdaClient.on(GetFunctionConfigurationCommand).resolves({
LastUpdateStatus: 'Successful',
mockLambdaClient.on(GetFunctionCommand).resolves({
Configuration: {
LastUpdateStatus: 'Successful',
},
});

mockCloudFormationClient.on(ListStackResourcesCommand).callsFake((input) => {
Expand Down
6 changes: 3 additions & 3 deletions packages/aws-cdk/test/api/hotswap/lambda-functions-docker-hotswap-deployments.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { UpdateFunctionCodeCommand, waitUntilFunctionUpdated } from '@aws-sdk/client-lambda';
import { UpdateFunctionCodeCommand, waitUntilFunctionUpdatedV2 } from '@aws-sdk/client-lambda';
import * as setup from './hotswap-test-setup';
import { HotswapMode } from '../../../lib/api/hotswap/common';
import { mockLambdaClient } from '../../util/mock-sdk';
Expand All @@ -9,7 +9,7 @@ jest.mock('@aws-sdk/client-lambda', () => {

return {
...original,
waitUntilFunctionUpdated: jest.fn(),
waitUntilFunctionUpdatedV2: jest.fn(),
};
});

Expand Down Expand Up @@ -116,7 +116,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
await hotswapMockSdkProvider.tryHotswapDeployment(hotswapMode, cdkStackArtifact);

// THEN
expect(waitUntilFunctionUpdated).toHaveBeenCalledWith(
expect(waitUntilFunctionUpdatedV2).toHaveBeenCalledWith(
expect.objectContaining({
minDelay: 5,
maxDelay: 5,
Expand Down
10 changes: 5 additions & 5 deletions packages/aws-cdk/test/api/hotswap/lambda-functions-hotswap-deployments.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
UpdateFunctionCodeCommand,
UpdateFunctionConfigurationCommand,
waitUntilFunctionUpdated,
waitUntilFunctionUpdatedV2,
} from '@aws-sdk/client-lambda';
import * as setup from './hotswap-test-setup';
import { HotswapMode } from '../../../lib/api/hotswap/common';
Expand All @@ -13,7 +13,7 @@ jest.mock('@aws-sdk/client-lambda', () => {

return {
...original,
waitUntilFunctionUpdated: jest.fn(),
waitUntilFunctionUpdatedV2: jest.fn(),
};
});

Expand Down Expand Up @@ -617,7 +617,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot

// THEN
expect(mockLambdaClient).toHaveReceivedCommand(UpdateFunctionCodeCommand);
expect(waitUntilFunctionUpdated).toHaveBeenCalledWith(
expect(waitUntilFunctionUpdatedV2).toHaveBeenCalledWith(
expect.objectContaining({
minDelay: 1,
maxDelay: 1,
Expand Down Expand Up @@ -675,7 +675,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
await hotswapMockSdkProvider.tryHotswapDeployment(hotswapMode, cdkStackArtifact);

// THEN
expect(waitUntilFunctionUpdated).toHaveBeenCalledWith(
expect(waitUntilFunctionUpdatedV2).toHaveBeenCalledWith(
expect.objectContaining({
minDelay: 1,
maxDelay: 1,
Expand Down Expand Up @@ -733,7 +733,7 @@ describe.each([HotswapMode.FALL_BACK, HotswapMode.HOTSWAP_ONLY])('%p mode', (hot
await hotswapMockSdkProvider.tryHotswapDeployment(hotswapMode, cdkStackArtifact);

// THEN
expect(waitUntilFunctionUpdated).toHaveBeenCalledWith(
expect(waitUntilFunctionUpdatedV2).toHaveBeenCalledWith(
expect.objectContaining({
minDelay: 5,
maxDelay: 5,
Expand Down
Loading