fix(config_ini): added quotes to regex tabs pattern#208
Open
nunesvn wants to merge 1 commit intosaltstack-formulas:masterfrom
Open
fix(config_ini): added quotes to regex tabs pattern#208nunesvn wants to merge 1 commit intosaltstack-formulas:masterfrom
nunesvn wants to merge 1 commit intosaltstack-formulas:masterfrom
Conversation
With Salt-Master 3005.1 and Salt-Minion on 3006.1, both on Debian 11, the unquoted tab was being parsed as part of the yaml structure and throwing the following error:
local:
Data failed to compile:
----------
Rendering SLS 'base:openssh.config_ini' failed: Illegal tab character; line 8
---
[...]
include:
- openssh
sshd_config-with-ini:
file.replace:
- name: /etc/ssh/sshd_config
- pattern: ^(\w+) +(\w) <======================
- repl: '\1 \2'
- show_changes: True
- require_in:
- ini: sshd_config-with-ini
[...]
---
alxwr
requested changes
Feb 8, 2024
| file.replace: | ||
| - name: {{ openssh.sshd_config }} | ||
| - pattern: {{ regex_search_for_tabs }} | ||
| - pattern: '{{ regex_search_for_tabs }}' |
Member
There was a problem hiding this comment.
Good catch! But this implementation does not account for single quotes in the regular expression.
Suggested change
| - pattern: '{{ regex_search_for_tabs }}' | |
| - pattern: {{ regex_search_for_tabs | yaml_dquote }} |
As documented in https://docs.saltproject.io/en/latest/topics/jinja/index.html#yaml-dquote.
Does this work for you? If it does, please update this PR. I'll merge it then.
There was a problem hiding this comment.
This file contains hidden or 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
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
Describe the changes you're proposing
With Salt-Master 3005.1 and Salt-Minion on 3006.1, both on Debian 11, the unquoted tab was being parsed as part of the yaml structure and throwing the following error:
Pillar / config required to test the proposed changes
Pillar:
Testing checklist
state_top).Additional context