Merge pull request #1 from cccs-rs/netrep

Take on updater logic from NetRep

.vscode/launch.json

@@ -0,0 +1,35 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "RunServiceOnce",
+            "type": "python",
+            "request": "launch",
+            "module": "assemblyline_v4_service.dev.run_service_once",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "-d",
+                "badlist.badlist.Badlist",
+                "/path/to/sample"
+            ],
+            "justMyCode": false,
+        },
+        {
+            "name": "RunUpdater",
+            "type": "python",
+            "request": "launch",
+            "module": "badlist.update_server",
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "UPDATER_DIR": "${workspaceFolder}/updates",
+                "SERVICE_PATH": "badlist.badlist.Badlist",
+                "AL_SERVICE_NAME": "Badlist",
+                "UI_SERVER": "https://nginx/"
+            },
+            "justMyCode": false,
+        },
+    ]
+}

.vscode/settings.json

@@ -1,38 +1,36 @@
 {
     "editor.codeActionsOnSave": {
-        "source.organizeImports": true,
+        "source.organizeImports": true
     },
     "editor.formatOnSave": true,
     "editor.rulers": [
         120
     ],
     "editor.tabSize": 4,
     "editor.wordWrap": "wordWrapColumn",
-    "editor.wordWrapColumn": 120,
+    "editor.wordWrapColumn": 180,
     "files.insertFinalNewline": true,
     "files.trimFinalNewlines": true,
     "files.trimTrailingWhitespace": true,
     "isort.args": [
         "-l",
         "120",
-        "--profile=black",
+        "--profile=black"
         // "--src=${workspaceFolder}"
     ],
-    "python.formatting.autopep8Args": [
-        "--max-line-length",
-        "120",
-        "--experimental"
-    ],
-    "python.formatting.provider": "autopep8",
-    "python.formatting.blackArgs": [
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
+    "black-formatter.args": [
         "--line-length=120"
     ],
-    "python.linting.enabled": true,
-    "python.linting.flake8Enabled": true,
-    "python.linting.flake8Args": [
+    "flake8.args": [
         "--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,
+    "autopep8.args": [
+        "--max-line-length=120",
+    ],
+    "python.testing.pytestEnabled": true,
 }

Dockerfile

@@ -1,7 +1,7 @@
 ARG branch=latest
 FROM cccs/assemblyline-v4-service-base:$branch
 
-ENV SERVICE_PATH badlist.Badlist
+ENV SERVICE_PATH badlist.badlist.Badlist
 
 # Copy Badlist service code
 WORKDIR /opt/al_service