Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyiceberg/encryption/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from pyiceberg.encryption.ciphers import AesGcmCipher, AesKeySize, SecureKey
from pyiceberg.encryption.key_metadata import StandardKeyMetadata
from pyiceberg.encryption.kms import KeyManagementClient
from pyiceberg.table.metadata import EncryptedKey, TableMetadata, TableMetadataV3
from pyiceberg.table.metadata import EncryptedKey, TableMetadata
from pyiceberg.utils.properties import property_as_int

KEK_CREATED_AT_PROPERTY = "KEY_TIMESTAMP"
Expand Down Expand Up @@ -68,7 +68,7 @@ def from_table_metadata(cls, kms_client: KeyManagementClient | None, metadata: T
if (table_key_id := metadata.properties.get(TableProperties.ENCRYPTION_KEY_ID)) is None:
return None

if not isinstance(metadata, TableMetadataV3):
if metadata.format_version < 3:
raise ValueError(f"Invalid properties for v{metadata.format_version}: {TableProperties.ENCRYPTION_KEY_ID}")

if kms_client is None:
Expand Down
5 changes: 2 additions & 3 deletions pyiceberg/table/update/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
EncryptedKey,
TableMetadata,
TableMetadataUtil,
TableMetadataV3,
_check_properties_format_version_compatibility,
)
from pyiceberg.table.refs import MAIN_BRANCH, SnapshotRef, SnapshotRefType
Expand Down Expand Up @@ -704,7 +703,7 @@ def _(

@_apply_table_update.register(AddEncryptionKeyUpdate)
def _(update: AddEncryptionKeyUpdate, base_metadata: TableMetadata, context: _TableMetadataUpdateContext) -> TableMetadata:
if not isinstance(base_metadata, TableMetadataV3):
if base_metadata.format_version < 3:
raise ValueError(f"Encryption keys are not supported in format version {base_metadata.format_version}")

if any(key.key_id == update.encryption_key.key_id for key in base_metadata.encryption_keys):
Expand All @@ -716,7 +715,7 @@ def _(update: AddEncryptionKeyUpdate, base_metadata: TableMetadata, context: _Ta

@_apply_table_update.register(RemoveEncryptionKeyUpdate)
def _(update: RemoveEncryptionKeyUpdate, base_metadata: TableMetadata, context: _TableMetadataUpdateContext) -> TableMetadata:
if not isinstance(base_metadata, TableMetadataV3):
if base_metadata.format_version < 3:
raise ValueError(f"Encryption keys are not supported in format version {base_metadata.format_version}")

encryption_keys = [key for key in base_metadata.encryption_keys if key.key_id != update.key_id]
Expand Down
Loading