From 15e00dd1a6bb4af9403f85fddf898423fc6317cd 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:59:44 +0200
Subject: [PATCH] initialize variables on each iteration

---
 roles/3scale/tasks/create_application_plan.yml | 5 ++++-
 roles/3scale/tasks/create_applications.yml     | 5 ++++-
 roles/3scale/vars/main.yml                     | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/roles/3scale/tasks/create_application_plan.yml b/roles/3scale/tasks/create_application_plan.yml
index ca3737d..5bd2b00 100644
--- a/roles/3scale/tasks/create_application_plan.yml
+++ b/roles/3scale/tasks/create_application_plan.yml
@@ -3,7 +3,10 @@
   - debug: msg="Working on plan {{ plan.system_name }} / service {{ item.service.name }}"
 
   - set_fact:
-      body_create_plan: '{{ body_create_plan|default("access_token=" ~ access_token|urlencode) ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
+      body_create_plan: '{{ "access_token=" ~ access_token|urlencode }}'
+
+  - set_fact:
+      body_create_plan: '{{ body_create_plan ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
     with_dict: '{{ plan }}'
     loop_control:
       loop_var: param
diff --git a/roles/3scale/tasks/create_applications.yml b/roles/3scale/tasks/create_applications.yml
index f2e475f..c0ca7c2 100644
--- a/roles/3scale/tasks/create_applications.yml
+++ b/roles/3scale/tasks/create_applications.yml
@@ -3,7 +3,10 @@
   - debug: msg="Working on application {{ app.name }} / plan {{ plan.system_name }} / service {{ item.service.name }}"
 
   - set_fact:
-      body_create_app: '{{ body_create_app|default("access_token=" ~ (access_token|urlencode) ~ "&plan_id=" ~ (plan_id)) ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
+      body_create_app: '{{ "access_token=" ~ (access_token|urlencode) ~ "&plan_id=" ~ (plan_id) }}'
+
+  - set_fact:
+      body_create_app: '{{ body_create_app ~ "&" ~ (param.key|urlencode) ~ "=" ~ (param.value|urlencode) }}'
     with_dict: '{{ app }}'
     loop_control:
       loop_var: param
diff --git a/roles/3scale/vars/main.yml b/roles/3scale/vars/main.yml
index 9cecc4b..652b17e 100644
--- a/roles/3scale/vars/main.yml
+++ b/roles/3scale/vars/main.yml
@@ -56,3 +56,5 @@
             - name: Hello App with OAuth
               description: "This is my very first application using OAuth"
               redirect_url: https://www.getpostman.com/oauth2/callback
+              application_id: "my-app"
+              application_key: "{{ 'my-app'|sha1() }}"