From 95f4e54c0f73761a727241620a82bbbb32ed33b4 Mon Sep 17 00:00:00 2001
From: Adrian Pino <adrian.pino@i2cat.net>
Date: Wed, 19 Jul 2023 15:29:42 +0000
Subject: [PATCH] Fix linting
---
.gitignore | 1 +
lso/playbook.py | 12 ++++++------
test/routes/__init__.py | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5ed8250..8f592ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ docs/build
docs/source/_static/openapi.json
docs/vale/styles/*
!docs/vale/styles/Vocab/
+venv/
# Ignore files generated by apidoc
docs/source/lso.rst
diff --git a/lso/playbook.py b/lso/playbook.py
index 2827abe..3e933d6 100644
--- a/lso/playbook.py
+++ b/lso/playbook.py
@@ -1,6 +1,6 @@
"""Module that gathers common API responses and data models."""
-import json
import enum
+import json
import logging
import threading
import uuid
@@ -71,7 +71,7 @@ def _run_playbook_proc(job_id: str, playbook_path: str, extra_vars: dict, invent
playbook=playbook_path,
inventory=inventory,
extravars=extra_vars,
- json_mode=True
+ json_mode=True,
)
# Process playbook JSON stdout
@@ -83,8 +83,8 @@ def _run_playbook_proc(job_id: str, playbook_path: str, extra_vars: dict, invent
try:
task_output = json.loads(line)
parsed_output.append(task_output)
- except json.JSONDecodeError as e:
- pass # Skip empty line
+ except json.JSONDecodeError:
+ parsed_output.append({"invalid_json": line})
payload = [
{
@@ -92,9 +92,9 @@ def _run_playbook_proc(job_id: str, playbook_path: str, extra_vars: dict, invent
"status": ansible_playbook_run.status,
"job_id": job_id,
"output": json.dumps(parsed_output, indent=4),
- "return_code": int(ansible_playbook_run.rc)
+ "return_code": int(ansible_playbook_run.rc),
},
- "confirm": "ACCEPTED"
+ "confirm": "ACCEPTED",
}
]
diff --git a/test/routes/__init__.py b/test/routes/__init__.py
index 921a61f..b9b2d1b 100644
--- a/test/routes/__init__.py
+++ b/test/routes/__init__.py
@@ -1,4 +1,4 @@
-from typing import TextIO
+from io import StringIO
TEST_CALLBACK_URL = "https://fqdn.abc.xyz/api/resume"
@@ -8,6 +8,6 @@ def test_ansible_runner_run(**kwargs):
def __init__(self):
self.status = "success"
self.rc = 0
- self.stdout = TextIO()
+ self.stdout = StringIO("some initial text data")
return Runner()
--
GitLab