style: remove previous line from jinja directives #232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
myii
approved these changes
Dec 2, 2019
myii
requested changes
Dec 2, 2019
mysql/user.sls
Outdated
| - user: {{ name }} | ||
| - host: '{{ host }}' | ||
| - connection_host: '{{ mysql_host }}' | ||
| - connection_user: '{{ mysql_salt_user }}' | ||
| {% if mysql_salt_pass -%} | ||
| {%- if mysql_salt_pass -%} |
There was a problem hiding this comment.
Suggested change
| {%- if mysql_salt_pass -%} | |
| {%- if mysql_salt_pass %} |
mysql/user.sls
Outdated
| - user: {{ name }} | ||
| - host: '{{ host }}' | ||
| - escape: {{ db['escape'] | default(True) }} | ||
| - connection_host: '{{ mysql_host }}' | ||
| - connection_user: '{{ mysql_salt_user }}' | ||
| {% if mysql_salt_pass -%} | ||
| {%- if mysql_salt_pass -%} |
There was a problem hiding this comment.
Suggested change
| {%- if mysql_salt_pass -%} | |
| {%- if mysql_salt_pass %} |
|
@daks I approved the changes and then I noticed Travis! Realised straight away that we were probably encountering the whitespace control issue and sure enough, it works when fixed: That also includes fixing/ignoring the |
19 tasks
|
I commited your suggested changes. I'll let you merge #233 before if needed. |
myii
approved these changes
Dec 3, 2019
|
Merged, thanks @daks. |
|
🎉 This PR is included in version 0.52.4 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR progress checklist (to be filled in by reviewers)
What type of PR is this?
Primary type
[build]Changes related to the build system[chore]Changes to the build process or auxiliary tools and libraries such as documentation generation[ci]Changes to the continuous integration configuration[feat]A new feature[fix]A bug fix[perf]A code change that improves performance[refactor]A code change that neither fixes a bug nor adds a feature[revert]A change used to revert a previous commit[style]Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)Secondary type
[docs]Documentation changes[test]Adding missing or correcting existing testsDoes this PR introduce a
BREAKING CHANGE?No.
Related issues and/or pull requests
none
Describe the changes you're proposing
A simple style PR to remove whitespace blocks with Jinja directives, to ease debugging.
Pillar / config required to test the proposed changes
Debug log showing how the proposed changes work
Documentation checklist
README(e.g.Available states).pillar.example.Testing checklist
state_top).Additional context