From 92369a7ee9cb997ce9fa3079334ab4b2383708b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Thu, 29 Jun 2017 08:58:15 +0200
Subject: [PATCH] refactoring + variable names

---
 roles/3scale/tasks/3scale_status.yml |  9 +++++++++
 roles/3scale/tasks/create_api.yml    | 19 ++++++++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/roles/3scale/tasks/3scale_status.yml b/roles/3scale/tasks/3scale_status.yml
index 958dcd7..04bb404 100644
--- a/roles/3scale/tasks/3scale_status.yml
+++ b/roles/3scale/tasks/3scale_status.yml
@@ -18,3 +18,12 @@
 
   - set_fact:
       applications: '{{ response.json|json_query(''applications[*].application.name'') }}'
+
+  - name: Get the default (first) account
+    uri:
+      url: https://{{ threescale_admin_hostname }}/admin/api/accounts.json?access_token={{ access_token|urlencode }}&state=approved&page=1&per_page=1
+      validate_certs: no
+    register: response
+
+  - set_fact:
+      account_id: '{{ response.json.accounts[0].account.id }}'
diff --git a/roles/3scale/tasks/create_api.yml b/roles/3scale/tasks/create_api.yml
index 3b4c0b3..beb161f 100644
--- a/roles/3scale/tasks/create_api.yml
+++ b/roles/3scale/tasks/create_api.yml
@@ -3,7 +3,10 @@
   - debug: msg="Working on service {{ item.service.name }}"
 
   - set_fact:
-      body_create_svc: '{{ body_create_svc|default("access_token=" ~ access_token|urlencode) ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
+      body_create_svc: '{{ "access_token=" ~ access_token|urlencode }}'
+
+  - set_fact:
+      body_create_svc: '{{ body_create_svc ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
     with_dict: '{{ item.service }}'
     loop_control:
       loop_var: param
@@ -28,7 +31,10 @@
       service_id: '{{ (services_details|selectattr("system_name", "equalto", item.service.system_name)|first)["id"] }}'
 
   - set_fact:
-      body_update_proxy: '{{ body_update_proxy|default("access_token=" ~ access_token|urlencode) ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
+      body_update_proxy: '{{ "access_token=" ~ access_token|urlencode }}'
+
+  - set_fact:
+      body_update_proxy: '{{ body_update_proxy ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
     with_dict: '{{ item.proxy }}'
     loop_control:
       loop_var: param
@@ -55,15 +61,6 @@
       application_plans: '{{ response.json|json_query(''plans[*].application_plan.system_name'') }}'
       application_plans_details: '{{ response.json|json_query(''plans[].{"system_name": application_plan.system_name, "id": application_plan.id}'') }}'
 
-  - name: Get the default account
-    uri:
-      url: https://{{ threescale_admin_hostname }}/admin/api/accounts.json?access_token={{ access_token|urlencode }}&state=approved&page=1&per_page=1
-      validate_certs: no
-    register: response
-
-  - set_fact:
-      account_id: '{{ response.json.accounts[0].account.id }}'
-
   - include: create_application_plan.yml
     with_items: '{{ item.application_plans }}'
     loop_control: