Merge pull request #27 from ansible/devel

Rebase

awx_collection/plugins/modules/tower_project.py

@@ -153,7 +153,7 @@ EXAMPLES = '''
     organization: "test"
     scm_update_on_launch: True
     scm_update_cache_timeout: 60
-    custom_virtualenv: "/var/lib/awx/venv/ansible-2.2"
+    custom_virtualenv: "/var/lib/awx/var/lib/awx/venv/ansible-2.2"
     state: present
     tower_config_file: "~/tower_cli.cfg"
 '''

awx_collection/test/awx/test_inventory_source.py

@@ -133,10 +133,10 @@ def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, proje
         inventory=base_inventory,
         source_project=project,
         source='scm',
-        custom_virtualenv='/venv/foobar/'
+        custom_virtualenv='/var/lib/awx/venv/foobar/'
     )
     # mock needed due to API behavior, not incorrect client behavior
-    with mocker.patch('awx.main.models.mixins.get_custom_venv_choices', return_value=['/venv/foobar/']):
+    with mocker.patch('awx.main.models.mixins.get_custom_venv_choices', return_value=['/var/lib/awx/venv/foobar/']):
         result = run_module('tower_inventory_source', dict(
             name='foo',
             description='this is the changed description',
@@ -148,7 +148,7 @@ def test_custom_venv_no_op(run_module, admin_user, base_inventory, mocker, proje
         ), admin_user)
     assert result.pop('changed', None), result
     inv_src.refresh_from_db()
-    assert inv_src.custom_virtualenv == '/venv/foobar/'
+    assert inv_src.custom_virtualenv == '/var/lib/awx/venv/foobar/'
     assert inv_src.description == 'this is the changed description'
 
 

awx_collection/test/awx/test_notification_template.py

@@ -3,7 +3,7 @@ __metaclass__ = type
 
 import pytest
 
-from awx.main.models import NotificationTemplate
+from awx.main.models import NotificationTemplate, Job
 
 
 def compare_with_encrypted(model_config, param_config):
@@ -109,3 +109,32 @@ def test_deprecated_to_modern_no_op(run_module, admin_user, organization):
     ), admin_user)
     assert not result.get('failed', False), result.get('msg', result)
     assert not result.pop('changed', None), result
+
+
+@pytest.mark.django_db
+def test_build_notification_message_undefined(run_module, admin_user, organization):
+    """Job notification templates may encounter undefined values in the context when they are
+    rendered. Make sure that accessing attributes or items of an undefined value returns another
+    instance of Undefined, rather than raising an UndefinedError. This enables the use of expressions
+    like "{{ job.created_by.first_name | default('unknown') }}"."""
+    job = Job.objects.create(name='foobar')
+
+    nt_config = {
+        'url': 'http://www.example.com/hook',
+        'headers': {
+            'X-Custom-Header': 'value123'
+        }
+    }
+    custom_start_template = {'body': '{"started_by": "{{ job.summary_fields.created_by.username | default(\'My Placeholder\') }}"}'}
+    messages = {'started': custom_start_template, 'success': None, 'error': None, 'workflow_approval': None}
+    result = run_module('tower_notification_template', dict(
+        name='foo-notification-template',
+        organization=organization.name,
+        notification_type='webhook',
+        notification_configuration=nt_config,
+        messages=messages,
+    ), admin_user)
+    nt = NotificationTemplate.objects.get(id=result['id'])
+
+    _, body = job.build_notification_message(nt, 'running')
+    assert '{"started_by": "My Placeholder"}' in body

awx_collection/tools/roles/template_galaxy/templates/README.md.j2

@@ -31,7 +31,7 @@ with the current AWX version, for example: `awx_collection/awx-awx-9.2.0.tar.gz`
 Installing the `tar.gz` involves no special instructions.
 
 {% else %}
-This collection should be installed from [Content Hub][https://cloud.redhat.com/ansible/automation-hub/ansible/tower/]
+This collection should be installed from [Content Hub](https://cloud.redhat.com/ansible/automation-hub/ansible/tower/)
 
 {% endif %}
 ## Running