From d57bc3b59c69ced870dc11b764adc6ac98583d99 Mon Sep 17 00:00:00 2001
From: adamscmRH <chadams@redhat.com>
Date: Wed, 5 Jul 2017 10:33:08 -0400
Subject: [PATCH] Add --diff feature to API

---
 awx/api/serializers.py                     |  4 ++--
 awx/main/migrations/0044_v320_diff_mode.py | 24 ++++++++++++++++++++++
 awx/main/models/jobs.py                    |  5 ++++-
 awx/main/tasks.py                          |  4 ++++
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 awx/main/migrations/0044_v320_diff_mode.py

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 3ef89809cc..604905c240 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -2390,7 +2390,7 @@ class JobTemplateSerializer(JobTemplateMixin, UnifiedJobTemplateSerializer, JobO
         model = JobTemplate
         fields = ('*', 'host_config_key', 'ask_variables_on_launch', 'ask_limit_on_launch', 'ask_tags_on_launch',
                   'ask_skip_tags_on_launch', 'ask_job_type_on_launch', 'ask_verbosity_on_launch', 'ask_inventory_on_launch',
-                  'ask_credential_on_launch', 'survey_enabled', 'become_enabled',
+                  'ask_credential_on_launch', 'survey_enabled', 'become_enabled', 'diff_mode',
                   'allow_simultaneous')
 
     def get_related(self, obj):
@@ -2454,7 +2454,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
                   'ask_limit_on_launch', 'ask_tags_on_launch', 'ask_skip_tags_on_launch',
                   'ask_job_type_on_launch', 'ask_verbosity_on_launch', 'ask_inventory_on_launch',
                   'ask_credential_on_launch', 'allow_simultaneous', 'artifacts', 'scm_revision',
-                  'instance_group')
+                  'instance_group', 'diff_mode')
 
     def get_related(self, obj):
         res = super(JobSerializer, self).get_related(obj)
diff --git a/awx/main/migrations/0044_v320_diff_mode.py b/awx/main/migrations/0044_v320_diff_mode.py
new file mode 100644
index 0000000000..dd0a766f9c
--- /dev/null
+++ b/awx/main/migrations/0044_v320_diff_mode.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0043_v320_instancegroups'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='job',
+            name='diff_mode',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='jobtemplate',
+            name='diff_mode',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index 7cf2b5a5c5..402411021b 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -60,6 +60,9 @@ class JobOptions(BaseModel):
     class Meta:
         abstract = True
 
+    diff_mode = models.BooleanField(
+        default=False,
+    )
     job_type = models.CharField(
         max_length=64,
         choices=JOB_TYPE_CHOICES,
@@ -293,7 +296,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
                 'job_tags', 'extra_vars', 'launch_type', 'force_handlers',
                 'skip_tags', 'start_at_task', 'become_enabled', 'labels',
                 'survey_passwords', 'allow_simultaneous', 'timeout',
-                'use_fact_cache',]
+                'use_fact_cache', 'diff_mode',]
 
     def resource_validation_data(self):
         '''
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 4d68c18fa6..9736147bc8 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1012,6 +1012,8 @@ class RunJob(BaseTask):
             args.append('--ask-pass')
         if job.become_enabled:
             args.append('--become')
+        if job.diff_mode:
+            args.append('--diff')
         if become_method:
             args.extend(['--become-method', become_method])
         if become_username:
@@ -2011,6 +2013,8 @@ class RunAdHocCommand(BaseTask):
             args.append('--forks=%d' % ad_hoc_command.forks)
         if ad_hoc_command.verbosity:
             args.append('-%s' % ('v' * min(5, ad_hoc_command.verbosity)))
+        # if ad_hoc_command.diff_mode:
+        #     args.append('--diff')
 
         if ad_hoc_command.extra_vars_dict:
             args.extend(['-e', json.dumps(ad_hoc_command.extra_vars_dict)])