From 322cfa49d0d2f267aad2f476911529362c1c8373 Mon Sep 17 00:00:00 2001
From: Kevin Breit <kevin.breit@kevinbreit.net>
Date: Wed, 15 May 2019 10:45:07 -0500
Subject: [PATCH] Meraki - Add check for auth_key parameter (#56199)

* auth_key parameter is required
- This will have to change when httpapi is implemented

* Add integration test

* Add assertion

* Enable VLANs on network

* Add required for auth_key
---
 .../module_utils/network/meraki/meraki.py     |  2 +-
 lib/ansible/plugins/doc_fragments/meraki.py   |  1 +
 .../targets/meraki_vlan/tasks/main.yml        | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/module_utils/network/meraki/meraki.py b/lib/ansible/module_utils/network/meraki/meraki.py
index d1c51e0a8b5..5494d5a79ac 100644
--- a/lib/ansible/module_utils/network/meraki/meraki.py
+++ b/lib/ansible/module_utils/network/meraki/meraki.py
@@ -37,7 +37,7 @@ from ansible.module_utils._text import to_native, to_bytes, to_text
 
 
 def meraki_argument_spec():
-    return dict(auth_key=dict(type='str', no_log=True, fallback=(env_fallback, ['MERAKI_KEY'])),
+    return dict(auth_key=dict(type='str', no_log=True, fallback=(env_fallback, ['MERAKI_KEY']), required=True),
                 host=dict(type='str', default='api.meraki.com'),
                 use_proxy=dict(type='bool', default=False),
                 use_https=dict(type='bool', default=True),
diff --git a/lib/ansible/plugins/doc_fragments/meraki.py b/lib/ansible/plugins/doc_fragments/meraki.py
index d8198dbfd0e..00935146d17 100644
--- a/lib/ansible/plugins/doc_fragments/meraki.py
+++ b/lib/ansible/plugins/doc_fragments/meraki.py
@@ -15,6 +15,7 @@ options:
         description:
         - Authentication key provided by the dashboard. Required if environmental variable C(MERAKI_KEY) is not set.
         type: str
+        required: yes
     host:
         description:
         - Hostname for Meraki dashboard.
diff --git a/test/integration/targets/meraki_vlan/tasks/main.yml b/test/integration/targets/meraki_vlan/tasks/main.yml
index bd082b5cdf0..4ebd33ca7e8 100644
--- a/test/integration/targets/meraki_vlan/tasks/main.yml
+++ b/test/integration/targets/meraki_vlan/tasks/main.yml
@@ -36,6 +36,20 @@
         - '"Failed to connect to" in invalid_domain.msg'
         - '"http" in http.url'
 
+  - name: Test play without auth_key
+    meraki_network:
+      state: present
+      org_name: '{{test_org_name}}'
+      net_name: '{{test_net_name}}'
+      type: appliance
+    delegate_to: localhost
+    ignore_errors: yes
+    register: no_key
+
+  - assert:
+      that:
+        - '"missing required arguments" in no_key.msg'
+
   - name: Create test network
     meraki_network:
       auth_key: '{{auth_key}}'
@@ -45,6 +59,15 @@
       type: appliance
     delegate_to: localhost
 
+  - name: Enable VLANs on network
+    meraki_network:
+      auth_key: '{{auth_key}}'
+      state: present
+      org_name: '{{test_org_name}}'
+      net_name: '{{test_net_name}}'
+      enable_vlans: yes
+    delegate_to: localhost
+
   - name: Create VLAN
     meraki_vlan:
       auth_key: '{{auth_key}}'