From 35fbb44f6c37373aca0c501b39371c1d05162198 Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@nextcairn.com>
Date: Tue, 1 Sep 2020 14:30:43 +0000
Subject: [PATCH] Update api config prefixes
---
arkindex_worker/worker.py | 4 ++--
tests/conftest.py | 10 ++++++++--
worker-{{cookiecutter.slug}}/.dockerignore | 3 +++
3 files changed, 13 insertions(+), 4 deletions(-)
create mode 100644 worker-{{cookiecutter.slug}}/.dockerignore
diff --git a/arkindex_worker/worker.py b/arkindex_worker/worker.py
index c28c1e90..142fb998 100644
--- a/arkindex_worker/worker.py
+++ b/arkindex_worker/worker.py
@@ -84,9 +84,9 @@ class BaseWorker(object):
"RetrieveWorkerVersion", id=self.worker_version_id
)
logger.info(
- f"Loaded worker {worker_version['worker']['name']} revision {worker_version['revision']} from API"
+ f"Loaded worker {worker_version['worker']['name']} revision {worker_version['revision']['hash'][0:7]} from API"
)
- self.config = worker_version["configuration"]
+ self.config = worker_version["configuration"]["configuration"]
elif self.args.config:
# Load config from YAML file
self.config = yaml.safe_load(self.args.config)
diff --git a/tests/conftest.py b/tests/conftest.py
index e4f8a4d1..672f51c3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -51,8 +51,14 @@ def mock_worker_version_api(responses):
"""Provide a mock API response to get worker configuration"""
payload = {
"id": "12341234-1234-1234-1234-123412341234",
- "configuration": {"someKey": "someValue"},
- "revision": "deadbeef",
+ "configuration": {
+ "docker": {"image": "python:3"},
+ "configuration": {"someKey": "someValue"},
+ },
+ "revision": {
+ "hash": "deadbeef1234",
+ "name": "some git revision",
+ },
"docker_image": "python:3",
"docker_image_name": "python:3",
"state": "created",
diff --git a/worker-{{cookiecutter.slug}}/.dockerignore b/worker-{{cookiecutter.slug}}/.dockerignore
new file mode 100644
index 00000000..8f0c2f7a
--- /dev/null
+++ b/worker-{{cookiecutter.slug}}/.dockerignore
@@ -0,0 +1,3 @@
+.tox
+.git
+models/*
--
GitLab