|
22 | 22 | from typing import Any |
23 | 23 |
|
24 | 24 | import pytest |
25 | | -from pydantic import BaseModel, ValidationError |
| 25 | +from pydantic import BaseModel, TypeAdapter, ValidationError |
26 | 26 | from pytest_lazy_fixtures import lf |
27 | 27 |
|
28 | 28 | from pyiceberg.catalog import Catalog |
|
46 | 46 | Table, |
47 | 47 | TableIdentifier, |
48 | 48 | ) |
49 | | -from pyiceberg.table.metadata import TableMetadataUtil, TableMetadataV1, TableMetadataV2, _generate_snapshot_id |
| 49 | +from pyiceberg.table.metadata import EncryptedKey, TableMetadataUtil, TableMetadataV1, TableMetadataV2, _generate_snapshot_id |
50 | 50 | from pyiceberg.table.refs import MAIN_BRANCH, SnapshotRef, SnapshotRefType |
51 | 51 | from pyiceberg.table.snapshots import ( |
52 | 52 | MetadataLogEntry, |
|
63 | 63 | ) |
64 | 64 | from pyiceberg.table.statistics import BlobMetadata, PartitionStatisticsFile, StatisticsFile |
65 | 65 | from pyiceberg.table.update import ( |
| 66 | + AddEncryptionKeyUpdate, |
66 | 67 | AddPartitionSpecUpdate, |
67 | 68 | AddSnapshotUpdate, |
68 | 69 | AddSortOrderUpdate, |
|
74 | 75 | AssertLastAssignedPartitionId, |
75 | 76 | AssertRefSnapshotId, |
76 | 77 | AssertTableUUID, |
| 78 | + RemoveEncryptionKeyUpdate, |
77 | 79 | RemovePartitionSpecsUpdate, |
78 | 80 | RemovePartitionStatisticsUpdate, |
79 | 81 | RemovePropertiesUpdate, |
|
86 | 88 | SetPropertiesUpdate, |
87 | 89 | SetSnapshotRefUpdate, |
88 | 90 | SetStatisticsUpdate, |
| 91 | + TableUpdate, |
89 | 92 | _apply_table_update, |
90 | 93 | _TableMetadataUpdateContext, |
91 | 94 | update_table_metadata, |
@@ -1951,6 +1954,75 @@ def test_remove_partition_statistics_update_with_invalid_snapshot_id(table_v2_wi |
1951 | 1954 | ) |
1952 | 1955 |
|
1953 | 1956 |
|
| 1957 | +def test_add_encryption_key_update(table_v3: Table) -> None: |
| 1958 | + kek = EncryptedKey(key_id="kek", encrypted_key_metadata=b"wrapped-kek", encrypted_by_id="master", properties={"a": "b"}) |
| 1959 | + manifest_list_key = EncryptedKey(key_id="manifest-list-key", encrypted_key_metadata=b"wrapped-dek", encrypted_by_id="kek") |
| 1960 | + |
| 1961 | + new_metadata = update_table_metadata( |
| 1962 | + table_v3.metadata, |
| 1963 | + (AddEncryptionKeyUpdate(encryption_key=kek), AddEncryptionKeyUpdate(encryption_key=manifest_list_key)), |
| 1964 | + ) |
| 1965 | + |
| 1966 | + assert new_metadata.encryption_keys == [kek, manifest_list_key] |
| 1967 | + |
| 1968 | + |
| 1969 | +def test_add_encryption_key_update_with_existing_key_id(table_v3: Table) -> None: |
| 1970 | + key = EncryptedKey(key_id="kek", encrypted_key_metadata=b"wrapped-kek") |
| 1971 | + base_metadata = update_table_metadata(table_v3.metadata, (AddEncryptionKeyUpdate(encryption_key=key),)) |
| 1972 | + |
| 1973 | + context = _TableMetadataUpdateContext() |
| 1974 | + duplicate = EncryptedKey(key_id="kek", encrypted_key_metadata=b"other") |
| 1975 | + new_metadata = _apply_table_update(AddEncryptionKeyUpdate(encryption_key=duplicate), base_metadata, context) |
| 1976 | + |
| 1977 | + assert new_metadata.encryption_keys == [key] |
| 1978 | + assert not context.has_changes() |
| 1979 | + |
| 1980 | + |
| 1981 | +def test_remove_encryption_key_update(table_v3: Table) -> None: |
| 1982 | + first = EncryptedKey(key_id="first", encrypted_key_metadata=b"first") |
| 1983 | + second = EncryptedKey(key_id="second", encrypted_key_metadata=b"second") |
| 1984 | + base_metadata = update_table_metadata( |
| 1985 | + table_v3.metadata, (AddEncryptionKeyUpdate(encryption_key=first), AddEncryptionKeyUpdate(encryption_key=second)) |
| 1986 | + ) |
| 1987 | + |
| 1988 | + new_metadata = update_table_metadata(base_metadata, (RemoveEncryptionKeyUpdate(key_id="first"),)) |
| 1989 | + |
| 1990 | + assert new_metadata.encryption_keys == [second] |
| 1991 | + |
| 1992 | + |
| 1993 | +def test_remove_encryption_key_update_with_missing_key_id(table_v3: Table) -> None: |
| 1994 | + context = _TableMetadataUpdateContext() |
| 1995 | + new_metadata = _apply_table_update(RemoveEncryptionKeyUpdate(key_id="missing"), table_v3.metadata, context) |
| 1996 | + |
| 1997 | + assert new_metadata == table_v3.metadata |
| 1998 | + assert not context.has_changes() |
| 1999 | + |
| 2000 | + |
| 2001 | +@pytest.mark.parametrize( |
| 2002 | + "update", |
| 2003 | + [ |
| 2004 | + AddEncryptionKeyUpdate(encryption_key=EncryptedKey(key_id="a", encrypted_key_metadata=b"key")), |
| 2005 | + RemoveEncryptionKeyUpdate(key_id="a"), |
| 2006 | + ], |
| 2007 | +) |
| 2008 | +def test_encryption_key_updates_require_v3(table_v2: Table, update: TableUpdate) -> None: |
| 2009 | + with pytest.raises(ValueError, match="Encryption keys are not supported in format version 2"): |
| 2010 | + update_table_metadata(table_v2.metadata, (update,)) |
| 2011 | + |
| 2012 | + |
| 2013 | +def test_serialize_encryption_key_updates() -> None: |
| 2014 | + add = AddEncryptionKeyUpdate(encryption_key=EncryptedKey(key_id="a", encrypted_key_metadata=b"key", encrypted_by_id="b")) |
| 2015 | + remove = RemoveEncryptionKeyUpdate(key_id="a") |
| 2016 | + |
| 2017 | + assert json.loads(add.model_dump_json()) == { |
| 2018 | + "action": "add-encryption-key", |
| 2019 | + "encryption-key": {"key-id": "a", "encrypted-key-metadata": "a2V5", "encrypted-by-id": "b", "properties": {}}, |
| 2020 | + } |
| 2021 | + assert json.loads(remove.model_dump_json()) == {"action": "remove-encryption-key", "key-id": "a"} |
| 2022 | + assert TypeAdapter(TableUpdate).validate_json(add.model_dump_json()) == add |
| 2023 | + assert TypeAdapter(TableUpdate).validate_json(remove.model_dump_json()) == remove |
| 2024 | + |
| 2025 | + |
1954 | 2026 | def test_add_snapshot_update_fails_without_first_row_id(table_v3: Table) -> None: |
1955 | 2027 | new_snapshot = Snapshot( |
1956 | 2028 | snapshot_id=25, |
|
0 commit comments