diff --git a/archivist_samples/c2pa/c2pa.py b/archivist_samples/c2pa/c2pa.py index b37b254..acb4ed1 100644 --- 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 index d876336..d6e4b4b 100644 --- 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 index ed7c3fa..478fd1c 100644 --- 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 index 67706b1..1373500 100644 --- 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 index ecba84d..40dd111 100644 --- 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 index a151ec6..98a1492 100644 --- 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 index 97bfb85..7870202 100644 --- 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): diff --git a/archivist_samples/software_bill_of_materials/software_package.py b/archivist_samples/software_bill_of_materials/software_package.py index d3b5e1d..058f5ee 100644 --- a/archivist_samples/software_bill_of_materials/software_package.py +++ b/archivist_samples/software_bill_of_materials/software_package.py @@ -41,7 +41,7 @@ def attachment_create(sboms, 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 SoftwarePackage: @@ -170,7 +170,6 @@ def release( props=props, attrs=attrs, asset_attrs=asset_attrs, - confirm=True, ) def release_plan( @@ -204,7 +203,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( @@ -239,7 +240,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 @@ -275,7 +278,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( @@ -311,7 +316,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 @@ -350,7 +357,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( @@ -387,7 +396,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 @@ -422,5 +433,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/synsation/synsation_corporation.py b/archivist_samples/synsation/synsation_corporation.py index 0f86dc0..4eecc15 100755 --- a/archivist_samples/synsation/synsation_corporation.py +++ b/archivist_samples/synsation/synsation_corporation.py @@ -32,7 +32,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription): machines_creator = make_assets_create( - attachment_creator=attachment_create, confirm=False + attachment_creator=attachment_create, ) diff --git a/archivist_samples/synsation/synsation_manufacturing.py b/archivist_samples/synsation/synsation_manufacturing.py index e43cb32..eff0282 100755 --- a/archivist_samples/synsation/synsation_manufacturing.py +++ b/archivist_samples/synsation/synsation_manufacturing.py @@ -26,7 +26,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription): return result -crates_creator = make_assets_create(attachment_creator=attachment_create, confirm=True) +crates_creator = make_assets_create(attachment_creator=attachment_create) def initialise_asset_types(): diff --git a/archivist_samples/testing/asset.py b/archivist_samples/testing/asset.py index 38e2c30..8819b60 100644 --- a/archivist_samples/testing/asset.py +++ b/archivist_samples/testing/asset.py @@ -47,7 +47,6 @@ def charge(self, desc, evidence): "arc_description": desc, "arc_evidence": evidence, }, - confirm=True, ) def certify_patch(self, desc, evidence, attachments, extra_attrs=None): @@ -72,7 +71,6 @@ def certify_patch(self, desc, evidence, attachments, extra_attrs=None): }, }, attrs, - confirm=True, ) def move(self, desc, lat, lng): @@ -91,7 +89,6 @@ def move(self, desc, lat, lng): "arc_gis_lat": lat, "arc_gis_lng": lng, }, - confirm=True, ) def patch_vulnerability(self, desc, evidence): @@ -109,7 +106,6 @@ def patch_vulnerability(self, desc, evidence): "arc_description": desc, "arc_evidence": evidence, }, - confirm=True, ) def report_vulnerability(self, desc, cve_id, cve_corval): @@ -128,7 +124,6 @@ def report_vulnerability(self, desc, cve_id, cve_corval): "arc_cve_id": cve_id, "arc_correlation_value": cve_corval, }, - confirm=True, ) def service_required(self, desc, corval): @@ -146,7 +141,6 @@ def service_required(self, desc, corval): "arc_description": desc, "arc_correlation_value": corval, }, - confirm=True, ) def service(self, desc, corval): @@ -164,7 +158,6 @@ def service(self, desc, corval): "arc_description": desc, "arc_correlation_value": corval, }, - confirm=True, ) def update_firmware(self, desc, fw_version, corval): @@ -184,5 +177,4 @@ def update_firmware(self, desc, fw_version, corval): "arc_correlation_value": corval, }, asset_attrs={"arc_firmware_version": fw_version}, - confirm=True, ) diff --git a/archivist_samples/testing/assets.py b/archivist_samples/testing/assets.py index 25e71dc..62121e6 100755 --- a/archivist_samples/testing/assets.py +++ b/archivist_samples/testing/assets.py @@ -20,7 +20,7 @@ class AttachmentDescription: attribute_name: str -def assets_create_if_not_exists(arch, attrs, *, confirm=False): +def assets_create_if_not_exists(arch, attrs): asset = None try: asset = arch.assets.read_by_signature( @@ -37,14 +37,13 @@ def assets_create_if_not_exists(arch, attrs, *, confirm=False): else: return asset - return arch.assets.create(attrs=attrs, confirm=confirm) + return arch.assets.create(attrs=attrs) def make_assets_create( attachment_creator: Optional[ Callable[[type_helper.Archivist, AttachmentDescription], Dict] ] = None, - confirm=False, public=False, ): """ @@ -104,9 +103,7 @@ def assets_create( asset_attrs[selector_key] = selector_value LOGGER.debug("asset_attrs %s", asset_attrs) - asset = arch.assets.create( - attrs=asset_attrs, confirm=confirm, props={"public": public} - ) + asset = arch.assets.create(attrs=asset_attrs, props={"public": public}) else: LOGGER.info("%s already existed", display_name) diff --git a/archivist_samples/wipp/wipp.py b/archivist_samples/wipp/wipp.py index 79526a8..58c8f59 100644 --- a/archivist_samples/wipp/wipp.py +++ b/archivist_samples/wipp/wipp.py @@ -59,7 +59,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription): return result -wipp_creator = make_assets_create(attachment_creator=attachment_create, confirm=True) +wipp_creator = make_assets_create(attachment_creator=attachment_create) class Wipp: @@ -178,7 +178,6 @@ def characterize( props=props, attrs=attrs, asset_attrs=asset_attrs, - confirm=True, ) # Tomography Events @@ -221,7 +220,6 @@ def tomography( props=props, attrs=attrs, asset_attrs=asset_attrs, - confirm=True, ) # Loading Events @@ -261,7 +259,6 @@ def loading( props=props, attrs=attrs, asset_attrs=asset_attrs, - confirm=True, ) # Pre-Shipping Events @@ -293,7 +290,6 @@ def preshipping( self.asset["identity"], props=props, attrs=attrs, - confirm=True, ) # Departure Events @@ -325,7 +321,6 @@ def departure( self.asset["identity"], props=props, attrs=attrs, - confirm=True, ) # Waypoint Events @@ -359,7 +354,6 @@ def waypoint( self.asset["identity"], props=props, attrs=attrs, - confirm=True, ) # Arrival Events @@ -391,7 +385,6 @@ def arrival( self.asset["identity"], props=props, attrs=attrs, - confirm=True, ) # Unloading Events @@ -430,7 +423,6 @@ def unloading( props=props, attrs=attrs, asset_attrs=asset_attrs, - confirm=True, ) # Emplacement Events @@ -471,5 +463,4 @@ def emplacement( props=props, attrs=attrs, asset_attrs=asset_attrs, - confirm=True, ) diff --git a/requirements.txt b/requirements.txt index ab838b6..80a739e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ pyyaml~=6.0.1 # the following lines. Also do similar in the Dockerfile. # That way one can test an unreleased version of github datatrails-samples. # NB dont forget to uncomment before merging !! -datatrails-archivist==0.31.3 +datatrails-archivist==0.32.0