From d03338176cd0a3a38a9e9c8fd51f567e914b9730 Mon Sep 17 00:00:00 2001 From: nb Date: Wed, 24 Jul 2019 14:42:23 +1100 Subject: [PATCH] fix: warn formula users ng states will be promoted in `v1.0.0` --- php/adodb.sls | 1 + php/apc.sls | 1 + php/apcu.sls | 1 + php/bcmath.sls | 1 + php/cgi.sls | 1 + php/cli.sls | 1 + php/composer.sls | 1 + php/curl.sls | 1 + php/deprecated.sls | 30 ++++++++++++++++++++++++++++++ php/dev.sls | 1 + php/fpm.sls | 3 +++ php/gd.sls | 1 + php/imagick.sls | 1 + php/imap.sls | 1 + php/init.sls | 3 +++ php/intl.sls | 1 + php/json.sls | 1 + php/ldap.sls | 1 + php/mail.sls | 1 + php/mbstring.sls | 1 + php/mcrypt.sls | 1 + php/memcache.sls | 1 + php/memcached.sls | 1 + php/mongo.sls | 1 + php/mysql.sls | 1 + php/mysqlnd.sls | 1 + php/oauth.sls | 1 + php/pear.sls | 1 + php/pgsql.sls | 1 + php/readline.sls | 1 + php/redis.sls | 1 + php/soap.sls | 1 + php/sqlite.sls | 1 + php/suhosin.sls | 1 + php/sybase.sls | 1 + php/xml.sls | 1 + php/zip.sls | 1 + 37 files changed, 70 insertions(+) create mode 100644 php/deprecated.sls diff --git a/php/adodb.sls b/php/adodb.sls index 96064e4..2cf3569 100644 --- a/php/adodb.sls +++ b/php/adodb.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-adodb: diff --git a/php/apc.sls b/php/apc.sls index 113461b..2a3d2ca 100644 --- a/php/apc.sls +++ b/php/apc.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-apc: diff --git a/php/apcu.sls b/php/apcu.sls index e0afc5a..76eb429 100644 --- a/php/apcu.sls +++ b/php/apcu.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-apcu: diff --git a/php/bcmath.sls b/php/bcmath.sls index 0f69c7a..bcfb84f 100644 --- a/php/bcmath.sls +++ b/php/bcmath.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-bcmath: diff --git a/php/cgi.sls b/php/cgi.sls index c136c05..ce53a5f 100644 --- a/php/cgi.sls +++ b/php/cgi.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-cgi: diff --git a/php/cli.sls b/php/cli.sls index 858c7da..b701710 100644 --- a/php/cli.sls +++ b/php/cli.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-cli: diff --git a/php/composer.sls b/php/composer.sls index 935508e..e4abc4c 100644 --- a/php/composer.sls +++ b/php/composer.sls @@ -11,6 +11,7 @@ {%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %} include: + - php.deprecated - php get-composer: diff --git a/php/curl.sls b/php/curl.sls index 01d4b85..e633d82 100644 --- a/php/curl.sls +++ b/php/curl.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-curl: diff --git a/php/deprecated.sls b/php/deprecated.sls new file mode 100644 index 0000000..e3baae4 --- /dev/null +++ b/php/deprecated.sls @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +php-deprecated-in-v1.0.0-test-fail: + test.succeed_without_changes: + - name: | + ################################################################################ + # # + # WARNING: BREAKING CHANGES SINCE `v1.0.0` # + # # + ################################################################################ + # # + # Prior to `v1.0.0`, this formula provided two methods for managing php; the # + # old method under `php` and the new method under `php.ng`. The old method # + # has now been removed and `php.ng` has been promoted to be `PHP` in its # + # place. # + # # + # If you are not in a position to migrate, please pin your repo to the final # + # release tag before `v1.0.0`, i.e. `v0.37.1`. # + # # + # To migrate from `php.ng`, simply modify your pillar to promote the entire # + # section under `php:ng` so that it is under `php` instead. So with the # + # editor of your choice, highlight the entire section and then unindent one # + # level. Finish by removing the `ng:` line. # + # # + # To migrate from the old `php`, first convert to `php.ng` under `v0.37.0` # + # and then follow the steps laid out in the paragraph directly above. # + # # + ################################################################################ + # - failhard: True diff --git a/php/dev.sls b/php/dev.sls index 0d2c3d5..41e6c62 100644 --- a/php/dev.sls +++ b/php/dev.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-dev: diff --git a/php/fpm.sls b/php/fpm.sls index d714ce0..0777c29 100644 --- a/php/fpm.sls +++ b/php/fpm.sls @@ -1,5 +1,8 @@ {%- from "php/map.jinja" import php with context %} +include: + - php.deprecated + php-fpm: pkg.installed: - name: {{ php.fpm_pkg }} diff --git a/php/gd.sls b/php/gd.sls index 928b70c..8761e60 100644 --- a/php/gd.sls +++ b/php/gd.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-gd: diff --git a/php/imagick.sls b/php/imagick.sls index e9a1f1a..1c8cd58 100644 --- a/php/imagick.sls +++ b/php/imagick.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-imagick: diff --git a/php/imap.sls b/php/imap.sls index 8157e59..79649fa 100644 --- a/php/imap.sls +++ b/php/imap.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-imap: diff --git a/php/init.sls b/php/init.sls index 8f4f90c..ab84c03 100644 --- a/php/init.sls +++ b/php/init.sls @@ -1,5 +1,8 @@ {%- from "php/map.jinja" import php with context %} +include: + - php.deprecated + {%- if not 'ng' in salt['pillar.get']('php', {}) %} {%- if grains['os'] == "Ubuntu" %} diff --git a/php/intl.sls b/php/intl.sls index 261addc..5b594f4 100644 --- a/php/intl.sls +++ b/php/intl.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-intl: diff --git a/php/json.sls b/php/json.sls index 2ea5a6a..aff16ac 100644 --- a/php/json.sls +++ b/php/json.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-json: diff --git a/php/ldap.sls b/php/ldap.sls index 7714b87..8c4cab6 100644 --- a/php/ldap.sls +++ b/php/ldap.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-ldap: diff --git a/php/mail.sls b/php/mail.sls index 4efd48f..953622a 100644 --- a/php/mail.sls +++ b/php/mail.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mail: diff --git a/php/mbstring.sls b/php/mbstring.sls index cde4a27..b285467 100644 --- a/php/mbstring.sls +++ b/php/mbstring.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mbstring: diff --git a/php/mcrypt.sls b/php/mcrypt.sls index d20ea23..95fa37a 100644 --- a/php/mcrypt.sls +++ b/php/mcrypt.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mcrypt: diff --git a/php/memcache.sls b/php/memcache.sls index c259f97..f96571d 100644 --- a/php/memcache.sls +++ b/php/memcache.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-memcache: diff --git a/php/memcached.sls b/php/memcached.sls index ed9c4f6..a1d84cf 100644 --- a/php/memcached.sls +++ b/php/memcached.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-memcached: diff --git a/php/mongo.sls b/php/mongo.sls index 0616773..defaac4 100644 --- a/php/mongo.sls +++ b/php/mongo.sls @@ -3,6 +3,7 @@ {%- set version = salt['pillar.get']('php:mongo_version', none) %} include: + - php.deprecated - php - php.xml - php.dev diff --git a/php/mysql.sls b/php/mysql.sls index eaec44f..c117039 100644 --- a/php/mysql.sls +++ b/php/mysql.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mysql: diff --git a/php/mysqlnd.sls b/php/mysqlnd.sls index 40642ef..20351b6 100644 --- a/php/mysqlnd.sls +++ b/php/mysqlnd.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-mysqlnd: diff --git a/php/oauth.sls b/php/oauth.sls index 347cb39..e77abaa 100644 --- a/php/oauth.sls +++ b/php/oauth.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-oauth: diff --git a/php/pear.sls b/php/pear.sls index f21619a..1a6d976 100644 --- a/php/pear.sls +++ b/php/pear.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-pear: diff --git a/php/pgsql.sls b/php/pgsql.sls index 9aa0835..70114eb 100644 --- a/php/pgsql.sls +++ b/php/pgsql.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-pgsql: diff --git a/php/readline.sls b/php/readline.sls index e761dd5..4fb8c78 100644 --- a/php/readline.sls +++ b/php/readline.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-readline: diff --git a/php/redis.sls b/php/redis.sls index d4608d5..b7a8f27 100644 --- a/php/redis.sls +++ b/php/redis.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-redis: diff --git a/php/soap.sls b/php/soap.sls index 3427451..89acf0d 100644 --- a/php/soap.sls +++ b/php/soap.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-soap: diff --git a/php/sqlite.sls b/php/sqlite.sls index d865d0a..758c468 100644 --- a/php/sqlite.sls +++ b/php/sqlite.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-sqlite: diff --git a/php/suhosin.sls b/php/suhosin.sls index 6c88ce8..a1682c3 100644 --- a/php/suhosin.sls +++ b/php/suhosin.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php - php.dev diff --git a/php/sybase.sls b/php/sybase.sls index f50bb69..a114b0b 100644 --- a/php/sybase.sls +++ b/php/sybase.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-sybase: diff --git a/php/xml.sls b/php/xml.sls index 47d39ec..80ed33a 100644 --- a/php/xml.sls +++ b/php/xml.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-xml: diff --git a/php/zip.sls b/php/zip.sls index 668fd2b..49c0fd1 100644 --- a/php/zip.sls +++ b/php/zip.sls @@ -1,6 +1,7 @@ {%- from "php/map.jinja" import php with context %} include: + - php.deprecated - php php-zip: