Move redis, sshd and tomcat tasks into analysis folder

turbinia/jobs/redis.py

@@ -17,7 +17,7 @@
 from __future__ import unicode_literals
 
 from turbinia.workers import artifact
-from turbinia.workers import redis
+from turbinia.workers.analysis import redis
 from turbinia.evidence import ContainerdContainer
 from turbinia.evidence import Directory
 from turbinia.evidence import DockerContainer

turbinia/jobs/sshd.py

@@ -17,7 +17,7 @@
 from __future__ import unicode_literals
 
 from turbinia.workers import artifact
-from turbinia.workers import sshd
+from turbinia.workers.analysis import sshd
 from turbinia.evidence import ContainerdContainer
 from turbinia.evidence import Directory
 from turbinia.evidence import DockerContainer

turbinia/jobs/tomcat.py

@@ -15,7 +15,7 @@
 """Job to execute Apache Tomcat analysis task."""
 from __future__ import unicode_literals
 from turbinia.workers import artifact
-from turbinia.workers import tomcat
+from turbinia.workers.analysis import tomcat
 from turbinia.evidence import ContainerdContainer
 from turbinia.evidence import Directory
 from turbinia.evidence import DockerContainer

turbinia/task_utils.py

@@ -103,12 +103,15 @@ def get_task(self, task_name):
     from turbinia.workers.analysis.jenkins import JenkinsAnalysisTask
     from turbinia.workers.analysis.jupyter import JupyterAnalysisTask
     from turbinia.workers.analysis.linux_acct import LinuxAccountAnalysisTask
-    from turbinia.workers.analysis.yara import YaraAnalysisTask
     from turbinia.workers.analysis.postgresql_acct import PostgresAccountAnalysisTask
+    from turbinia.workers.analysis.redis import RedisAnalysisTask
     from turbinia.workers.analysis.ssh_analyzer import LinuxSSHAnalysisTask
+    from turbinia.workers.analysis.sshd import SSHDAnalysisTask
+    from turbinia.workers.analysis.tomcat import TomcatAnalysisTask
     from turbinia.workers.analysis.windows_acct import WindowsAccountAnalysisTask
     from turbinia.workers.analysis.wordpress_access import WordpressAccessLogAnalysisTask
     from turbinia.workers.analysis.wordpress_creds import WordpressCredsAnalysisTask
+    from turbinia.workers.analysis.yara import YaraAnalysisTask
     from turbinia.workers.artifact import FileArtifactExtractionTask
     from turbinia.workers.binary_extractor import BinaryExtractorTask
     from turbinia.workers.bulk_extractor import BulkExtractorTask
@@ -122,14 +125,11 @@ def get_task(self, task_name):
     from turbinia.workers.hindsight import HindsightTask
     from turbinia.workers.partitions import PartitionEnumerationTask
     from turbinia.workers.photorec import PhotorecTask
-    from turbinia.workers.plaso import PlasoParserTask
     from turbinia.workers.plaso import PlasoHasherTask
+    from turbinia.workers.plaso import PlasoParserTask
     from turbinia.workers.psort import PsortTask
-    from turbinia.workers.redis import RedisAnalysisTask
-    from turbinia.workers.sshd import SSHDAnalysisTask
     from turbinia.workers.strings import StringsAsciiTask
     from turbinia.workers.strings import StringsUnicodeTask
-    from turbinia.workers.tomcat import TomcatAnalysisTask
     from turbinia.workers.volatility import VolatilityTask
     from turbinia.workers.worker_stat import StatTask
 

turbinia/workers/redis_test.py → turbinia/workers/analysis/redis_test.py

@@ -19,7 +19,7 @@
 import unittest
 
 from turbinia import config
-from turbinia.workers import redis
+from turbinia.workers.analysis import redis
 
 
 class RedisAnalysisTaskTest(unittest.TestCase):

turbinia/workers/sshd_test.py → turbinia/workers/analysis/sshd_test.py

@@ -19,7 +19,7 @@
 import unittest
 
 from turbinia import config
-from turbinia.workers import sshd
+from turbinia.workers.analysis import sshd
 
 
 class SSHDAnalysisTaskTest(unittest.TestCase):

turbinia/workers/tomcat_test.py → turbinia/workers/analysis/tomcat_test.py

@@ -19,7 +19,7 @@
 import unittest
 
 from turbinia import config
-from turbinia.workers import tomcat
+from turbinia.workers.analysis import tomcat
 
 
 class TomcatAnalysisTaskTest(unittest.TestCase):