Skip to content

Commit

Permalink
fix: Conditional statements jinja2 warning (#685)
Browse files Browse the repository at this point in the history
  • Loading branch information
iisojunn authored Jan 15, 2024
1 parent a170481 commit d8a5917
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENHANCEMENTS:
BUG FIXES:

- Avoid re-copying the NGINX Amplify config file every time the role is run.
- Fix conditional statements should not include jinja2 templating warning.

CI/CD:

Expand Down
7 changes: 3 additions & 4 deletions tasks/validate/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
- name: Check whether you are using a supported NGINX distribution
ansible.builtin.assert:
that:
- "{{ ansible_facts['distribution'] | lower in nginx_distributions.keys() | list }}"
- "{{ (ansible_facts['distribution_version'] | regex_search('\\d{1,2}\\.\\d{2}') | float in nginx_distributions[ansible_facts['distribution'] | lower]['versions'] | map('float'))
if ansible_facts['distribution'] | lower in ['alpine', 'ubuntu'] else ansible_facts['distribution_major_version'] in nginx_distributions[ansible_facts['distribution'] | lower]['versions'] | string }}"
- "{{ ansible_facts['architecture'] in nginx_distributions[ansible_facts['distribution'] | lower]['architectures'] }}"
- ansible_facts['distribution'] | lower in nginx_distributions.keys() | list
- (ansible_facts['distribution_version'] | regex_search('\\d{1,2}\\.\\d{2}') | float in nginx_distributions[ansible_facts['distribution'] | lower]['versions'] | map('float') if ansible_facts['distribution'] | lower in ['alpine', 'ubuntu'] else ansible_facts['distribution_major_version'] in nginx_distributions[ansible_facts['distribution'] | lower]['versions'] | string)
- ansible_facts['architecture'] in nginx_distributions[ansible_facts['distribution'] | lower]['architectures']
success_msg: Your distribution, {{ nginx_distributions[ansible_facts['distribution'] | lower]['name'] }} {{ ansible_facts['distribution_version'] }} ({{ ansible_facts['architecture'] }}), is supported by NGINX {{ (nginx_type == 'opensource') | ternary('Open Source', 'Plus') }}.
fail_msg: Your distribution, {{ nginx_distributions[ansible_facts['distribution'] | lower]['name'] }} {{ ansible_facts['distribution_version'] }} ({{ ansible_facts['architecture'] }}), is not supported by NGINX {{ (nginx_type == 'opensource') | ternary('Open Source', 'Plus') }}.
when:
Expand Down

0 comments on commit d8a5917

Please sign in to comment.