From 130a2db05dcc4fbcbcb0e64d17a7ed9921ae21a7 Mon Sep 17 00:00:00 2001
From: Lucian Corduneanu <lucian.corduneanu@sensidev.com>
Date: Mon, 14 Aug 2017 17:25:55 +0300
Subject: [PATCH 1/2] Add support for using the same dict key, but different
 'name's

---
 postgres/manage.sls | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/postgres/manage.sls b/postgres/manage.sls
index ab8c7031..43240653 100644
--- a/postgres/manage.sls
+++ b/postgres/manage.sls
@@ -23,9 +23,9 @@ postgres-reload-modules:
 
 # User states
 
-{%- for name, user in postgres.users|dictsort() %}
+{%- for key, user in postgres.users|dictsort() %}
 
-{{ format_state(name, 'postgres_user', user) }}
+{{ format_state(user.name or key, 'postgres_user', user) }}
     - require:
       - test: postgres-reload-modules
 
@@ -33,9 +33,9 @@ postgres-reload-modules:
 
 # Tablespace states
 
-{%- for name, tblspace in postgres.tablespaces|dictsort() %}
+{%- for key, tblspace in postgres.tablespaces|dictsort() %}
 
-{{ format_state(name, 'postgres_tablespace', tblspace) }}
+{{ format_state(tblspace.name or key, 'postgres_tablespace', tblspace) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'owner' in tblspace %}
@@ -46,9 +46,9 @@ postgres-reload-modules:
 
 # Database states
 
-{%- for name, db in postgres.databases|dictsort() %}
+{%- for key, db in postgres.databases|dictsort() %}
 
-{{ format_state(name, 'postgres_database', db) }}
+{{ format_state(db.name or key, 'postgres_database', db) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'owner' in db %}
@@ -62,9 +62,9 @@ postgres-reload-modules:
 
 # Schema states
 
-{%- for name, schema in postgres.schemas|dictsort() %}
+{%- for key, schema in postgres.schemas|dictsort() %}
 
-{{ format_state(name, 'postgres_schema', schema) }}
+{{ format_state(schema.name or key, 'postgres_schema', schema) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'owner' in schema %}
@@ -75,9 +75,9 @@ postgres-reload-modules:
 
 # Extension states
 
-{%- for name, extension in postgres.extensions|dictsort() %}
+{%- for key, extension in postgres.extensions|dictsort() %}
 
-{{ format_state(name, 'postgres_extension', extension) }}
+{{ format_state(extension.name or key, 'postgres_extension', extension) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'maintenance_db' in extension %}

From 9ec4df59df582ba5591b2534108e6d8f1ab4019e Mon Sep 17 00:00:00 2001
From: Lucian Corduneanu <lucian.corduneanu@sensidev.com>
Date: Tue, 15 Aug 2017 13:28:28 +0300
Subject: [PATCH 2/2] Use dict .get to ensure a default

---
 postgres/manage.sls | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/postgres/manage.sls b/postgres/manage.sls
index 43240653..b45c1d17 100644
--- a/postgres/manage.sls
+++ b/postgres/manage.sls
@@ -25,7 +25,7 @@ postgres-reload-modules:
 
 {%- for key, user in postgres.users|dictsort() %}
 
-{{ format_state(user.name or key, 'postgres_user', user) }}
+{{ format_state(user.get('name') or key, 'postgres_user', user) }}
     - require:
       - test: postgres-reload-modules
 
@@ -35,7 +35,7 @@ postgres-reload-modules:
 
 {%- for key, tblspace in postgres.tablespaces|dictsort() %}
 
-{{ format_state(tblspace.name or key, 'postgres_tablespace', tblspace) }}
+{{ format_state(tblspace.get('name') or key, 'postgres_tablespace', tblspace) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'owner' in tblspace %}
@@ -48,7 +48,7 @@ postgres-reload-modules:
 
 {%- for key, db in postgres.databases|dictsort() %}
 
-{{ format_state(db.name or key, 'postgres_database', db) }}
+{{ format_state(db.get('name') or key, 'postgres_database', db) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'owner' in db %}
@@ -64,7 +64,7 @@ postgres-reload-modules:
 
 {%- for key, schema in postgres.schemas|dictsort() %}
 
-{{ format_state(schema.name or key, 'postgres_schema', schema) }}
+{{ format_state(schema.get('name') or key, 'postgres_schema', schema) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'owner' in schema %}
@@ -77,7 +77,7 @@ postgres-reload-modules:
 
 {%- for key, extension in postgres.extensions|dictsort() %}
 
-{{ format_state(extension.name or key, 'postgres_extension', extension) }}
+{{ format_state(extension.get('name') or key, 'postgres_extension', extension) }}
     - require:
       - test: postgres-reload-modules
   {%- if 'maintenance_db' in extension %}