nucliadb-utils 6.7.0.post4742__py3-none-any.whl → 6.7.0.post4752__py3-none-any.whl

nucliadb_utils/settings.py

@@ -99,6 +99,7 @@ class StorageSettings(BaseSettings):
     s3_max_pool_connections: int = 30
     s3_endpoint: Optional[str] = None
     s3_region_name: Optional[str] = None
+    s3_kms_key_id: Optional[str] = None
     s3_bucket: Optional[str] = Field(default=None, description="KnowledgeBox S3 bucket name template")
     s3_bucket_tags: Dict[str, str] = Field(
         default={},

nucliadb_utils/storages/s3.py

@@ -356,6 +356,7 @@ class S3Storage(Storage):
         verify_ssl: bool = True,
         use_ssl: bool = True,
         region_name: Optional[str] = None,
+        kms_key_id: Optional[str] = None,
         max_pool_connections: int = 30,
         bucket: Optional[str] = None,
         bucket_tags: Optional[dict[str, str]] = None,
@@ -380,6 +381,7 @@ class S3Storage(Storage):
         )
         self._exit_stack = AsyncExitStack()
         self.bucket = bucket
+        self._kms_key_id = kms_key_id
 
     def get_bucket_name(self, kbid: str):
         if self.bucket is None:
@@ -440,7 +442,9 @@ class S3Storage(Storage):
         return await bucket_exists(self._s3aioclient, bucket_name)
 
     async def create_bucket(self, bucket_name: str):
-        await create_bucket(self._s3aioclient, bucket_name, self._bucket_tags, self._region_name)
+        await create_bucket(
+            self._s3aioclient, bucket_name, self._bucket_tags, self._region_name, self._kms_key_id
+        )
 
     async def schedule_delete_kb(self, kbid: str):
         bucket_name = self.get_bucket_name(kbid)
@@ -523,6 +527,7 @@ async def create_bucket(
     bucket_name: str,
     bucket_tags: Optional[dict[str, str]] = None,
     region_name: Optional[str] = None,
+    kms_key_id: Optional[str] = None,
 ):
     bucket_creation_options = {}
     if region_name is not None:
@@ -540,6 +545,21 @@ async def create_bucket(
                 ]
             },
         )
+    if kms_key_id is not None:
+        await client.put_bucket_encryption(
+            Bucket=bucket_name,
+            ServerSideEncryptionConfiguration={
+                "Rules": [
+                    {
+                        "ApplyServerSideEncryptionByDefault": {
+                            "SSEAlgorithm": "aws:kms",
+                            "KMSMasterKeyID": kms_key_id,
+                        },
+                        "BucketKeyEnabled": True,
+                    }
+                ]
+            },
+        )
 
 
 def parse_status_code(error: botocore.exceptions.ClientError) -> int:

nucliadb_utils/tests/s3.py

@@ -72,6 +72,7 @@ async def s3_storage_settings(s3) -> AsyncIterator[dict[str, Any]]:
         "s3_verify_ssl": False,
         "s3_region_name": None,
         "s3_bucket": "test-{kbid}",
+        "s3_kms_key_id": "fake-kms-key-id",
         "s3_bucket_tags": {
             "testTag": "test",
         },
@@ -104,6 +105,7 @@ async def s3_storage(s3, s3_storage_settings: dict[str, Any]):
         region_name=storage_settings.s3_region_name,
         bucket=storage_settings.s3_bucket,
         bucket_tags=storage_settings.s3_bucket_tags,
+        kms_key_id=storage_settings.s3_kms_key_id,
     )
     await storage.initialize()
     await storage.create_bucket("nidx")

{nucliadb_utils-6.7.0.post4742.dist-info → nucliadb_utils-6.7.0.post4752.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb_utils
-Version: 6.7.0.post4742
+Version: 6.7.0.post4752
 Summary: NucliaDB util library
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: AGPL-3.0-or-later
@@ -27,8 +27,8 @@ Requires-Dist: nats-py[nkeys]>=2.6.0
 Requires-Dist: PyNaCl
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: mrflagly>=0.2.9
-Requires-Dist: nucliadb-protos>=6.7.0.post4742
-Requires-Dist: nucliadb-telemetry>=6.7.0.post4742
+Requires-Dist: nucliadb-protos>=6.7.0.post4752
+Requires-Dist: nucliadb-telemetry>=6.7.0.post4752
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-6.7.0.post4742.dist-info → nucliadb_utils-6.7.0.post4752.dist-info}/RECORD

@@ -11,7 +11,7 @@ nucliadb_utils/nats.py,sha256=U21Cfg36_IHd3ZLXEC4eZ7nZ1Soh_ZNFFwjryNyd2-8,15248
 nucliadb_utils/partition.py,sha256=jBgy4Hu5Iwn4gjbPPcthSykwf-qNx-GcLAIwbzPd1d0,1157
 nucliadb_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_utils/run.py,sha256=Es0_Bu5Yc-LWczvwL6gzWqSwC85RjDCk-0oFQAJi9g4,1827
-nucliadb_utils/settings.py,sha256=RnGhEUvwv6faNqALiqDCivvzNOyyXVBflYh_37uNkow,8193
+nucliadb_utils/settings.py,sha256=lZUCliwNKYfk_Tt0KiYeHsT4jRBG0gLAompuHWu9fBI,8233
 nucliadb_utils/signals.py,sha256=lo_Mk12NIX5Au--3H3WObvDOXq_OMurql2qiC2TnAao,2676
 nucliadb_utils/store.py,sha256=kQ35HemE0v4_Qg6xVqNIJi8vSFAYQtwI3rDtMsNy62Y,890
 nucliadb_utils/transaction.py,sha256=l3ZvrITYMnAs_fv1OOC-1nDZxWPG5qmbBhzvuC3DUzQ,8039
@@ -45,7 +45,7 @@ nucliadb_utils/storages/gcs.py,sha256=XbtX0Lt3GO7kzuJ1E5CdazlpSqjU46Bhhezq32VQUo
 nucliadb_utils/storages/local.py,sha256=2aCHpZymORG_dUc1FDq0VFcgQulu0w2pZiUaj9dphFs,11686
 nucliadb_utils/storages/nuclia.py,sha256=vEv94xAT7QM2g80S25QyrOw2pzvP2BAX-ADgZLtuCVc,2097
 nucliadb_utils/storages/object_store.py,sha256=2PueRP5Q3XOuWgKhj6B9Kp2fyBql5np0T400YRUbqn4,4535
-nucliadb_utils/storages/s3.py,sha256=4-cs_uFC4ZoLHLTZqvGi8v3nQcbrPBFJZuIeWltkFHI,21026
+nucliadb_utils/storages/s3.py,sha256=1mMXfC0hCJLlVnw-B_WWPWZrNyeYzW3bqQm3u-EE9T8,21707
 nucliadb_utils/storages/settings.py,sha256=ugCPy1zxBOmA2KosT-4tsjpvP002kg5iQyi42yCGCJA,1285
 nucliadb_utils/storages/storage.py,sha256=4pHkxjwhBpupklp-vFtRCUazlTsGF13LHuF-c2ooYNA,21852
 nucliadb_utils/storages/utils.py,sha256=8g2rIwJeYIumQLOB47Yw1rx3twlhRB_cJxer65QfZmk,1479
@@ -56,8 +56,8 @@ nucliadb_utils/tests/fixtures.py,sha256=uNiZ8qaOz2bSmSn-2ZMXxhQcHVh3tCyr5A-e0Xao
 nucliadb_utils/tests/gcs.py,sha256=MBMzn_UHU5SU6iILuCsB5zU4umhNcaCw_MKrxZhwvOc,4705
 nucliadb_utils/tests/local.py,sha256=cxIfPrKuqs5Ef0nbrVYQQAH2mwc4E0iD9bC2sWegS-c,1934
 nucliadb_utils/tests/nats.py,sha256=RWHjwqq5esuO7OFbP24yYX1cXnpPLcWJwDUdmwCpH28,1897
-nucliadb_utils/tests/s3.py,sha256=DACUh3HvgH3BchKFZ9R7RFUzsrg3v9A-cxTcXx4nmvA,3734
-nucliadb_utils-6.7.0.post4742.dist-info/METADATA,sha256=QcH9NouLD9JnzHr0gfKqv7kQyCRCfxVaGpGiwj6BqFw,2180
-nucliadb_utils-6.7.0.post4742.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb_utils-6.7.0.post4742.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-6.7.0.post4742.dist-info/RECORD,,
+nucliadb_utils/tests/s3.py,sha256=kz9ULxrAYLVslZ59I8dtweZ9DJz5R8Ioy2XYrveZzHw,3829
+nucliadb_utils-6.7.0.post4752.dist-info/METADATA,sha256=qIHLd3fJ5g8Qghl-Y6q06FP2qp9DRX27QwkzQTWpZ6o,2180
+nucliadb_utils-6.7.0.post4752.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb_utils-6.7.0.post4752.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-6.7.0.post4752.dist-info/RECORD,,