Skip to content

Commit add5f77

Browse files
eccleseccles
authored
Confirmation is optional (#95)
AB#9779
1 parent a91fa96 commit add5f77

14 files changed

Lines changed: 76 additions & 94 deletions

File tree

‎archivist_samples/c2pa/c2pa.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription):
6161

6262

6363
document_creator = make_assets_create(
64-
attachment_creator=attachment_create, confirm=True
64+
attachment_creator=attachment_create,
6565
)
6666

6767

@@ -170,7 +170,6 @@ def publish(
170170
props=props,
171171
attrs=attrs,
172172
asset_attrs=asset_attrs,
173-
confirm=True,
174173
)
175174

176175
# info_report
@@ -189,7 +188,6 @@ def info_report(self, document: dict):
189188
self.asset["identity"],
190189
props=props,
191190
attrs=attrs,
192-
confirm=True,
193191
)
194192

195193
# ingredients
@@ -214,7 +212,6 @@ def ingredients(self, document: dict):
214212
self.asset["identity"],
215213
props=props,
216214
attrs=attrs,
217-
confirm=True,
218215
)
219216

220217
# external_manifest
@@ -243,7 +240,6 @@ def external_manifest(self, definition: dict, signed_image: dict):
243240
self.asset["identity"],
244241
props=props,
245242
attrs=attrs,
246-
confirm=True,
247243
)
248244

249245
# details_report
@@ -272,7 +268,6 @@ def details_report(self, detailed: dict, manifest_store: dict):
272268
self.asset["identity"],
273269
props=props,
274270
attrs=attrs,
275-
confirm=True,
276271
)
277272

278273
# parent
@@ -302,7 +297,6 @@ def parent(self, parent_definition: dict, signed_image: dict):
302297
self.asset["identity"],
303298
props=props,
304299
attrs=attrs,
305-
confirm=True,
306300
)
307301

308302
# edit_manifest
@@ -327,5 +321,4 @@ def edit_manifest(
327321
self.asset["identity"],
328322
props=props,
329323
attrs=attrs,
330-
confirm=True,
331324
)

‎archivist_samples/document/document.py‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription):
6161

6262

6363
document_creator = make_assets_create(
64-
attachment_creator=attachment_create, confirm=True
64+
attachment_creator=attachment_create,
6565
)
6666

6767

@@ -165,28 +165,4 @@ def publish(
165165
props=props,
166166
attrs=attrs,
167167
asset_attrs=asset_attrs,
168-
confirm=True,
169-
)
170-
171-
# Withdraw version of the document
172-
def withdraw(self, document: dict, version: str, doc_hash: str, name: str):
173-
props = {
174-
"operation": "Record",
175-
"behaviour": "RecordEvidence",
176-
}
177-
attrs = {"arc_display_type": "Withdraw", "document_status": "Withdrawn"}
178-
179-
asset_attrs = {
180-
"arc_display_name": name,
181-
"document_document": document,
182-
"document_hash_value": doc_hash,
183-
"document_version": version,
184-
}
185-
186-
return self.arch.events.create(
187-
self.asset["identity"],
188-
props=props,
189-
attrs=attrs,
190-
asset_attrs=asset_attrs,
191-
confirm=True,
192168
)

‎archivist_samples/door_entry/run.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def attachment_create(doors, attachment_description: AttachmentDescription):
4949
return result
5050

5151

52-
doors_creator = make_assets_create(attachment_creator=attachment_create, confirm=False)
52+
doors_creator = make_assets_create(attachment_creator=attachment_create)
5353

5454

5555
# Create actual door assets
@@ -269,7 +269,7 @@ def create_doors(doors):
269269
############
270270

271271

272-
cards_creator = make_assets_create(confirm=False)
272+
cards_creator = make_assets_create()
273273

274274

275275
def create_cards(cards):
@@ -531,7 +531,6 @@ def open_door(doors, doorid, cards, cardid):
531531
"arc_blob_hash_value": image["hash"]["value"],
532532
},
533533
},
534-
confirm=True,
535534
)
536535

537536
unused_card_record_evidence = cards.events.create(
@@ -568,7 +567,6 @@ def open_door(doors, doorid, cards, cardid):
568567
"wavestone_evt_type": "door_open",
569568
"arc_primary_image": [door_image],
570569
},
571-
confirm=True,
572570
)
573571
LOGGER.info("Opening door '%s' with card '%s': FINISHED", doorid, cardid)
574572

‎archivist_samples/sample_scripts/c2pa/c2pa_verify.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def create_asset(
126126
}
127127
props = {"public": True}
128128

129-
return arch.assets.create(props=props, attrs=attrs, confirm=True)
129+
return arch.assets.create(props=props, attrs=attrs)
130130

131131

132132
# Uploads primary image and related attachments to DataTrails

‎archivist_samples/sbom_document/software_package.py‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def attachment_create(arch, attachment_description: AttachmentDescription):
4141
return result
4242

4343

44-
sboms_creator = make_assets_create(attachment_creator=attachment_create, confirm=True)
44+
sboms_creator = make_assets_create(attachment_creator=attachment_create)
4545

4646

4747
class SoftwarePackageDocument:
@@ -187,7 +187,6 @@ def publish(
187187
props=props,
188188
attrs=attrs,
189189
asset_attrs=asset_attrs,
190-
confirm=True,
191190
)
192191

193192
def release_plan(
@@ -220,7 +219,9 @@ def release_plan(
220219
attrs.update(custom_attrs)
221220

222221
return self.arch.events.create(
223-
self._asset["identity"], props=props, attrs=attrs, confirm=True
222+
self._asset["identity"],
223+
props=props,
224+
attrs=attrs,
224225
)
225226

226227
def release_accepted(
@@ -253,7 +254,9 @@ def release_accepted(
253254
attrs.update(custom_attrs)
254255

255256
return self.arch.events.create(
256-
self._asset["identity"], props=props, attrs=attrs, confirm=True
257+
self._asset["identity"],
258+
props=props,
259+
attrs=attrs,
257260
)
258261

259262
# Patch Events
@@ -289,7 +292,9 @@ def patch(
289292
attrs.update(custom_attrs)
290293

291294
return self.arch.events.create(
292-
self._asset["identity"], props=props, attrs=attrs, confirm=True
295+
self._asset["identity"],
296+
props=props,
297+
attrs=attrs,
293298
)
294299

295300
def private_patch(
@@ -325,7 +330,9 @@ def private_patch(
325330
attrs.update(custom_attrs)
326331

327332
return self.arch.events.create(
328-
self._asset["identity"], props=props, attrs=attrs, confirm=True
333+
self._asset["identity"],
334+
props=props,
335+
attrs=attrs,
329336
)
330337

331338
# Vulnerability Events
@@ -364,7 +371,9 @@ def vuln_disclosure(
364371
attrs.update(custom_attrs)
365372

366373
return self.arch.events.create(
367-
self._asset["identity"], props=props, attrs=attrs, confirm=True
374+
self._asset["identity"],
375+
props=props,
376+
attrs=attrs,
368377
)
369378

370379
def vuln_update(
@@ -401,7 +410,9 @@ def vuln_update(
401410
attrs.update(custom_attrs)
402411

403412
return self.arch.events.create(
404-
self._asset["identity"], props=props, attrs=attrs, confirm=True
413+
self._asset["identity"],
414+
props=props,
415+
attrs=attrs,
405416
)
406417

407418
# EOL/Deprecation
@@ -436,5 +447,7 @@ def deprecation(
436447
attrs.update(custom_attrs)
437448

438449
return self.arch.events.create(
439-
self._asset["identity"], props=props, attrs=attrs, confirm=True
450+
self._asset["identity"],
451+
props=props,
452+
attrs=attrs,
440453
)

‎archivist_samples/signed_records/main.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def generate_crypto_asset(archivist, asset_name):
152152
"arc_display_type": "Crypto endpoint",
153153
"arc_evidence_signing_pubkey": pubkey_pem.decode("utf-8"),
154154
}
155-
newasset = archivist.assets.create(attrs=attrs, confirm=True)
155+
newasset = archivist.assets.create(attrs=attrs)
156156
LOGGER.debug(newasset)
157157
if not newasset:
158158
LOGGER.error("Failed to register new asset with Archivist")
@@ -243,7 +243,7 @@ def submit_signed_evidence(archivist, asset_name, message, corrupt_sig):
243243
# should cover the complete 'arc_evidence' field (and no more)
244244
"arc_evidence_signature": signature,
245245
}
246-
archivist.events.create(a_id, props, attrs, confirm=True)
246+
archivist.events.create(a_id, props, attrs)
247247

248248

249249
def print_history(archivist, asset_name):

‎archivist_samples/software_bill_of_materials/software_deployment.py‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ def installation(
130130
props=props,
131131
attrs=attrs,
132132
asset_attrs=asset_attrs,
133-
confirm=True,
134133
)
135134

136135
def decommission(
@@ -249,7 +248,6 @@ def upgrade(
249248
props=props,
250249
attrs=attrs,
251250
asset_attrs=asset_attrs,
252-
confirm=True,
253251
)
254252

255253
def upgrade_plan(
@@ -294,7 +292,9 @@ def upgrade_plan(
294292
if custom_attrs is not None:
295293
attrs.update(custom_attrs)
296294
return self.arch.events.create(
297-
self._asset["identity"], props=props, attrs=attrs, confirm=True
295+
self._asset["identity"],
296+
props=props,
297+
attrs=attrs,
298298
)
299299

300300
def upgrade_accepted(
@@ -339,7 +339,9 @@ def upgrade_accepted(
339339
if custom_attrs is not None:
340340
attrs.update(custom_attrs)
341341
return self.arch.events.create(
342-
self._asset["identity"], props=props, attrs=attrs, confirm=True
342+
self._asset["identity"],
343+
props=props,
344+
attrs=attrs,
343345
)
344346

345347
# Rollback Events
@@ -402,7 +404,6 @@ def rollback(
402404
props=props,
403405
attrs=attrs,
404406
asset_attrs=asset_attrs,
405-
confirm=True,
406407
)
407408

408409
def rollback_plan(
@@ -447,7 +448,9 @@ def rollback_plan(
447448
if custom_attrs is not None:
448449
attrs.update(custom_attrs)
449450
return self.arch.events.create(
450-
self._asset["identity"], props=props, attrs=attrs, confirm=True
451+
self._asset["identity"],
452+
props=props,
453+
attrs=attrs,
451454
)
452455

453456
def rollback_accepted(
@@ -492,7 +495,9 @@ def rollback_accepted(
492495
if custom_attrs is not None:
493496
attrs.update(custom_attrs)
494497
return self.arch.events.create(
495-
self._asset["identity"], props=props, attrs=attrs, confirm=True
498+
self._asset["identity"],
499+
props=props,
500+
attrs=attrs,
496501
)
497502

498503
# Vulnerability Events
@@ -538,7 +543,9 @@ def vuln_disclosure(
538543
attrs.update(custom_attrs)
539544

540545
return self.arch.events.create(
541-
self._asset["identity"], props=props, attrs=attrs, confirm=True
546+
self._asset["identity"],
547+
props=props,
548+
attrs=attrs,
542549
)
543550

544551
def vuln_update(
@@ -581,7 +588,9 @@ def vuln_update(
581588
attrs.update(custom_attrs)
582589

583590
return self.arch.events.create(
584-
self._asset["identity"], props=props, attrs=attrs, confirm=True
591+
self._asset["identity"],
592+
props=props,
593+
attrs=attrs,
585594
)
586595

587596
def _add_attachments(self, attachments: list):

0 commit comments

Comments
 (0)