Merge pull request #340 from reef-technologies/monitoring-enctyption-mode

Replace ReplicationScanResult.source_has_sse_c_enabled -> source_encryption_mode

Author: ppolewicz

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+* Fix: replace `ReplicationScanResult.source_has_sse_c_enabled` with `source_encryption_mode`
+
 ## [1.17.3] - 2022-07-15
 
 ### Fixed

b2sdk/replication/monitoring.py

@@ -41,7 +41,7 @@ class ReplicationScanResult(AbstractScanResult):
     # source attrs
     source_replication_status: Optional[ReplicationStatus] = None
     source_has_hide_marker: Optional[bool] = None
-    source_has_sse_c_enabled: Optional[bool] = None
+    source_encryption_mode: Optional[EncryptionMode] = None
     source_has_large_metadata: Optional[bool] = None
     source_has_file_retention: Optional[bool] = None
     source_has_legal_hold: Optional[bool] = None
@@ -69,8 +69,8 @@ def from_files(
                         source_file_version.replication_status,
                     'source_has_hide_marker':
                         not source_file.is_visible(),
-                    'source_has_sse_c_enabled':
-                        source_file_version.server_side_encryption.mode == EncryptionMode.SSE_C,
+                    'source_encryption_mode':
+                        source_file_version.server_side_encryption.mode,
                     'source_has_large_metadata':
                         source_file_version.has_large_header,
                     'source_has_file_retention':

test/unit/replication/test_monitoring.py

@@ -21,7 +21,7 @@
 DEFAULT_REPLICATION_RESULT = dict(
     source_replication_status=None,
     source_has_hide_marker=False,
-    source_has_sse_c_enabled=False,
+    source_encryption_mode=EncryptionMode.NONE,
     source_has_large_metadata=False,
     source_has_file_retention=False,
     source_has_legal_hold=False,
@@ -60,7 +60,8 @@ def test_iter_pairs(source_bucket, destination_bucket, test_file, monitor):
 def test_scan_source(source_bucket, test_file, monitor):
     # upload various types of files to source and get a report
     files = [
-        source_bucket.upload_local_file(test_file, 'folder/test-1.txt'),
+        source_bucket.upload_local_file(test_file, 'folder/test-1-1.txt'),
+        source_bucket.upload_local_file(test_file, 'folder/test-1-2.txt'),
         source_bucket.upload_local_file(test_file, 'folder/test-2.txt', encryption=SSE_B2_AES),
         source_bucket.upload_local_file(test_file,
                                         'not-in-folder.txt'),  # monitor should ignore this
@@ -95,14 +96,21 @@ def test_scan_source(source_bucket, test_file, monitor):
     assert report.counter_by_status[ReplicationScanResult(
         **{
             **DEFAULT_REPLICATION_RESULT,
-            'source_has_sse_c_enabled': True,
+            'source_encryption_mode': EncryptionMode.SSE_B2,
+        }
+    )] == 1
+
+    assert report.counter_by_status[ReplicationScanResult(
+        **{
+            **DEFAULT_REPLICATION_RESULT,
+            'source_encryption_mode': EncryptionMode.SSE_C,
         }
     )] == 2
 
     assert report.counter_by_status[ReplicationScanResult(
         **{
             **DEFAULT_REPLICATION_RESULT,
-            'source_has_sse_c_enabled': True,
+            'source_encryption_mode': EncryptionMode.SSE_C,
             'source_has_file_retention': True,
         }
     )] == 1
@@ -117,7 +125,7 @@ def test_scan_source(source_bucket, test_file, monitor):
     assert report.counter_by_status[ReplicationScanResult(
         **{
             **DEFAULT_REPLICATION_RESULT,
-            'source_has_sse_c_enabled': True,
+            'source_encryption_mode': EncryptionMode.SSE_C,
             'source_has_large_metadata': True,
         }
     )] == 1
@@ -187,7 +195,7 @@ def test_scan_source_and_destination(
             **DEFAULT_REPLICATION_RESULT,
             'source_replication_status': None,
             'source_has_hide_marker': None,
-            'source_has_sse_c_enabled': None,
+            'source_encryption_mode': None,
             'source_has_large_metadata': None,
             'source_has_file_retention': None,
             'source_has_legal_hold': None,