From bc783b8f941bc7f504327983ff39318e384d661d Mon Sep 17 00:00:00 2001
From: John Westcott IV <32551173+john-westcott-iv@users.noreply.github.com>
Date: Thu, 10 Mar 2022 13:49:18 -0500
Subject: [PATCH] Enabling export of applications through awxkit (#11887)

---
 awx/api/serializers.py                  | 6 ++++++
 awxkit/awxkit/api/pages/api.py          | 1 +
 awxkit/awxkit/api/pages/applications.py | 1 +
 3 files changed, 8 insertions(+)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index ff8e654f55..a5d6e171e9 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -1263,6 +1263,12 @@ class OAuth2ApplicationSerializer(BaseSerializer):
                 activity_stream=self.reverse('api:o_auth2_application_activity_stream_list', kwargs={'pk': obj.pk}),
             )
         )
+        if obj.organization_id:
+            res.update(
+                dict(
+                    organization=self.reverse('api:organization_detail', kwargs={'pk': obj.organization_id}),
+                )
+            )
         return res
 
     def get_modified(self, obj):
diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py
index 7ce4b7a042..b2c7a462ad 100644
--- a/awxkit/awxkit/api/pages/api.py
+++ b/awxkit/awxkit/api/pages/api.py
@@ -25,6 +25,7 @@ EXPORTABLE_RESOURCES = [
     'job_templates',
     'workflow_job_templates',
     'execution_environments',
+    'applications',
 ]
 
 
diff --git a/awxkit/awxkit/api/pages/applications.py b/awxkit/awxkit/api/pages/applications.py
index 18737cd883..a3ea0d29bd 100644
--- a/awxkit/awxkit/api/pages/applications.py
+++ b/awxkit/awxkit/api/pages/applications.py
@@ -10,6 +10,7 @@ from . import base
 class OAuth2Application(HasCreate, base.Base):
 
     dependencies = [Organization]
+    NATURAL_KEY = ('organization', 'name')
 
     def payload(self, **kwargs):
         payload = PseudoNamespace(