From c5ee8a14d3054bbfced1ba214ab005e041b6e3d1 Mon Sep 17 00:00:00 2001 From: Aaron Peterson Date: Wed, 25 Aug 2021 09:26:56 -0700 Subject: [PATCH] Add resource_id to required attributes (#891) * debug statement and add task_id to proceprocess call * Add more debug lines * remove debugging and add resource_id to required attributes --- turbinia/evidence.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/turbinia/evidence.py b/turbinia/evidence.py index ce1519af8..6b1b9b928 100644 --- a/turbinia/evidence.py +++ b/turbinia/evidence.py @@ -344,7 +344,7 @@ def preprocess(self, tmp_dir=None, required_states=None, task_id=None): raise TurbiniaException( 'Evidence of type {0:s} needs parent_evidence to be set'.format( self.type)) - self.parent_evidence.preprocess(tmp_dir, required_states) + self.parent_evidence.preprocess(tmp_dir, required_states, task_id) try: log.debug('Starting pre-processor for evidence {0:s}'.format(self.name)) if self.resource_tracked: @@ -652,7 +652,7 @@ class GoogleCloudDisk(RawDisk): disk_name: The cloud disk name. """ - REQUIRED_ATTRIBUTES = ['disk_name', 'project', 'zone'] + REQUIRED_ATTRIBUTES = ['disk_name', 'project', 'resource_id', 'zone'] POSSIBLE_STATES = [EvidenceState.ATTACHED, EvidenceState.MOUNTED] def __init__(