Merge pull request #6 from CybercentreCanada/update/migrate

Update/migrate [dev]

.vscode/settings.json

@@ -0,0 +1,38 @@
+{
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": true,
+    },
+    "editor.formatOnSave": true,
+    "editor.rulers": [
+        120
+    ],
+    "editor.tabSize": 4,
+    "editor.wordWrap": "wordWrapColumn",
+    "editor.wordWrapColumn": 120,
+    "files.insertFinalNewline": true,
+    "files.trimFinalNewlines": true,
+    "files.trimTrailingWhitespace": true,
+    "isort.args": [
+        "-l",
+        "120",
+        "--profile=black",
+        // "--src=${workspaceFolder}"
+    ],
+    "python.formatting.autopep8Args": [
+        "--max-line-length",
+        "120",
+        "--experimental"
+    ],
+    "python.formatting.provider": "autopep8",
+    "python.formatting.blackArgs": [
+        "--line-length=120"
+    ],
+    "python.linting.enabled": true,
+    "python.linting.flake8Enabled": true,
+    "python.linting.flake8Args": [
+        "--max-line-length=120",
+        //Added the ignore of E203 for now : https://github.com/PyCQA/pycodestyle/issues/373
+        "--ignore=E203,W503"
+    ],
+    "python.linting.pylintEnabled": false,
+}

Dockerfile

@@ -10,7 +10,9 @@ RUN apt-get update && apt-get install -y p7zip-full && rm -rf /var/lib/apt/lists
 # Switch to assemblyline user
 USER assemblyline
 
-RUN pip install --no-cache-dir --user biplist && rm -rf ~/.cache/pip
+# Install python dependencies
+COPY requirements.txt requirements.txt
+RUN pip install --no-cache-dir --user --requirement requirements.txt && rm -rf ~/.cache/pip
 
 # Copy IPArse service code
 WORKDIR /opt/al_service

iparse/iparse.py

@@ -5,12 +5,11 @@
 import unicodedata
 import zipfile
 from collections import defaultdict
-from subprocess import Popen, PIPE
+from subprocess import PIPE, Popen
 
 import biplist
-
 from assemblyline.common.str_utils import safe_str
-from assemblyline_v4_service.common.balbuzard.patterns import PatternMatch
+from assemblyline_service_utilities.common.balbuzard.patterns import PatternMatch
 from assemblyline_v4_service.common.base import ServiceBase
 from assemblyline_v4_service.common.result import Result, ResultSection
 

requirements.txt

@@ -0,0 +1,2 @@
+assemblyline-service-utilities
+biplist