feat(encryption) [12/N] write encrypted manifest list#2677
Open
aarushigupta132 wants to merge 8 commits into
Open
feat(encryption) [12/N] write encrypted manifest list#2677aarushigupta132 wants to merge 8 commits into
aarushigupta132 wants to merge 8 commits into
Conversation
|
|
||
| /// Construct a v3 [`ManifestListWriter`] that writes to an [`EncryptedOutputFile`]. | ||
| /// See [`Self::v1_from_encrypted`] for the key-metadata contract. | ||
| pub async fn v3_from_encrypted( |
Contributor
There was a problem hiding this comment.
I don’t think we need these new constructors, manifest list writer was refactored to take a FileWrite so we can just construct with the correct encrypting file writer
Author
There was a problem hiding this comment.
thank you for the review 🙏 , i have addressed this in the latest commit
aarushigupta132
force-pushed
the
feat/encrypted-manifest-list-write
branch
from
38ef25d to
1f644ce
Compare
aarushigupta132
force-pushed
the
feat/encrypted-manifest-list-write
branch
from
09df745 to
19fc82d
Compare
| .new_output(manifest_list_path.clone())?; | ||
|
|
||
| let (writer, encrypted) = if let Some(em) = self.table.encryption_manager() { | ||
| let enc = em.encrypt(raw_output); |
Contributor
There was a problem hiding this comment.
Suggested change
| let enc = em.encrypt(raw_output); | |
| let encrypted_output = em.encrypt(raw_output); |
Comment on lines
+493
to
+511
| let encryption_key_id = match encrypted { | ||
| Some((em, enc)) => { | ||
| let key_id = em | ||
| .encrypt_manifest_list_key_metadata(enc.key_metadata()) | ||
| .await?; | ||
|
|
||
| updates.extend(em.with_encryption_keys(|keys| { | ||
| keys.values() | ||
| .filter(|k| self.table.metadata().encryption_key(k.key_id()).is_none()) | ||
| .map(|k| TableUpdate::AddEncryptionKey { | ||
| encryption_key: k.clone(), | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| })); | ||
|
|
||
| Some(key_id) | ||
| } | ||
| None => None, | ||
| }; |
Contributor
There was a problem hiding this comment.
Consider moving this to a function and unit testing it.
|
|
||
| let (writer, encrypted) = if let Some(em) = self.table.encryption_manager() { | ||
| let enc = em.encrypt(raw_output); | ||
| (enc.writer().await?, Some((em, enc))) |
Contributor
There was a problem hiding this comment.
Rather than returning a tuple of tuples, can we just return the key metadata and the writer?
aarushigupta132
force-pushed
the
feat/encrypted-manifest-list-write
branch
from
3627509 to
c7ecd37
Compare
aarushigupta132
force-pushed
the
feat/encrypted-manifest-list-write
branch
from
c7ecd37 to
4b67ed5
Compare
xanderbailey
left a comment
xanderbailey
left a comment
Contributor
There was a problem hiding this comment.
This is looking good to me, requested a test
| } | ||
|
|
||
| /// Finished building the action and return the [`ActionCommit`] to the transaction. | ||
| pub(crate) async fn commit<OP: SnapshotProduceOperation, MP: ManifestProcess>( |
Contributor
There was a problem hiding this comment.
Is it possible to add a commit test to show that we add the correct updates?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
What changes are included in this PR?
Adds encrypted manifest-list writing and wires it into SnapshotProducer::commit. When the table has an EncryptionManager, the manifest list is encrypted, its key is KEK-wrapped, the wrapped key id is stored on the snapshot.
Are these changes tested?
Encrypted round-trip unit test on the manifest-list writer