Repository: CybercentreCanada/assemblyline-service-server (language: python)

Issue:
Fix request json



Discussion / hints:

Fix patch:
diff --git a/pipelines/config.yml b/pipelines/config.yml
index 5a981aa..e06a911 100644
--- a/pipelines/config.yml
+++ b/pipelines/config.yml
@@ -5,7 +5,7 @@ core:
     apm_server:
       server_url: http://localhost:8200/
     elasticsearch:
-      hosts: ["localhost:9200"]
+      hosts: ["http://elastic:devpass@localhost:9200"]
     redis:
       host: localhost
   redis:
@@ -17,11 +17,17 @@ core:
       port: 6379
 
 datastore:
-  hosts: ["localhost:9200"]
+  hosts: ["http://elastic:devpass@localhost:9200"]
 
 filestore:
-  cache: ["s3://al_storage_key:Ch@ngeTh!sPa33w0rd@localhost:9000?s3_bucket=al-cache&use_ssl=False"]
-  storage: ["s3://al_storage_key:Ch@ngeTh!sPa33w0rd@localhost:9000?s3_bucket=al-storage&use_ssl=False"]
+  cache:
+    [
+      "s3://al_storage_key:Ch@ngeTh!sPa33w0rd@localhost:9000?s3_bucket=al-cache&use_ssl=False",
+    ]
+  storage:
+    [
+      "s3://al_storage_key:Ch@ngeTh!sPa33w0rd@localhost:9000?s3_bucket=al-storage&use_ssl=False",
+    ]
 
 logging:
   log_level: DISABLED
@@ -30,4 +36,4 @@ logging:
   log_to_syslog: false
 
 ui:
-  enforce_quota: false
\ No newline at end of file
+  enforce_quota: false


Test patch:
diff --git a/pipelines/azure-test.yaml b/pipelines/azure-test.yaml
index ea91feb..9ccf4f3 100644
--- a/pipelines/azure-test.yaml
+++ b/pipelines/azure-test.yaml
@@ -13,10 +13,11 @@ resources:
       ports:
         - 6379:6379
     - container: elasticsearch
-      image: cccs/elasticsearch:7.16.1
+      image: cccs/elasticsearch:7.17.4
       env:
         ES_JAVA_OPTS: "-Xms256m -Xmx512m"
         DISCOVERY_TYPE: "single-node"
+        ELASTIC_PASSWORD: "devpass"
       ports:
         - 9200:9200
     - container: minio
diff --git a/test/config/config.yml b/test/config/config.yml
index 4f124de..6d45a68 100644
--- a/test/config/config.yml
+++ b/test/config/config.yml
@@ -5,7 +5,7 @@ core:
     apm_server:
       server_url: http://apm_server:8200/
     elasticsearch:
-      hosts: [elasticsearch]
+      hosts: [http://elastic:devpass@elasticsearch:9200]
     redis:
       host: redis
   redis:
@@ -16,13 +16,19 @@ core:
       port: 6379
 
 datastore:
-  hosts: [elasticsearch]
+  hosts: [http://elastic:devpass@elasticsearch:9200]
 
 filestore:
-  cache: ["s3://al_storage_key:Ch@ngeTh!sPa33w0rd@minio:9000?s3_bucket=al-cache&use_ssl=False"]
-  storage: ["s3://al_storage_key:Ch@ngeTh!sPa33w0rd@minio:9000?s3_bucket=al-storage&use_ssl=False"]
+  cache:
+    [
+      "s3://al_storage_key:Ch@ngeTh!sPa33w0rd@minio:9000?s3_bucket=al-cache&use_ssl=False",
+    ]
+  storage:
+    [
+      "s3://al_storage_key:Ch@ngeTh!sPa33w0rd@minio:9000?s3_bucket=al-storage&use_ssl=False",
+    ]
 
 logging:
   log_to_console: true
   log_to_file: false
-  log_to_syslog: false
\ No newline at end of file
+  log_to_syslog: false
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
index dcb68b4..c1be8dd 100644
--- a/test/docker-compose.yml
+++ b/test/docker-compose.yml
@@ -2,11 +2,13 @@ version: "2.4"
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
     environment:
+      - xpack.security.enabled=true
       - discovery.type=single-node
       - logger.level=WARN
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - ELASTIC_PASSWORD=devpass
     ports:
       - "9200:9200"
     healthcheck: