From 19b7c91486c6a401f0fcb82f1c755d94dbc72dca Mon Sep 17 00:00:00 2001
From: Jeff Bradberry <jeff.bradberry@gmail.com>
Date: Thu, 28 May 2020 15:19:34 -0400
Subject: [PATCH] Return the changed status of imports

---
 awxkit/awxkit/api/pages/api.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py
index 7615113f83..81aef61902 100644
--- a/awxkit/awxkit/api/pages/api.py
+++ b/awxkit/awxkit/api/pages/api.py
@@ -189,6 +189,9 @@ class ApiV2(base.Base):
     def _import_list(self, endpoint, assets):
         log.debug("_import_list -- endpoint: %s, assets: %s", endpoint.endpoint, repr(assets))
         post_fields = utils.get_post_fields(endpoint, self._cache)
+
+        changed = False
+
         for asset in assets:
             post_data = {}
             for field, value in asset.items():
@@ -207,6 +210,7 @@ class ApiV2(base.Base):
                         # We should only impose a default password if the resource doesn't exist.
                         post_data.setdefault('password', 'abc123')
                     _page = endpoint.post(post_data)
+                    changed = True
                     if asset['natural_key']['type'] == 'project':
                         # When creating a project, we need to wait for its
                         # first project update to finish so that associated
@@ -214,6 +218,7 @@ class ApiV2(base.Base):
                         _page.wait_until_completed()
                 else:
                     _page = _page.put(post_data)
+                    changed = True
             except (exc.Common, AssertionError) as e:
                 log.error("Object import failed: %s.", e)
                 log.debug("post_data: %r", post_data)
@@ -230,6 +235,8 @@ class ApiV2(base.Base):
                 else:
                     self._related.put((_page, name, S))
 
+        return changed
+
     def _assign_roles(self):
         while True:
             try:
@@ -294,15 +301,20 @@ class ApiV2(base.Base):
         self._related = queue.Queue()
         self._roles = queue.Queue()
 
+        changed = False
+
         for resource in self._dependent_resources(data):
             endpoint = getattr(self, resource)
             # Load up existing objects, so that we can try to update or link to them
             self._cache.get_page(endpoint)
-            self._import_list(endpoint, data.get(resource) or [])
+            imported = self._import_list(endpoint, data.get(resource) or [])
+            changed = changed or imported
             # FIXME: should we delete existing unpatched assets?
 
         self._assign_related()
         self._assign_roles()
 
+        return changed
+
 
 page.register_page(resources.v2, ApiV2)