Skip to content

KMS: RotateKeyOnDemand api update #12806

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

willdefig
Copy link

Motivation

In response to the latest changes to KMS that AWS have made it is now possible to rotate keys on demand if they are and external key,
https://aws.amazon.com/blogs/security/how-to-use-on-demand-rotation-for-aws-kms-imported-keys/

Also there is a new item in the metadata for the key to show the CurrentKeyMaterialId this should update when the key is rotated.

Changes

  • Add CurrentKeyMaterialId to key Metadata
  • Allow RotateKeyOnDemand to accept EXTERNAL Type keys
  • Updated test for RotateKeyOnDemand

Relates to issue #12801

@willdefig willdefig requested a review from sannya-singal as a code owner June 26, 2025 08:27
@localstack-bot
Copy link
Collaborator

localstack-bot commented Jun 26, 2025

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@sannya-singal sannya-singal added this to the Playground milestone Jun 26, 2025
@sannya-singal sannya-singal requested a review from k-a-il June 26, 2025 08:41
@sannya-singal sannya-singal added semver: minor Non-breaking changes which can be included in minor releases, but not in patch releases aws:kms AWS Key Management Service labels Jun 26, 2025
@willdefig
Copy link
Author

I have read the CLA Document and I hereby sign the CLA

@willdefig
Copy link
Author

recheck

localstack-bot added a commit that referenced this pull request Jun 26, 2025
Copy link
Contributor

@k-a-il k-a-il left a comment

Choose a reason for hiding this comment

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

Hi @willdefig thank you for your contribution 🚀
As mentioned in my comment below, I believe it’s important to add the test case described in the article to check that this implementation aligns with AWS behavior. Without this, the behavior may not fully match AWS KMS behavior.

Comment on lines 1459 to 1464
def test_rotate_key_on_demand_succeeds_for_key_with_imported_key_material(
self, kms_create_key, aws_client, snapshot
):
key_id = kms_create_key(Origin="EXTERNAL")["KeyId"]

with pytest.raises(ClientError) as e:
aws_client.kms.rotate_key_on_demand(KeyId=key_id)
snapshot.match("error-response", e.value.response)
response = aws_client.kms.rotate_key_on_demand(KeyId=key_id)
snapshot.match("rotate-on-demand-response", response)
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you add an integration test to confirm that a KMS key with imported key material can be created and used, and that after rotating the key material using the rotate_key_on_demand operation, the KMS key continues to work correctly for both encryption and decryption? The test should also verify that data encrypted with the previous key material can still be successfully decrypted.

This test case is described in this AWS blog post about using on-demand rotation for imported keys.

- Creates Key
- Imports custom Key Material
- Creates Encrypted data key
- Tests it can use it to decrypt
- Creates new key material
- Imports new material
- Rotates new material
- Creates new encrypted key data
- Tests it can decrypt that
- Tests it can still decrypt old key data
 - updated test to include checking rotated keys are still usable.

 - Tidied up import_key_material importing for EXTERNAL keys

 -  rotate_key_on_demand stopped key being recreated if using EXTERNAL keys
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
aws:kms AWS Key Management Service semver: minor Non-breaking changes which can be included in minor releases, but not in patch releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants