Confirmation is optional

AB#9779
datatrails · Aug 20, 2024 · ea2cf9e · ea2cf9e
1 parent a91fa96
commit ea2cf9e
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 94 deletions.
diff --git a/archivist_samples/c2pa/c2pa.py b/archivist_samples/c2pa/c2pa.py
@@ -61,7 +61,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription):
 
 
 document_creator = make_assets_create(
-    attachment_creator=attachment_create, confirm=True
+    attachment_creator=attachment_create,
 )
 
 
@@ -170,7 +170,6 @@ def publish(
             props=props,
             attrs=attrs,
             asset_attrs=asset_attrs,
-            confirm=True,
         )
 
     # info_report
@@ -189,7 +188,6 @@ def info_report(self, document: dict):
             self.asset["identity"],
             props=props,
             attrs=attrs,
-            confirm=True,
         )
 
     # ingredients
@@ -214,7 +212,6 @@ def ingredients(self, document: dict):
             self.asset["identity"],
             props=props,
             attrs=attrs,
-            confirm=True,
         )
 
     # external_manifest
@@ -243,7 +240,6 @@ def external_manifest(self, definition: dict, signed_image: dict):
             self.asset["identity"],
             props=props,
             attrs=attrs,
-            confirm=True,
         )
 
     # details_report
@@ -272,7 +268,6 @@ def details_report(self, detailed: dict, manifest_store: dict):
             self.asset["identity"],
             props=props,
             attrs=attrs,
-            confirm=True,
         )
 
     # parent
@@ -302,7 +297,6 @@ def parent(self, parent_definition: dict, signed_image: dict):
             self.asset["identity"],
             props=props,
             attrs=attrs,
-            confirm=True,
         )
 
     # edit_manifest
@@ -327,5 +321,4 @@ def edit_manifest(
             self.asset["identity"],
             props=props,
             attrs=attrs,
-            confirm=True,
         )
diff --git a/archivist_samples/document/document.py b/archivist_samples/document/document.py
@@ -61,7 +61,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription):
 
 
 document_creator = make_assets_create(
-    attachment_creator=attachment_create, confirm=True
+    attachment_creator=attachment_create,
 )
 
 
@@ -165,28 +165,4 @@ def publish(
             props=props,
             attrs=attrs,
             asset_attrs=asset_attrs,
-            confirm=True,
-        )
-
-    # Withdraw version of the document
-    def withdraw(self, document: dict, version: str, doc_hash: str, name: str):
-        props = {
-            "operation": "Record",
-            "behaviour": "RecordEvidence",
-        }
-        attrs = {"arc_display_type": "Withdraw", "document_status": "Withdrawn"}
-
-        asset_attrs = {
-            "arc_display_name": name,
-            "document_document": document,
-            "document_hash_value": doc_hash,
-            "document_version": version,
-        }
-
-        return self.arch.events.create(
-            self.asset["identity"],
-            props=props,
-            attrs=attrs,
-            asset_attrs=asset_attrs,
-            confirm=True,
         )
diff --git a/archivist_samples/door_entry/run.py b/archivist_samples/door_entry/run.py
@@ -49,7 +49,7 @@ def attachment_create(doors, attachment_description: AttachmentDescription):
         return result
 
 
-doors_creator = make_assets_create(attachment_creator=attachment_create, confirm=False)
+doors_creator = make_assets_create(attachment_creator=attachment_create)
 
 
 # Create actual door assets
@@ -269,7 +269,7 @@ def create_doors(doors):
 ############
 
 
-cards_creator = make_assets_create(confirm=False)
+cards_creator = make_assets_create()
 
 
 def create_cards(cards):
@@ -531,7 +531,6 @@ def open_door(doors, doorid, cards, cardid):
                 "arc_blob_hash_value": image["hash"]["value"],
             },
         },
-        confirm=True,
     )
 
     unused_card_record_evidence = cards.events.create(
@@ -568,7 +567,6 @@ def open_door(doors, doorid, cards, cardid):
             "wavestone_evt_type": "door_open",
             "arc_primary_image": [door_image],
         },
-        confirm=True,
     )
     LOGGER.info("Opening door '%s' with card '%s': FINISHED", doorid, cardid)
 

diff --git a/archivist_samples/sample_scripts/c2pa/c2pa_verify.py b/archivist_samples/sample_scripts/c2pa/c2pa_verify.py
@@ -126,7 +126,7 @@ def create_asset(
     }
     props = {"public": True}
 
-    return arch.assets.create(props=props, attrs=attrs, confirm=True)
+    return arch.assets.create(props=props, attrs=attrs)
 
 
 # Uploads primary image and related attachments to DataTrails

diff --git a/archivist_samples/sbom_document/software_package.py b/archivist_samples/sbom_document/software_package.py
@@ -41,7 +41,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription):
         return result
 
 
-sboms_creator = make_assets_create(attachment_creator=attachment_create, confirm=True)
+sboms_creator = make_assets_create(attachment_creator=attachment_create)
 
 
 class SoftwarePackageDocument:
@@ -187,7 +187,6 @@ def publish(
             props=props,
             attrs=attrs,
             asset_attrs=asset_attrs,
-            confirm=True,
         )
 
     def release_plan(
@@ -220,7 +219,9 @@ def release_plan(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def release_accepted(
@@ -253,7 +254,9 @@ def release_accepted(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     # Patch Events
@@ -289,7 +292,9 @@ def patch(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def private_patch(
@@ -325,7 +330,9 @@ def private_patch(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     # Vulnerability Events
@@ -364,7 +371,9 @@ def vuln_disclosure(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def vuln_update(
@@ -401,7 +410,9 @@ def vuln_update(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     # EOL/Deprecation
@@ -436,5 +447,7 @@ def deprecation(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
diff --git a/archivist_samples/signed_records/main.py b/archivist_samples/signed_records/main.py
@@ -152,7 +152,7 @@ def generate_crypto_asset(archivist, asset_name):
         "arc_display_type": "Crypto endpoint",
         "arc_evidence_signing_pubkey": pubkey_pem.decode("utf-8"),
     }
-    newasset = archivist.assets.create(attrs=attrs, confirm=True)
+    newasset = archivist.assets.create(attrs=attrs)
     LOGGER.debug(newasset)
     if not newasset:
         LOGGER.error("Failed to register new asset with Archivist")
@@ -243,7 +243,7 @@ def submit_signed_evidence(archivist, asset_name, message, corrupt_sig):
         # should cover the complete 'arc_evidence' field (and no more)
         "arc_evidence_signature": signature,
     }
-    archivist.events.create(a_id, props, attrs, confirm=True)
+    archivist.events.create(a_id, props, attrs)
 
 
 def print_history(archivist, asset_name):

diff --git a/archivist_samples/software_bill_of_materials/software_deployment.py b/archivist_samples/software_bill_of_materials/software_deployment.py
@@ -130,7 +130,6 @@ def installation(
             props=props,
             attrs=attrs,
             asset_attrs=asset_attrs,
-            confirm=True,
         )
 
     def decommission(
@@ -249,7 +248,6 @@ def upgrade(
             props=props,
             attrs=attrs,
             asset_attrs=asset_attrs,
-            confirm=True,
         )
 
     def upgrade_plan(
@@ -294,7 +292,9 @@ def upgrade_plan(
         if custom_attrs is not None:
             attrs.update(custom_attrs)
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def upgrade_accepted(
@@ -339,7 +339,9 @@ def upgrade_accepted(
         if custom_attrs is not None:
             attrs.update(custom_attrs)
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     # Rollback Events
@@ -402,7 +404,6 @@ def rollback(
             props=props,
             attrs=attrs,
             asset_attrs=asset_attrs,
-            confirm=True,
         )
 
     def rollback_plan(
@@ -447,7 +448,9 @@ def rollback_plan(
         if custom_attrs is not None:
             attrs.update(custom_attrs)
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def rollback_accepted(
@@ -492,7 +495,9 @@ def rollback_accepted(
         if custom_attrs is not None:
             attrs.update(custom_attrs)
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     # Vulnerability Events
@@ -538,7 +543,9 @@ def vuln_disclosure(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def vuln_update(
@@ -581,7 +588,9 @@ def vuln_update(
             attrs.update(custom_attrs)
 
         return self.arch.events.create(
-            self._asset["identity"], props=props, attrs=attrs, confirm=True
+            self._asset["identity"],
+            props=props,
+            attrs=attrs,
         )
 
     def _add_attachments(self, attachments: list):