Skip to content

fix(sqs): kms:Decrypt permission to grantSendMessages #7522

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
Merged
mergify merged 8 commits into from
May 4, 2020
Merged

fix(sqs): kms:Decrypt permission to grantSendMessages #7522

mergify merged 8 commits into from
May 4, 2020

Conversation

@shreyasdamle
Copy link
Contributor

@shreyasdamle shreyasdamle commented Apr 22, 2020

Commit Message

Changes in grantSendMessages method:

Added 'kms:Decrypt' action to grantSendMessages

Fixes: #6609

End Commit Message

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

@mergify
Copy link
Contributor

mergify bot commented Apr 22, 2020

Title does not follow the guidelines of Conventional Commits. Please adjust title before merge.

@shreyasdamle shreyasdamle changed the title Add kms:Decrypt for grantSendMessages feat(sqs): kms:Decrypt permission to grantSendMessages Apr 22, 2020
@shreyasdamle shreyasdamle changed the title feat(sqs): kms:Decrypt permission to grantSendMessages fix(sqs): kms:Decrypt permission to grantSendMessages Apr 22, 2020
@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented Apr 22, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 9d4c779
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented Apr 22, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 5628f0e
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented Apr 26, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 3107198
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented Apr 26, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 7090f76
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented Apr 26, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: aad1527
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

MrArnoldPalmer
MrArnoldPalmer previously requested changes May 4, 2020
View reviewed changes
Copy link
Contributor

@MrArnoldPalmer MrArnoldPalmer left a comment

Choose a reason for hiding this comment

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

Just prefer the grantDecrypt instead of listing out permissions. Otherwise pretty straightforward.

packages/@aws-cdk/aws-sqs/lib/queue-base.ts Outdated
Comment on lines 198 to 203
this.encryptionMasterKey.grant(grantee,
'kms:Encrypt',
'kms:ReEncrypt*',
'kms:GenerateDataKey*',
'kms:Decrypt',
);
Copy link
Contributor

@MrArnoldPalmer MrArnoldPalmer May 4, 2020

Choose a reason for hiding this comment

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

Can we just do

      this.encryptionMasterKey.grantEncrypt(grantee);
      this.encryptionMasterKey.grantDecrypt(grantee);

Copy link
Contributor Author

@shreyasdamle shreyasdamle May 4, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks!
I have changed it to:

this.encryptionMasterKey.grantEncryptDecrypt(grantee);

@mergify mergify bot dismissed MrArnoldPalmer’s stale review May 4, 2020 01:59

Pull request has been modified.

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 1c1cbef
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: b35bcbc
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

aws-cdk-automation commented May 4, 2020

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: d9f2196
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor

mergify bot commented May 4, 2020

Thank you for contributing! Your pull request will be updated from master 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 3beac0e into aws:master May 4, 2020
@shreyasdamle shreyasdamle deleted the sdamle-sqs branch May 6, 2020 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@MrArnoldPalmer MrArnoldPalmer MrArnoldPalmer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@MrArnoldPalmer MrArnoldPalmer

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

grantSendMessages of encrypted SQS to Lambda function not generating kms:Decrypt permission

3 participants

@shreyasdamle @aws-cdk-automation @MrArnoldPalmer