From 354b076956442cd51b57e1db4cd9a9ddc959d619 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 30 May 2018 13:34:14 -0400
Subject: [PATCH] clean up Tower inventory error handling

related: https://github.com/ansible/tower/pull/1697
related: https://github.com/ansible/tower-qa/pull/1746
---
 awx/plugins/inventory/tower.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py
index ff14f6b731..f6aee944ff 100755
--- a/awx/plugins/inventory/tower.py
+++ b/awx/plugins/inventory/tower.py
@@ -90,7 +90,6 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_
         tower_host = "https://{}".format(tower_host)
     inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1&towervars=1&all=1".format(inventory.replace('/', '')))
     config_url = urljoin(tower_host, "/api/v2/config/")
-    reason = None
     try:
         if license_type != "open":
             config_response = requests.get(config_url,
@@ -102,22 +101,22 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_
                     raise RuntimeError("Tower server licenses must match: source: {} local: {}".format(source_type,
                                                                                                        license_type))
             else:
-                raise RuntimeError("Failed to validate the license of the remote Tower: {}".format(config_response.data))
+                raise RuntimeError("Failed to validate the license of the remote Tower: {}".format(config_response))
 
         response = requests.get(inventory_url,
                                 auth=HTTPBasicAuth(tower_user, tower_pass),
                                 verify=not ignore_ssl)
+        if not response.ok:
+            # If the GET /api/v2/inventories/N/script is not HTTP 200, print the error code
+            raise RuntimeError("Connection to remote host failed: {}".format(response))
         try:
-            json_response = response.json()
+            # Attempt to parse JSON
+            return response.json()
         except (ValueError, TypeError) as e:
-            reason = "Failed to parse json from host: {}".format(e)
-        if response.ok:
-            return json_response
-        if not reason:
-            reason = json_response.get('detail', 'Retrieving Tower Inventory Failed')
+            # If the JSON parse fails, print the ValueError
+            raise RuntimeError("Failed to parse json from host: {}".format(e)
     except requests.ConnectionError as e:
-        reason = "Connection to remote host failed: {}".format(e)
-    raise RuntimeError(reason)
+        raise RuntimeError("Connection to remote host failed: {}".format(e))
 
 
 def main():