Skip to content

Add support for using the same dict key, but different 'name's #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add support for using the same dict key, but different 'name's #155

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130a2db
Add support for using the same dict key, but different 'name's
Lucianovici Aug 14, 2017
9ec4df5
Use dict .get to ensure a default
Lucianovici Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions postgres/manage.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ 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.get('name') or key, 'postgres_user', user) }}
- require:
- test: postgres-reload-modules

{%- endfor %}

# 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.get('name') or key, 'postgres_tablespace', tblspace) }}
- require:
- test: postgres-reload-modules
{%- if 'owner' in tblspace %}
Expand All @@ -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.get('name') or key, 'postgres_database', db) }}
- require:
- test: postgres-reload-modules
{%- if 'owner' in db %}
Expand All @@ -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.get('name') or key, 'postgres_schema', schema) }}
- require:
- test: postgres-reload-modules
{%- if 'owner' in schema %}
Expand All @@ -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.get('name') or key, 'postgres_extension', extension) }}
- require:
- test: postgres-reload-modules
{%- if 'maintenance_db' in extension %}
Expand Down