dcicutils 7.11.0.1b9__tar.gz → 7.12.0.1b4__tar.gz

{dcicutils-7.11.0.1b9 → dcicutils-7.12.0.1b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 7.11.0.1b9
+Version: 7.12.0.1b4
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT
@@ -25,11 +25,9 @@ Requires-Dist: PyYAML (>=5.1,<5.5)
 Requires-Dist: aws-requests-auth (>=0.4.2,<1)
 Requires-Dist: boto3 (>=1.17.39,<2.0.0)
 Requires-Dist: botocore (>=1.20.39,<2.0.0)
-Requires-Dist: chardet (>=5.2.0,<6.0.0)
 Requires-Dist: docker (>=4.4.4,<5.0.0)
 Requires-Dist: elasticsearch (==7.13.4)
 Requires-Dist: gitpython (>=3.1.2,<4.0.0)
-Requires-Dist: openpyxl (>=3.1.2,<4.0.0)
 Requires-Dist: opensearch-py (>=2.0.1,<3.0.0)
 Requires-Dist: pyOpenSSL (>=23.1.1,<24.0.0)
 Requires-Dist: pytz (>=2020.4)

{dcicutils-7.11.0.1b9 → dcicutils-7.12.0.1b4}/dcicutils/glacier_utils.py

@@ -58,6 +58,10 @@ class GlacierUtils:
         self.env_key = self.key_manager.get_keydict_for_env(env_name)
         self.health_page = get_health_page(key=self.env_key, ff_env=env_name)
 
+    @property
+    def kms_key_id(self) -> str:
+        return self.health_page.get("s3_encrypt_key_id", "")
+
     @classmethod
     def is_glacier_storage_class(cls, storage_class: S3StorageClass):
         return storage_class in S3_GLACIER_CLASSES
@@ -295,6 +299,9 @@ class GlacierUtils:
             }
             if tags:
                 cmu['Tagging'] = tags
+            if self.kms_key_id:
+                cmu['ServerSideEncryption'] = 'aws:kms'
+                cmu['SSEKMSKeyId'] = self.kms_key_id
             mpu = self.s3.create_multipart_upload(**cmu)
             mpu_upload_id = mpu['UploadId']
         except Exception as e:
@@ -381,16 +388,21 @@ class GlacierUtils:
             else:
                 # Force copy the object into standard in a single operation
                 copy_source = {'Bucket': bucket, 'Key': key}
-                copy_target = {
+                copy_args = {
                     'Bucket': bucket, 'Key': key,
                     'StorageClass': storage_class,
                 }
                 if version_id:
                     copy_source['VersionId'] = version_id
-                    copy_target['CopySourceVersionId'] = version_id
+                    copy_args['CopySourceVersionId'] = version_id
                 if tags:
-                    copy_target['Tagging'] = tags
-                response = self.s3.copy_object(CopySource=copy_source, **copy_target)
+                    copy_args['Tagging'] = tags
+                if self.kms_key_id:
+                    copy_args['ServerSideEncryption'] = 'aws:kms'
+                    copy_args['SSEKMSKeyId'] = self.kms_key_id
+                response = self.s3.copy_object(
+                    **copy_args, CopySource=copy_source
+                )
                 PRINT(f'Response from boto3 copy:\n{response}')
                 PRINT(f'Object {bucket}/{key} copied back to its original location in S3')
                 return response