From 8e910cce8aa46e37896b72c1f17de4377f4bc82c Mon Sep 17 00:00:00 2001
From: Alex Lo <alexlo@gmail.com>
Date: Tue, 7 Mar 2017 14:55:17 -0500
Subject: [PATCH] ec2_group: description is only required when group state is
 present (#19791)

* description is only required when group state is present

also note that AWS requires a non-empty description when creating a security group

* clarify description requirement
---
 lib/ansible/modules/cloud/amazon/ec2_group.py |  9 +++++---
 .../roles/test_ec2_group/tasks/main.yml       | 21 +++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/lib/ansible/modules/cloud/amazon/ec2_group.py b/lib/ansible/modules/cloud/amazon/ec2_group.py
index 319fd0b654..a9f916f4af 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_group.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_group.py
@@ -34,8 +34,8 @@ options:
     required: true
   description:
     description:
-      - Description of the security group.
-    required: true
+      - Description of the security group. Required when C(state) is C(present).
+    required: false
   vpc_id:
     description:
       - ID of the VPC to create the group in.
@@ -242,7 +242,7 @@ def main():
     argument_spec = ec2_argument_spec()
     argument_spec.update(dict(
         name=dict(type='str', required=True),
-        description=dict(type='str', required=True),
+        description=dict(type='str', required=False),
         vpc_id=dict(type='str'),
         rules=dict(type='list'),
         rules_egress=dict(type='list'),
@@ -269,6 +269,9 @@ def main():
     purge_rules = module.params['purge_rules']
     purge_rules_egress = module.params['purge_rules_egress']
 
+    if state == 'present' and not description:
+        module.fail_json(msg='Must provide description when state is present.')
+
     changed = False
 
     ec2 = ec2_connect(module)
diff --git a/test/integration/roles/test_ec2_group/tasks/main.yml b/test/integration/roles/test_ec2_group/tasks/main.yml
index 7558b8e5d1..8435794bce 100644
--- a/test/integration/roles/test_ec2_group/tasks/main.yml
+++ b/test/integration/roles/test_ec2_group/tasks/main.yml
@@ -18,7 +18,7 @@
   assert:
     that:
        - 'result.failed'
-       - 'result.msg == "missing required arguments: description,name"'
+       - 'result.msg == "missing required arguments: name"'
 
 # ============================================================
 - name: test failure with only name
@@ -31,7 +31,7 @@
   assert:
     that:
        - 'result.failed'
-       - 'result.msg == "missing required arguments: description"'
+       - 'result.msg == "Must provide description when state is present."'
 
 # ============================================================
 - name: test failure with only description
@@ -46,6 +46,21 @@
        - 'result.failed'
        - 'result.msg == "missing required arguments: name"'
 
+# ============================================================
+- name: test failure with empty description (AWS API requires non-empty string desc)
+  ec2_group:
+    name='{{ec2_group_name}}'
+    description=''
+    region='{{ec2_region}}'
+  register: result
+  ignore_errors: true
+
+- name: assert failure with empty description
+  assert:
+    that:
+       - 'result.failed'
+       - 'result.msg == "Must provide description when state is present."'
+
 # ============================================================
 - name: test invalid region parameter
   ec2_group:
@@ -213,7 +228,6 @@
 - name: test state=absent (expected changed=true)
   ec2_group:
     name='{{ec2_group_name}}'
-    description='{{ec2_group_description}}'
     state=absent
   environment:
     EC2_REGION: '{{ec2_region}}'
@@ -231,7 +245,6 @@
 - name: test state=absent (expected changed=false)
   ec2_group:
     name='{{ec2_group_name}}'
-    description='{{ec2_group_description}}'
     state=absent
   environment:
     EC2_REGION: '{{ec2_region}}'