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.

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

2256 encrypt cloudtrail logs #2257

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Conversation

Matthew-Grayson
Copy link
Contributor

@Matthew-Grayson Matthew-Grayson commented Sep 26, 2023

🗣 Description

Enables KMS encryption of our Terraform-managed CloudTrail.

  • Add kms_key_id to CloudTrail resource to enable encryption.
  • Add CloudTrail kms policy; rename CloudTrail s3 policy.
  • Refactor assume_role_policy to use jsonencode() for code readablitiy and IDE error checking.

💭 Motivation and context

See issue #2256
Related to CIS AWS Foundations Benchmark v1.4.0/3.7

🧪 Testing

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced
    in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

✅ Post-merge checklist

  • Create a release.

@Matthew-Grayson Matthew-Grayson linked an issue Sep 26, 2023 that may be closed by this pull request
@Matthew-Grayson Matthew-Grayson temporarily deployed to production September 26, 2023 18:42 — with GitHub Actions Inactive
@Matthew-Grayson Matthew-Grayson temporarily deployed to staging September 26, 2023 18:42 — with GitHub Actions Inactive
@Matthew-Grayson Matthew-Grayson marked this pull request as ready for review September 26, 2023 19:03
Copy link
Contributor

@aloftus23 aloftus23 left a comment

Choose a reason for hiding this comment

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

Looks good

@Matthew-Grayson Matthew-Grayson merged commit 1da1a20 into master Sep 28, 2023
9 checks passed
@Matthew-Grayson Matthew-Grayson deleted the 2256-encrypt-cloudtrail-logs branch September 28, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Encrypt CloudTrail Logs
2 participants