From c3e5ebfa798789c102dc3877a5d266d15e777183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= <remy.leone@gmail.com>
Date: Sat, 6 Oct 2018 16:36:29 +0200
Subject: [PATCH] Add region to the volume facts (#46214)

---
 .../cloud/scaleway/scaleway_volume_facts.py   | 26 ++++++++++++++++---
 .../scaleway_volume_facts/tasks/main.yml      | 17 ++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py b/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py
index d0904ea772a..ccf7f527672 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_volume_facts.py
@@ -22,11 +22,23 @@ author:
   - "Yanis Guenane (@Spredzy)"
   - "Remy Leone (@sieben)"
 extends_documentation_fragment: scaleway
+options:
+  region:
+    version_added: "2.8"
+    description:
+     - Scaleway region to use (for example par1).
+    required: true
+    choices:
+      - ams1
+      - EMEA-NL-EVS
+      - par1
+      - EMEA-FR-PAR1
 '''
 
 EXAMPLES = r'''
 - name: Gather Scaleway volumes facts
   scaleway_volume_facts:
+    region: par1
 '''
 
 RETURN = r'''
@@ -54,8 +66,8 @@ scaleway_volume_facts:
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.scaleway import (
-    Scaleway, ScalewayException, scaleway_argument_spec
-)
+    Scaleway, ScalewayException, scaleway_argument_spec,
+    SCALEWAY_LOCATION)
 
 
 class ScalewayVolumeFacts(Scaleway):
@@ -64,10 +76,18 @@ class ScalewayVolumeFacts(Scaleway):
         super(ScalewayVolumeFacts, self).__init__(module)
         self.name = 'volumes'
 
+        region = module.params["region"]
+        self.module.params['api_url'] = SCALEWAY_LOCATION[region]["api_endpoint"]
+
 
 def main():
+    argument_spec = scaleway_argument_spec()
+    argument_spec.update(dict(
+        region=dict(required=True, choices=SCALEWAY_LOCATION.keys()),
+    ))
+
     module = AnsibleModule(
-        argument_spec=scaleway_argument_spec(),
+        argument_spec=argument_spec,
         supports_check_mode=True,
     )
 
diff --git a/test/legacy/roles/scaleway_volume_facts/tasks/main.yml b/test/legacy/roles/scaleway_volume_facts/tasks/main.yml
index ed162a619b4..b157e127ad2 100644
--- a/test/legacy/roles/scaleway_volume_facts/tasks/main.yml
+++ b/test/legacy/roles/scaleway_volume_facts/tasks/main.yml
@@ -1,5 +1,8 @@
+# SCW_API_KEY='XXX' ansible-playbook ./test/legacy/scaleway.yml --tags test_scaleway_volume_facts
+
 - name: Get volume informations and register it in a variable
   scaleway_volume_facts:
+    region: par1
   register: volumes
 
 - name: Display volumes variable
@@ -10,3 +13,17 @@
   assert:
     that:
       - volumes is success
+
+- name: Get volume informations and register it in a variable (AMS1)
+  scaleway_volume_facts:
+    region: ams1
+  register: ams1_volumes
+
+- name: Display volumes variable
+  debug:
+    var: ams1_volumes
+
+- name: Ensure retrieval of volumes facts is success
+  assert:
+    that:
+      - ams1_volumes is success