Make edits to Changelog, remove all HipChat-related params from tower_notification module

CHANGELOG.md

@@ -3,8 +3,7 @@
 This is a list of high-level changes for each release of AWX. A full list of commits can be found at `https://github.com/ansible/awx/releases/tag/<version>`.
 
 ## 12.0.0 (TBD)
-- Removed support for HipChat notifications ([EoL announcement](https://www.atlassian.com/partnerships/slack/faq#faq-98b17ca3-247f-423b-9a78-70a91681eff0))
+- Removed support for HipChat notifications ([EoL announcement](https://www.atlassian.com/partnerships/slack/faq#faq-98b17ca3-247f-423b-9a78-70a91681eff0)); all previously-created HipChat notification templates will be deleted due to this removal.
-
 
 ## 11.2.0 (Apr 29, 2020)
 

awx_collection/plugins/modules/tower_notification.py

@@ -155,23 +155,12 @@ options:
         - The label to be shown with the notification.
         - This parameter has been deprecated, please use 'notification_configuration' instead.
       type: str
-    api_url:
-      description:
-        - The HipChat API URL.
-        - The HipChat notification type has been deprecated.
-      type: str
     color:
       description:
         - The notification color.
         - This parameter has been deprecated, please use 'notification_configuration' instead.
       choices: ["yellow", "green", "red", "purple", "gray", "random"]
       type: str
-    rooms:
-      description:
-        - HipChat rooms to send the notification to.
-        - The HipChat notification type has been deprecated.
-      type: list
-      elements: str
     notify:
       description:
         - The notify channel trigger.
@@ -320,10 +309,6 @@ RETURN = ''' # '''
 
 from ..module_utils.tower_api import TowerModule
 
-HIPCHAT_PARAMS = (
-    'api_url', 'rooms',
-)
-
 OLD_INPUT_NAMES = (
     'username', 'sender', 'recipients', 'use_tls',
     'host', 'use_ssl', 'password', 'port',
@@ -366,9 +351,7 @@ def main():
         service_key=dict(no_log=True),
         client_name=dict(),
         message_from=dict(),
-        api_url=dict(),
         color=dict(choices=['yellow', 'green', 'red', 'purple', 'gray', 'random']),
-        rooms=dict(type='list', elements='str'),
         notify=dict(type='bool'),
         url=dict(),
         headers=dict(type='dict'),
@@ -391,12 +374,6 @@ def main():
     messages = module.params.get('messages')
     state = module.params.get('state')
 
-    # Deprecation/removal warnings for HipChat notification type
-    for hipchat_params in HIPCHAT_PARAMS:
-        if module.params.get(hipchat_params) is not None:
-            module.deprecate(msg='{0} parameter has been deprecated; the HipChat notification type can no longer be generated'.format(hipchat_params),
-                             version="4.0")
-
     # Deprecation warnings for all other params
     for legacy_input in OLD_INPUT_NAMES:
         if module.params.get(legacy_input) is not None:

awx_collection/tests/integration/targets/tower_notification/tasks/main.yml

@@ -34,19 +34,7 @@
     service_key: skeleton
     client_name: Bill
     message_from: me
-    api_url: https://tower.example.com/api/v2
     color: green
-    rooms:
-      - The Study
-      - Kitchen
-      - Ballroom
-      - Conservatory
-      - Billiard Room
-      - Library
-      - Hall
-      - Lounge
-      - Dining Room
-      - Cellar
     notify: true
     url: ansible.com
     headers:
@@ -62,8 +50,8 @@
 - assert:
     that:
       - "'deprecations' in result"
-      # The 27 can be count from the size of the OLD_INPUT_NAMES list in the module
+      # The 25 can be count from the size of the OLD_INPUT_NAMES list in the module
-      - result['deprecations'] | length() == 27
+      - result['deprecations'] | length() == 25
 
 - name: Create Slack notification with custom messages
   tower_notification: