fix(jinja): omit_ip_address don't work on some platform

baby-gnu commented 4 years ago

PR progress checklist (to be filled in by reviewers)

[ ] Changes to documentation are appropriate (or tick if not required)
[ ] Changes to tests are appropriate (or tick if not required)
[ ] Reviews completed

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
[x] [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 tests

Does this PR introduce a `BREAKING CHANGE`?

No.

Related issues and/or pull requests

Describe the changes you're proposing

It apprears that the

if not (omit_ip_address is sameas true or host in omit_ip_address)

always returns True on older Jinja platforms:

default-ubuntu-1604-3000-3-py2
default-ubuntu-1604-2019-2-py3
default-amazonlinux-1-2019-2-py2

Each part of the or conditional need to be surrounded by parenthesis.

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Before:

       [INFO    ] Executing state file.managed for [/etc/ssh/ssh_known_hosts]
       [DEBUG   ] Returning file list from cache: age=7 cache_time=20 /tmp/kitchen/var/cache/salt/minion/file_lists/roots/base.p
       [DEBUG   ] Returning file list from cache: age=7 cache_time=20 /tmp/kitchen/var/cache/salt/minion/file_lists/roots/base.p
       [DEBUG   ] In saltenv 'base', looking at rel_path 'openssh/files/default/ssh_known_hosts' to resolve 'salt://openssh/files/default/ssh_known_hosts'
       [DEBUG   ] In saltenv 'base', ** considering ** path '/tmp/kitchen/var/cache/salt/minion/files/base/openssh/files/default/ssh_known_hosts' to resolve 'salt://openssh/files/default/ssh_known_hosts'
       [DEBUG   ] Fetching file from saltenv 'base', ** attempting ** 'salt://openssh/files/default/ssh_known_hosts'
       [DEBUG   ] No dest file found
       [INFO    ] Fetching file from saltenv 'base', ** done ** 'openssh/files/default/ssh_known_hosts'
       [DEBUG   ] Jinja search path: ['/tmp/kitchen/var/cache/salt/minion/files/base']
       [INFO    ] Executing command ['dig', '+short', 'cname-to-minion.example.org', 'A'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'cname-to-minion.example.org', 'AAAA'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'alias.example.org', 'A'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'alias.example.org', 'AAAA'] in directory '/home/kitchen'
       [DEBUG   ] LazyLoaded glob_match.match
       [DEBUG   ] LazyLoaded glob_match.match
       [DEBUG   ] LazyLoaded glob_match.match
       [DEBUG   ] LazyLoaded glob_match.match
       [INFO    ] Executing command ['dig', '+short', 'github.com', 'A'] in directory '/home/kitchen'
       [DEBUG   ] stdout: 140.82.118.4
       [INFO    ] Executing command ['dig', '+short', 'github.com', 'AAAA'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'gitlab.com', 'A'] in directory '/home/kitchen'
       [DEBUG   ] stdout: 172.65.251.78
       [INFO    ] Executing command ['dig', '+short', 'gitlab.com', 'AAAA'] in directory '/home/kitchen'
       [DEBUG   ] stdout: 2606:4700:90:0:f22e:fbec:5bed:a9b9
       [INFO    ] Executing command ['dig', '+short', 'minion.id', 'A'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'minion.id', 'AAAA'] in directory '/home/kitchen'

After:

       [INFO    ] Executing state file.managed for [/etc/ssh/ssh_known_hosts]
       [DEBUG   ] Returning file list from cache: age=8 cache_time=20 /tmp/kitchen/var/cache/salt/minion/file_lists/roots/base.p
       [DEBUG   ] Returning file list from cache: age=8 cache_time=20 /tmp/kitchen/var/cache/salt/minion/file_lists/roots/base.p
       [DEBUG   ] In saltenv 'base', looking at rel_path 'openssh/files/default/ssh_known_hosts' to resolve 'salt://openssh/files/default/ssh_known_hosts'
       [DEBUG   ] In saltenv 'base', ** considering ** path '/tmp/kitchen/var/cache/salt/minion/files/base/openssh/files/default/ssh_known_hosts' to resolve 'salt://openssh/files/default/ssh_known_hosts'
       [DEBUG   ] Fetching file from saltenv 'base', ** attempting ** 'salt://openssh/files/default/ssh_known_hosts'
       [DEBUG   ] No dest file found
       [INFO    ] Fetching file from saltenv 'base', ** done ** 'openssh/files/default/ssh_known_hosts'
       [DEBUG   ] Jinja search path: ['/tmp/kitchen/var/cache/salt/minion/files/base']
       [INFO    ] Executing command ['dig', '+short', 'cname-to-minion.example.org', 'A'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'cname-to-minion.example.org', 'AAAA'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'alias.example.org', 'A'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'alias.example.org', 'AAAA'] in directory '/home/kitchen'
       [DEBUG   ] LazyLoaded glob_match.match
       [DEBUG   ] LazyLoaded glob_match.match
       [DEBUG   ] LazyLoaded glob_match.match
       [DEBUG   ] LazyLoaded glob_match.match
       [INFO    ] Executing command ['dig', '+short', 'gitlab.com', 'A'] in directory '/home/kitchen'
       [DEBUG   ] stdout: 172.65.251.78
       [INFO    ] Executing command ['dig', '+short', 'gitlab.com', 'AAAA'] in directory '/home/kitchen'
       [DEBUG   ] stdout: 2606:4700:90:0:f22e:fbec:5bed:a9b9
       [INFO    ] Executing command ['dig', '+short', 'minion.id', 'A'] in directory '/home/kitchen'
       [INFO    ] Executing command ['dig', '+short', 'minion.id', 'AAAA'] in directory '/home/kitchen'
       [DEBUG   ] LazyLoaded files.is_text
       [DEBUG   ] LazyLoaded stringutils.get_diff
       [INFO    ] File changed:
       --- 
       +++ 
       @@ -1,4 +1,4 @@
       -github.com,140.82.118.4 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGm[...]
       +github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGm[...]
        gitlab.com,172.65.251.78,2606:4700:90:0:f22e:fbec:5bed:a9b9 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bN[...]
        minion.id,alias.of.minion.id ssh-rsa [...]
        minion.id,alias.of.minion.id ssh-ed25519 [...]

Documentation checklist

[ ] Updated the README (e.g. Available states).
[ ] Updated pillar.example.

Testing checklist

[x] Included in Kitchen (i.e. under state_top).
[x] Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
[ ] Updated the relevant test pillar.

Additional context

pull-assistant[bot] commented 4 years ago

Best reviewed: commit by commit

Optimal code review plan

fix(jinja): omit_ip_address don't work on some platform

Powered by Pull Assistant. Last update b2d38ae ... b2d38ae. Read the comment docs.

myii commented 4 years ago

Thanks, @baby-gnu.

saltstack-formulas-travis commented 4 years ago

:tada: This PR is included in version 1.2.2 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

saltstack-formulas / openssh-formula