From 8e7471e83787c09662aa07b127239db05f70de97 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 25 Jul 2019 22:27:36 +0100 Subject: [PATCH] fix: allow muting deprecation warning via. pillar/config entry --- php/deprecated.sls | 12 ++++++++++++ pillar.example | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/php/deprecated.sls b/php/deprecated.sls index 7bbd665e..16c5c66c 100644 --- a/php/deprecated.sls +++ b/php/deprecated.sls @@ -1,6 +1,8 @@ # -*- coding: utf-8 -*- # vim: ft=sls +{#- Evaluating as `False` by default, using this method since `defaults.yaml` not available in this repo #} +{%- if not salt['config.get']('php').get('warning_messages', {}).get('v1.0.0', {}).get('mute_critical', False) %} php-deprecated-in-v1.0.0-test-succeed: test.succeed_without_changes: - name: | @@ -25,5 +27,15 @@ php-deprecated-in-v1.0.0-test-succeed: # To migrate from the old `php`, the first step is to convert to `php.ng`, # # before `v1.0.0` is released. # # # + # To prevent this message being displayed again, set the pillar/config value: # + # # + # ``` # + # php: # + # warning_messages: # + # v1.0.0: # + # mute_critical: True # + # ``` # + # # ################################################################################ # - failhard: True +{%- endif %} diff --git a/pillar.example b/pillar.example index 60239525..5aa54d9c 100644 --- a/pillar.example +++ b/pillar.example @@ -1,6 +1,10 @@ ## php.ng pillar examples php: + # Use the following values to mute deprecation warnings + warning_messages: # + v1.0.0: # + mute_critical: True # # Use external repository instead the default (only Ubuntu family) use_external_repo: True # Set the external repository name (valid only if use_external_repo is not none)