Skip to content

Commit

Permalink
Rename workflow_id to template_workflow_id
Browse files Browse the repository at this point in the history
  • Loading branch information
jleaniz committed Jan 2, 2025
1 parent feb2663 commit 2c05236
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions data/recipes/openrelik_ts.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"incident_id": "@incident_id",
"sketch_id": "@sketch_id",
"folder_id": "@folder_id",
"workflow_id": "@workflow_id",
"template_workflow_id": "@template_workflow_id",
"openrelik_api": "@openrelik_api",
"openrelik_ui": "@openrelik_ui",
"openrelik_api_key": "@openrelik_api_key"
Expand All @@ -40,7 +40,7 @@
["--incident_id", "Incident ID (used for Timesketch description).", null],
["--sketch_id", "Timesketch sketch to which the timeline should be added.", null, {"format": "integer"}],
["--folder_id", "OpenRelik Folder ID.", null],
["--workflow_id", "OpenRelik workflow template ID.", null],
["--template_workflow_id", "OpenRelik workflow template ID.", null],
["--openrelik_api", "OpenRelik API server URI.", "http://localhost:8710"],
["--openrelik_ui", "OpenRelik UI URI.", "http://localhost:8711"],
["--openrelik_api_key", "OpenRelik API key", ""],
Expand Down
9 changes: 5 additions & 4 deletions dftimewolf/lib/processors/openrelik.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(
self.openrelik_api: str | None = None
self.openrelik_ui: str | None = None
self.openrelik_api_key: str | None = None
self.workflow_id: int | None = None
self.template_workflow_id: int | None = None
self.folder_id: int | None = None
self.sketch_id: int | None = None
self.incident_id: str | None = None
Expand All @@ -50,7 +50,7 @@ def SetUp(
incident_id: str | None,
sketch_id: int | None,
folder_id: int | None,
workflow_id: int | None,
template_workflow_id: int | None,
openrelik_api: str | None,
openrelik_ui: str | None,
openrelik_api_key: str | None,
Expand All @@ -67,12 +67,13 @@ def SetUp(
)

self.folder_id = folder_id
self.workflow_id = workflow_id
self.template_workflow_id = template_workflow_id
self.incident_id = incident_id
self.sketch_id = sketch_id

def PollWorkflowStatus(self, workflow_id: int) -> Iterator[str]:
"""Polls the status of a workflow until it completes."""

filename = str(workflow_id)
workflow = self.openrelik_workflow_client.get_workflow(
self.folder_id, workflow_id
Expand Down Expand Up @@ -149,7 +150,7 @@ def Process(self, container: containers.File) -> None:
file_ids.append(file_id)

workflow_id = self.openrelik_workflow_client.create_workflow(
folder_id, file_ids, self.workflow_id
folder_id, file_ids, self.template_workflow_id
)
workflow_url = f"{self.openrelik_ui}/folder/{folder_id}"
self.PublishMessage(
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/processors/openrelik.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def testProcess(
self.openrelik_module.openrelik_ui = "http://fake_api:8711"
self.openrelik_module.openrelik_api_key = "fake_key"
self.openrelik_module.folder_id = 123
self.openrelik_module.workflow_id = 1
self.openrelik_module.template_workflow_id = 1
self.openrelik_module.openrelik_workflow_client = workflows.WorkflowsAPI(
api_client.APIClient(
self.openrelik_module.openrelik_api,
Expand Down Expand Up @@ -149,6 +149,7 @@ def testDownloadWorkflowOutput(self, mock_publish, mock_tempfile):

self.assertEqual(local_path, "fake_filepath")



if __name__ == "__main__":
unittest.main()

0 comments on commit 2c05236

Please sign in to comment.