Allow avatar download to fail on checksum

[noissue]
gerrod3 · Feb 20, 2024 · 07eabfa · 07eabfa
1 parent 88577d3
commit 07eabfa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES/+failsafe_avatar.bugfix b/CHANGES/+failsafe_avatar.bugfix
@@ -0,0 +1 @@
+Changed avatar download to allow graceful failure on mismatching image checksum.
diff --git a/pulp_ansible/app/models.py b/pulp_ansible/app/models.py
@@ -362,7 +362,8 @@ def calculate_metadata_sha256(self):
             # If we are creating from sync, assert that calculated hash == synced hash
             if self.metadata_sha256 != hasher.hexdigest():
                 raise IntegrityError("Calculated digest does not equal passed in digest")
-        self.metadata_sha256 = hasher.hexdigest()
+        else:
+            self.metadata_sha256 = hasher.hexdigest()
 
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"

diff --git a/pulp_ansible/app/tasks/collections.py b/pulp_ansible/app/tasks/collections.py
@@ -24,6 +24,7 @@
 from galaxy_importer.collection import sync_collection
 from galaxy_importer.exceptions import ImporterError
 from git import GitCommandError, Repo
+from pulpcore.plugin.exceptions import DigestValidationError
 from pulpcore.plugin.models import (
     Artifact,
     ContentArtifact,
@@ -1067,7 +1068,7 @@ async def download(self):
         artifact_copy = self.artifact
         try:
             return await super().download()
-        except ClientError as e:
+        except (ClientError, DigestValidationError) as e:
             # Reset DA so that future stages can properly handle it
             self.artifact = artifact_copy
             self.deferred_download = True
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Changed avatar download to allow graceful failure on mismatching image checksum.