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

Jump to bottom

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

merged 4 commits into from
Nov 27, 2024

Conversation

iliapolo
Copy link
Contributor

@iliapolo iliapolo commented Nov 27, 2024 •
edited
Loading

Closes #32219

Reason for this change

In SDKv3, the standard waitUntilFunctionUpdated function invokes the GetFunctionConfiguration API, as opposed to SDKv2, which invoked GetFunction. This means that consumers of SDKv3 must allow the lambda:GetFunctionConfiguration action in their IAM role policy.

Description of changes

Use a different waiter function provided by the SDK, which invokes GetFunction instead of GetFunctionConfiguration, and thus restoring required IAM permissions to what they were in SDKv2.

See https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-lambda/src/waiters/waitForFunctionUpdatedV2.ts#L10

As opposed to https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-lambda/src/waiters/waitForFunctionUpdated.ts#L13

Description of how you validated changes

Manul test. Assumed a role with the following policies:

Screenshot 2024-11-27 at 9 34 25

 ❯ cdk deploy --hotswap                                                                                                                                                                                                                                            [09:29:11]

✨  Synthesis time: 2.72s

⚠️ The --hotswap and --hotswap-fallback flags deliberately introduce CloudFormation drift to speed up deployments
⚠️ They should only be used for development - never use them for your production Stacks!

AwsCdkPlaygroundStack: deploying... [1/1]

✨ hotswapping resources:
   ✨ Lambda Function 'AwsCdkPlaygroundStack-Function76856677-7Rl7hiwwO5LQ'
❌  AwsCdkPlaygroundStack failed: TimeoutError: Resource is not in the expected state due to waiter status: TIMEOUT. Waiter has timed out.

Then, run the CLI from the PR.

❯ /Users/epolon/dev/src/github.com/aws/aws-cdk/packages/aws-cdk/bin/cdk deploy --hotswap                                                                                                                                                                          [10:03:00]

✨  Synthesis time: 3.46s

⚠️ The --hotswap and --hotswap-fallback flags deliberately introduce CloudFormation drift to speed up deployments
⚠️ They should only be used for development - never use them for your production Stacks!

AwsCdkPlaygroundStack: deploying... [1/1]

✨ hotswapping resources:
   ✨ Lambda Function 'AwsCdkPlaygroundStack-Function76856677-7Rl7hiwwO5LQ'
✨ Lambda Function 'AwsCdkPlaygroundStack-Function76856677-7Rl7hiwwO5LQ' hotswapped!

 ✅  AwsCdkPlaygroundStack

✨  Deployment time: 12.72s

Stack ARN:
arn:aws:cloudformation:us-east-1:01234567890:stack/AwsCdkPlaygroundStack/22f2b380-a7cd-11ef-badd-0e08a8e0b5b1

✨  Total time: 16.19s

>>> elapsed time 23s

Checklist

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@aws-cdk-automation aws-cdk-automation requested a review from a team November 27, 2024 06:45
@github-actions github-actions bot added bug This issue is a bug. p1 labels Nov 27, 2024
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 27, 2024
aws-cdk-automation
aws-cdk-automation previously requested changes Nov 27, 2024
View reviewed changes
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@aws-cdk-automation aws-cdk-automation added the pr/needs-cli-test-run This PR needs CLI tests run against it. label Nov 27, 2024
@iliapolo iliapolo marked this pull request as ready for review November 27, 2024 08:06
@iliapolo iliapolo requested a review from a team as a code owner November 27, 2024 08:06
@iliapolo iliapolo added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Nov 27, 2024
@aws-cdk-automation
Copy link
Collaborator

➡️ PR build request submitted to test-main-pipeline ⬅️

A maintainer must now check the pipeline and add the pr-linter/cli-integ-tested label once the pipeline succeeds.

@codecov Codecov
Copy link

codecov bot commented Nov 27, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.46%. Comparing base (6c0f74e) to head (c577d35).
Report is 1 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main   #32301   +/-   ##
=======================================
  Coverage   77.46%   77.46%           
=======================================
  Files         105      105           
  Lines        7168     7168           
  Branches     1314     1314           
=======================================
  Hits         5553     5553           
  Misses       1433     1433           
  Partials      182      182
Flag Coverage Δ
suite.unit 77.46% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
packages/aws-cdk 77.46% <ø> (ø)

@rix0rrr rix0rrr mentioned this pull request Nov 27, 2024
Open
4 tasks
@iliapolo iliapolo added the pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested label Nov 27, 2024
@aws-cdk-automation aws-cdk-automation removed the pr/needs-cli-test-run This PR needs CLI tests run against it. label Nov 27, 2024
@iliapolo iliapolo changed the title fix:(cli): lambda hotswap fails if lambda:GetFunctionConfiguration action is not allowed fix(cli): lambda hotswap fails if lambda:GetFunctionConfiguration action is not allowed Nov 27, 2024
@github-actions github-actions bot added p0 and removed p1 labels Nov 27, 2024
@aws-cdk-automation aws-cdk-automation dismissed their stale review November 27, 2024 12:20

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 27, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: c577d35
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify Mergify
Copy link
Contributor

mergify bot commented Nov 27, 2024

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit be000a2 into main Nov 27, 2024
16 of 17 checks passed
@mergify mergify bot deleted the epolon/wait-for-function-perms branch November 27, 2024 13:36
@github-actions GitHub Actions
Copy link

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rix0rrr rix0rrr rix0rrr approved these changes

@aws-cdk-automation aws-cdk-automation aws-cdk-automation left review comments

Assignees
No one assigned
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. p0 pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

aws-sdk: Increase in TimeoutErrors in Amplify hotswap builds
3 participants
@iliapolo @aws-cdk-automation @rix0rrr