2017-10-13 15:57:09 +02:00
|
|
|
From 49a4e807fb1cb844cec7b7c11b37f6c276f899e4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Bo Maryniuk <bo@suse.de>
|
|
|
|
|
Date: Mon, 9 Oct 2017 17:57:48 +0200
|
2017-11-10 08:17:55 +01:00
|
|
|
Subject: [PATCH 5/6] Bugfix: always return a string "list" on unknown job
|
2017-10-13 15:57:09 +02:00
|
|
|
target type.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
salt/returners/couchbase_return.py | 2 +-
|
|
|
|
|
salt/returners/postgres_local_cache.py | 2 +-
|
|
|
|
|
salt/runners/jobs.py | 2 +-
|
|
|
|
|
salt/utils/jid.py | 2 +-
|
|
|
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/salt/returners/couchbase_return.py b/salt/returners/couchbase_return.py
|
|
|
|
|
index 24c3a9105a..f5adecc2e7 100644
|
|
|
|
|
--- a/salt/returners/couchbase_return.py
|
|
|
|
|
+++ b/salt/returners/couchbase_return.py
|
|
|
|
|
@@ -309,7 +309,7 @@ def _format_job_instance(job):
|
|
|
|
|
'Arguments': list(job.get('arg', [])),
|
|
|
|
|
# unlikely but safeguard from invalid returns
|
|
|
|
|
'Target': job.get('tgt', 'unknown-target'),
|
|
|
|
|
- 'Target-type': job.get('tgt_type', []),
|
|
|
|
|
+ 'Target-type': job.get('tgt_type', 'list'),
|
|
|
|
|
'User': job.get('user', 'root')}
|
|
|
|
|
|
|
|
|
|
if 'metadata' in job:
|
|
|
|
|
diff --git a/salt/returners/postgres_local_cache.py b/salt/returners/postgres_local_cache.py
|
|
|
|
|
index 422f8c77c7..28dc2f565c 100644
|
|
|
|
|
--- a/salt/returners/postgres_local_cache.py
|
|
|
|
|
+++ b/salt/returners/postgres_local_cache.py
|
|
|
|
|
@@ -180,7 +180,7 @@ def _format_job_instance(job):
|
|
|
|
|
'Arguments': json.loads(job.get('arg', '[]')),
|
|
|
|
|
# unlikely but safeguard from invalid returns
|
|
|
|
|
'Target': job.get('tgt', 'unknown-target'),
|
|
|
|
|
- 'Target-type': job.get('tgt_type', []),
|
|
|
|
|
+ 'Target-type': job.get('tgt_type', 'list'),
|
|
|
|
|
'User': job.get('user', 'root')}
|
|
|
|
|
# TODO: Add Metadata support when it is merged from develop
|
|
|
|
|
return ret
|
|
|
|
|
diff --git a/salt/runners/jobs.py b/salt/runners/jobs.py
|
|
|
|
|
index 82abd56eae..fae7942e38 100644
|
|
|
|
|
--- a/salt/runners/jobs.py
|
|
|
|
|
+++ b/salt/runners/jobs.py
|
|
|
|
|
@@ -542,7 +542,7 @@ def _format_job_instance(job):
|
|
|
|
|
'Arguments': list(job.get('arg', [])),
|
|
|
|
|
# unlikely but safeguard from invalid returns
|
|
|
|
|
'Target': job.get('tgt', 'unknown-target'),
|
|
|
|
|
- 'Target-type': job.get('tgt_type', []),
|
|
|
|
|
+ 'Target-type': job.get('tgt_type', 'list'),
|
|
|
|
|
'User': job.get('user', 'root')}
|
|
|
|
|
|
|
|
|
|
if 'metadata' in job:
|
|
|
|
|
diff --git a/salt/utils/jid.py b/salt/utils/jid.py
|
|
|
|
|
index 3f4ef296a2..4dbf0d2c6f 100644
|
|
|
|
|
--- a/salt/utils/jid.py
|
|
|
|
|
+++ b/salt/utils/jid.py
|
|
|
|
|
@@ -65,7 +65,7 @@ def format_job_instance(job):
|
|
|
|
|
'Arguments': list(job.get('arg', [])),
|
|
|
|
|
# unlikely but safeguard from invalid returns
|
|
|
|
|
'Target': job.get('tgt', 'unknown-target'),
|
|
|
|
|
- 'Target-type': job.get('tgt_type', []),
|
|
|
|
|
+ 'Target-type': job.get('tgt_type', 'list'),
|
|
|
|
|
'User': job.get('user', 'root')}
|
|
|
|
|
|
|
|
|
|
if 'metadata' in job:
|
|
|
|
|
--
|
|
|
|
|
2.14.2
|
|
|
|
|
|
