From 18ae5e5942f858361868bdaa118a44e09f59465b Mon Sep 17 00:00:00 2001 From: Wolodja Wentland Date: Tue, 24 Jan 2017 15:56:19 +0000 Subject: [PATCH 001/139] Hardcode 'mysql-server' as debconf base path for root password This is needed for correctly setting the root password when installing mariadb. --- mysql/server.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index f468627..dd22759 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -24,8 +24,8 @@ mysql_debconf: debconf.set: - name: {{ mysql.server }} - data: - '{{ mysql.server }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} - '{{ mysql.server }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} + 'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} + 'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'} - require_in: - pkg: {{ mysql.server }} From 8766718fd5225dcb13975a37c34be84de5632981 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sun, 5 Feb 2017 21:33:59 +0100 Subject: [PATCH 002/139] fix SUSE os grain --- mysql/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 078420f..0895cee 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -193,7 +193,7 @@ Fedora: wsrep_sst_method: rsync wsrep_sst_auth: "root:" -openSUSE: +SUSE: server: mariadb client: mariadb-client service: mysql From 9981b8240ebe6b82482675b7ecdac1f7a9786cb5 Mon Sep 17 00:00:00 2001 From: Aaron Miller Date: Tue, 21 Feb 2017 13:51:47 -0800 Subject: [PATCH 003/139] Update hash for MySQL community server RPM repo --- mysql/repo.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/repo.sls b/mysql/repo.sls index 7c84e7c..98342da 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -21,7 +21,7 @@ include: # A lookup table for MySQL Repo GPG keys & RPM URLs for various RedHat releases {% set pkg = { 'key': 'http://repo.mysql.com/RPM-GPG-KEY-mysql', - 'key_hash': 'md5=e9efdf96207c90f4487462cd1f3ff764', + 'key_hash': 'md5=472a4a4867adfd31a68e8c9bbfacc23d', 'rpm': rpm_source } %} From 7ec43ad3c92a20134dc3e1bb6fc3475923d1c80e Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 9 Mar 2017 22:16:34 +0100 Subject: [PATCH 004/139] Fix two issues when using a salt_user (#163) This fixes https://github.com/saltstack-formulas/mysql-formula/issues/157 * Avoid failures on first run with a salt_user defined Add a dependency on sls: mysql.salt-user to ensure MySQL users (especially the salt_user) get created early enough - without that, parts of the first run will fail (but a second run works). --- mysql/init.sls | 4 ++++ mysql/server.sls | 3 +++ 2 files changed, 7 insertions(+) diff --git a/mysql/init.sls b/mysql/init.sls index bc56035..a99f9a0 100644 --- a/mysql/init.sls +++ b/mysql/init.sls @@ -8,9 +8,13 @@ {% endmacro %} {% set mysql_dev = salt['pillar.get']('mysql:dev:install', False) %} +{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %} include: - mysql.server +{% if mysql_salt_user %} + - mysql.salt-user +{% endif %} - mysql.database - mysql.user {% if mysql_dev %} diff --git a/mysql/server.sls b/mysql/server.sls index dd22759..737c846 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -57,6 +57,9 @@ mysql_delete_anonymous_user_{{ host }}: {%- if (mysql_salt_user == mysql_root_user) and mysql_root_password %} - cmd: mysql_root_password {%- endif %} + {%- if (mysql_salt_user != mysql_root_user) %} + - sls: mysql.salt-user + {%- endif %} {% endfor %} {% endif %} {% endif %} From a6c057d63c20c94d77b7ac7e4e5b21d0ffae975d Mon Sep 17 00:00:00 2001 From: Gianni Carabelli Date: Mon, 15 May 2017 12:00:36 +0200 Subject: [PATCH 005/139] honorate mysql:server:host as in user declaration --- mysql/user.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/user.sls b/mysql/user.sls index e4f2ebe..0b2fa18 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -61,7 +61,7 @@ include: - grant_option: {{ user['grant_option'] | default(False) }} - user: {{ name }} - host: '{{ host }}' - - connection_host: localhost + - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' {% if mysql_salt_pass -%} - connection_pass: '{{ mysql_salt_pass }}' From 8dd3d4da46f3d4c750c8f31dea337802621a6d40 Mon Sep 17 00:00:00 2001 From: David Beitey Date: Wed, 2 Aug 2017 17:17:10 +1000 Subject: [PATCH 006/139] Fix duplicate ID if fqdn is localhost/localhost.localdomain --- mysql/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/server.sls b/mysql/server.sls index 737c846..3e2df50 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -39,7 +39,7 @@ mysql_root_password: - require: - service: mysqld -{% for host in ['localhost', 'localhost.localdomain', salt['grains.get']('fqdn')] %} +{% for host in {'localhost': '', 'localhost.localdomain': '', salt['grains.get']('fqdn'): ''}.keys() %} mysql_delete_anonymous_user_{{ host }}: mysql_user: - absent From 7a386578b7894201acda0b941850ce1ec90b5fab Mon Sep 17 00:00:00 2001 From: Nuno Esteves Date: Tue, 15 Aug 2017 22:49:44 +0100 Subject: [PATCH 007/139] Allow the use of wildcards on a user's database/table names when defining grants. --- mysql/user.sls | 1 + pillar.example | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql/user.sls b/mysql/user.sls index 0b2fa18..b0f622e 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -97,6 +97,7 @@ include: {% endif %} - user: {{ name }} - host: '{{ host }}' + - escape: {{ db['escape'] | default(True) }} - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' {% if mysql_salt_pass -%} diff --git a/pillar.example b/pillar.example index 2b50a81..7f82ab2 100644 --- a/pillar.example +++ b/pillar.example @@ -85,6 +85,7 @@ mysql: databases: - database: foo grants: ['select', 'insert', 'update'] + escape: True - database: bar grants: ['all privileges'] bob: @@ -96,9 +97,10 @@ mysql: ssl-ISSUER: Name ssl-CIPHER: Cipher databases: - - database: foo + - database: "foo_%%" grants: ['all privileges'] grant_option: True + escape: False - database: bar table: foobar grants: ['select', 'insert', 'update', 'delete'] From 41044a4698a055f183614e0cfa6986e8bfbdc5d5 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Thu, 21 Sep 2017 08:35:12 -0600 Subject: [PATCH 008/139] osmajorrelease is an int now --- mysql/defaults.yaml | 4 ++-- mysql/repo.sls | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 0895cee..0da7a30 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -92,7 +92,7 @@ Debian: !includedir /etc/mysql/conf.d/ CentOS: # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if salt['grains.get']('osmajorrelease') in ['7'] %} + {%- if salt['grains.get']('osmajorrelease')|int in [7] %} {% set mysql_engine = 'mariadb' %} {% set mysql_service = 'mariadb' %} {%- else %} @@ -123,7 +123,7 @@ CentOS: symbolic_links: 0 RedHat: # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if salt['grains.get']('osmajorrelease') in ['7'] %} + {%- if salt['grains.get']('osmajorrelease')|int in [7] %} {% set mysql_engine = 'mariadb' %} {% set mysql_service = 'mariadb' %} {%- else %} diff --git a/mysql/repo.sls b/mysql/repo.sls index 98342da..a064347 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -8,11 +8,11 @@ include: # TODO: Add Debian and Suse systems. # TODO: Allow user to specify MySQL version and alter yum repo file accordingly. {% if grains['os_family'] == 'RedHat' %} - {% if grains['osmajorrelease'][0] == '5' %} + {% if grains['osmajorrelease']|int == 5 %} {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %} - {% elif grains['osmajorrelease'][0] == '6' %} + {% elif grains['osmajorrelease']|int == 6 %} {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el6.rpm" %} - {% elif grains['osmajorrelease'][0] == '7' %} + {% elif grains['osmajorrelease']|int == 7 %} {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el7.rpm" %} {% endif %} {% endif %} From 11d11da92882999e52950c8a6759fdd58bf8b445 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Fri, 5 Jan 2018 20:46:17 +0100 Subject: [PATCH 009/139] fix python package suse --- mysql/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 0da7a30..c0f7ec3 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -197,7 +197,7 @@ SUSE: server: mariadb client: mariadb-client service: mysql - python: python-MySQL-python + python: python2-PyMySQL config: file: /etc/my.cnf sections: From 71c12e4a279b65c13ab11cc57d7778376f24e6ed Mon Sep 17 00:00:00 2001 From: Eduardo Speroni Date: Fri, 2 Feb 2018 11:51:32 -0200 Subject: [PATCH 010/139] Added charset and collate support, ensuring backwards compatibility --- mysql/database.sls | 7 ++++++- pillar.example | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mysql/database.sls b/mysql/database.sls index 72106a9..36fcd77 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -12,8 +12,9 @@ include: - mysql.python -{% for database in salt['pillar.get']('mysql:database', []) %} +{% for database_obj in salt['pillar.get']('mysql:database', []) %} {% set state_id = 'mysql_db_' ~ loop.index0 %} +{% set database = database_obj.get('name') if database_obj is mapping else database_obj %} {{ state_id }}: mysql_database.present: - name: {{ database }} @@ -22,6 +23,10 @@ include: {% if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' {% endif %} + {% if database_obj is mapping %} + - character_set: {{ database_obj.get('character_set', '') }} + - collate: {{ database_obj.get('collate', '') }} + {% endif %} - connection_charset: utf8 {% if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %} diff --git a/pillar.example b/pillar.example index 2b50a81..67fd703 100644 --- a/pillar.example +++ b/pillar.example @@ -49,8 +49,12 @@ mysql: # Manage databases database: + # Simple definition using default charset and collate - foo - - bar + # Detailed definition + - name: bar + character_set: utf8 + collate: utf8_general_ci schema: foo: load: True From 1453641cbc3f5ae15ca3e4c21671d1b971365a70 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Tue, 6 Feb 2018 10:13:05 -0700 Subject: [PATCH 011/139] fix duplicate key in gentoo --- mysql/defaults.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index c0f7ec3..f203356 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -306,6 +306,8 @@ Gentoo: mysqldump: character_sets_dir: /usr/share/mysql/charsets default_character_set: utf8 + quick: noarg_present + max_allowed_packet: 16M mysqlimport: character_sets_dir: /usr/share/mysql/charsets default_character_set: utf8 @@ -355,9 +357,6 @@ Gentoo: innodb_flush_log_at_trx_commit: 1 innodb_lock_wait_timeout: 50 innodb_file_per_table: noarg_present - mysqldump: - quick: noarg_present - max_allowed_packet: 16M isamchk: key_buffer: 20M sort_buffer_size: 20M From e5e55c74ad9b2070cf8b01b4f4b03ace9a4d7835 Mon Sep 17 00:00:00 2001 From: Achim Herwig Date: Wed, 21 Feb 2018 21:55:09 +0100 Subject: [PATCH 012/139] Avoid -p option if password is empty. Fixes #176 --- mysql/database.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/database.sls b/mysql/database.sls index 36fcd77..0c63013 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -45,7 +45,7 @@ include: {{ state_id }}_load: cmd.wait: - - name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} -p{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema + - name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {% if mysql_salt_pass %}-p{% endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema - watch: - file: {{ state_id }}_schema - mysql_database: {{ state_id }} From 239a2aae05f2229e1c41b2fc3b3e73872332cf57 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 14 Mar 2018 21:55:24 +0100 Subject: [PATCH 013/139] Fix lookup docs in pillar.example --- pillar.example | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index 67fd703..6b059d2 100644 --- a/pillar.example +++ b/pillar.example @@ -125,7 +125,9 @@ mysql: # server: mysql-server # client: mysql-client # service: mysql-service -# python: python-mysqldb +# server: +# lookup: +# python: python-mysqldb # Install MySQL headers dev: From ec8b076cb9f2e3d8f5c1e2336e117e49f00c041b Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 14 Mar 2018 22:30:20 +0100 Subject: [PATCH 014/139] FreeBSD: correct default value for 'python' --- mysql/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index f203356..95d1507 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -368,7 +368,7 @@ FreeBSD: server: mysql56-server client: mysql56-client service: mysql-server - python: pymysql + python: py27-pymysql dev: mysql56-server config: file: /usr/local/etc/my.cnf From 5e6708dd49d683914c8e42b6d88f9dd467b135a0 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 14 Mar 2018 22:30:46 +0100 Subject: [PATCH 015/139] FreeBSD: change root password --- mysql/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/server.sls b/mysql/server.sls index 3e2df50..8bc75d7 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -31,7 +31,7 @@ mysql_debconf: - pkg: {{ mysql.server }} - require: - pkg: mysql_debconf_utils -{% elif os_family in ['RedHat', 'Suse'] %} +{% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: cmd.run: - name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' From dd1e52761dbbe9a1d2fa2a8cc5b81504adc54124 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 14 Mar 2018 23:22:05 +0100 Subject: [PATCH 016/139] mysql.server_checks: enforce root password --- README.rst | 6 ++++++ mysql/server_checks.sls | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 mysql/server_checks.sls diff --git a/README.rst b/README.rst index 27f5b77..111bf10 100644 --- a/README.rst +++ b/README.rst @@ -45,6 +45,12 @@ debconf. cryptographically insecure, future formula versions should use the newly available ``random.get_str`` method. +``mysql.server_checks`` +----------------------- + +Enforces a root password to be set. + + ``mysql.disabled`` ------------------ diff --git a/mysql/server_checks.sls b/mysql/server_checks.sls new file mode 100644 index 0000000..ab5242b --- /dev/null +++ b/mysql/server_checks.sls @@ -0,0 +1,4 @@ +check_pillar_for_root_password: + test.check_pillar: + - present: + - mysql:server:root_password From 3f4b8ea6ea5595aebe6c270267816a0a35c0f97b Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Fri, 16 Mar 2018 23:41:52 +0100 Subject: [PATCH 017/139] mysql.remove_test_database: use connection_host --- mysql/remove_test_database.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql/remove_test_database.sls b/mysql/remove_test_database.sls index 9eca467..5f226d9 100644 --- a/mysql/remove_test_database.sls +++ b/mysql/remove_test_database.sls @@ -12,6 +12,7 @@ mysql remove test database: - name: test - host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' + - connection_host: '{{ mysql_host }}' {% if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' {% endif %} From 0bcfd7f2593a26cdce284931ff3f101d69e7e4cb Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Fri, 16 Mar 2018 23:48:25 +0100 Subject: [PATCH 018/139] mysql_root_password: use server:host --- mysql/server.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index 8bc75d7..f1f31c2 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -34,8 +34,8 @@ mysql_debconf: {% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: cmd.run: - - name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' - - unless: mysql --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" + - name: mysqladmin --host "{{ mysql_host }}" --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' + - unless: mysql --host "{{ mysql_host }}" --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" - require: - service: mysqld From 89985f7485ccefd71b0bc6327fa732dc3c43d39d Mon Sep 17 00:00:00 2001 From: Wolodja Wentland Date: Mon, 22 Jan 2018 12:50:12 +0000 Subject: [PATCH 019/139] Default to MariaDB packages on Debian releases after stretch --- mysql/defaults.yaml | 19 +++++++++++++++---- mysql/server.sls | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 95d1507..745c5cc 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -48,12 +48,20 @@ Ubuntu: append: | !includedir /etc/mysql/conf.d/ Debian: - server: mysql-server - client: mysql-client - service: mysql + {%- if salt['grains.get']('osmajorrelease')|int >= 9 %} + {% set mysql_engine = 'mariadb' %} + {% set mysql_service = 'mysql' %} + {%- else %} + {% set mysql_engine = 'mysql' %} + {% set mysql_service = 'mysql' %} + {%- endif %} + + server: {{ mysql_engine }}-server + service: {{ mysql_service }} + client: {{ mysql_engine }}-client python: python-mysqldb debconf_utils: debconf-utils - dev: libmysqlclient-dev + dev: lib{{ mysql_engine }}client-dev config: file: /etc/mysql/my.cnf sections: @@ -90,6 +98,9 @@ Debian: key_buffer_size: 16M append: | !includedir /etc/mysql/conf.d/ + # {% if salt['grains.get']('osmajorrelease')|int >= 9 -%} + # !includedir /etc/mysql/mariadb.conf.d/ + # {%- endif %} CentOS: # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look {%- if salt['grains.get']('osmajorrelease')|int in [7] %} diff --git a/mysql/server.sls b/mysql/server.sls index f1f31c2..7fb79dd 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -24,13 +24,24 @@ mysql_debconf: debconf.set: - name: {{ mysql.server }} - data: - 'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} - 'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'} - require_in: - pkg: {{ mysql.server }} - require: - pkg: mysql_debconf_utils + +{% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} +mysql_password_debconf: + debconf.set: + - name: mysql-server + - data: + 'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} + 'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} + - require_in: + - pkg: {{ mysql.server }} + - require: + - pkg: mysql_debconf_utils + {% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: cmd.run: From 134130025f29bdef958cd80e53392abd70cde5b8 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Wed, 25 Apr 2018 20:45:31 +0200 Subject: [PATCH 020/139] Fix unbalanced if/endif Commit 89985f7485ccefd71b0bc6327fa732dc3c43d39d added a {% if ... %} without the closing {% endif %} which leads to a Jinja syntax error. This commit adds the missing {% endif %} --- mysql/server.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql/server.sls b/mysql/server.sls index 7fb79dd..96bfde1 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -41,6 +41,7 @@ mysql_password_debconf: - pkg: {{ mysql.server }} - require: - pkg: mysql_debconf_utils +{% endif %} {% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: From af621bce24bc6021949b89a3822b048f0020a12d Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Wed, 25 Apr 2018 21:53:52 +0200 Subject: [PATCH 021/139] Make SUSE package name compatible with Leap 42.x python2-pymysql exists only in Leap 15 and Tumbleweed. Up to Leap 42.3, the package is named python-pymysql. --- mysql/defaults.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 745c5cc..b1319db 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -208,7 +208,12 @@ SUSE: server: mariadb client: mariadb-client service: mysql - python: python2-PyMySQL + {%- if salt['grains.get']('osmajorrelease')|int == 42 %} + # "old" package name up to Leap 42.x + python: python-PyMySQL + {% else %} + python: python2-pymysql + {% endif %} config: file: /etc/my.cnf sections: From 4a8a9bf69aa55223f7fb1a103c6caa9f0dec2999 Mon Sep 17 00:00:00 2001 From: Marius Kotsbak Date: Fri, 18 May 2018 13:40:36 +0200 Subject: [PATCH 022/139] Make formula relative to actual directory by using 'tpldir' --- mysql/client.sls | 4 ++-- mysql/config.sls | 14 +++++++------- mysql/database.sls | 4 ++-- mysql/dev.sls | 2 +- mysql/disabled.sls | 2 +- mysql/init.sls | 14 +++++++------- mysql/python.sls | 2 +- mysql/remove_test_database.sls | 2 +- mysql/repo.sls | 4 ++-- mysql/salt-user.sls | 2 +- mysql/server.sls | 8 ++++---- mysql/user.sls | 4 ++-- pillar.example | 8 ++++---- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/mysql/client.sls b/mysql/client.sls index e603352..27ede1a 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,7 +1,7 @@ include: - - mysql.config + - .config -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} mysql: diff --git a/mysql/config.sls b/mysql/config.sls index da140ab..2f40051 100644 --- a/mysql/config.sls +++ b/mysql/config.sls @@ -1,4 +1,4 @@ -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} {% set os_family = salt['grains.get']('os_family', None) %} @@ -18,7 +18,7 @@ mysql_server_config: file.managed: - name: {{ mysql.config_directory + mysql.server_config.file }} - template: jinja - - source: salt://mysql/files/server.cnf + - source: salt://{{ tpldir }}/files/server.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root @@ -31,7 +31,7 @@ mysql_galera_config: file.managed: - name: {{ mysql.config_directory + mysql.galera_config.file }} - template: jinja - - source: salt://mysql/files/galera.cnf + - source: salt://{{ tpldir }}/files/galera.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root @@ -44,7 +44,7 @@ mysql_library_config: file.managed: - name: {{ mysql.config_directory + mysql.library_config.file }} - template: jinja - - source: salt://mysql/files/client.cnf + - source: salt://{{ tpldir }}/files/client.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root @@ -57,7 +57,7 @@ mysql_clients_config: file.managed: - name: {{ mysql.config_directory + mysql.clients_config.file }} - template: jinja - - source: salt://mysql/files/mysql-clients.cnf + - source: salt://{{ tpldir }}/files/mysql-clients.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root @@ -72,9 +72,9 @@ mysql_config: - name: {{ mysql.config.file }} - template: jinja {% if "config_directory" in mysql %} - - source: salt://mysql/files/my-include.cnf + - source: salt://{{ tpldir }}/files/my-include.cnf {% else %} - - source: salt://mysql/files/my.cnf + - source: salt://{{ tpldir }}/files/my.cnf {% endif %} {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root diff --git a/mysql/database.sls b/mysql/database.sls index 0c63013..6966b8b 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -1,4 +1,4 @@ -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} {% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} @@ -10,7 +10,7 @@ {% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} include: - - mysql.python + - .python {% for database_obj in salt['pillar.get']('mysql:database', []) %} {% set state_id = 'mysql_db_' ~ loop.index0 %} diff --git a/mysql/dev.sls b/mysql/dev.sls index e111b70..d3606db 100644 --- a/mysql/dev.sls +++ b/mysql/dev.sls @@ -1,4 +1,4 @@ -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} mysql_dev: diff --git a/mysql/disabled.sls b/mysql/disabled.sls index ddcea6f..808ec37 100644 --- a/mysql/disabled.sls +++ b/mysql/disabled.sls @@ -1,4 +1,4 @@ -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} mysql: diff --git a/mysql/init.sls b/mysql/init.sls index a99f9a0..5452c2b 100644 --- a/mysql/init.sls +++ b/mysql/init.sls @@ -1,5 +1,5 @@ -{% from 'mysql/database.sls' import db_states with context %} -{% from 'mysql/user.sls' import user_states with context %} +{% from tpldir ~ '/database.sls' import db_states with context %} +{% from tpldir ~ '/user.sls' import user_states with context %} {% macro requisites(type, states) %} {%- for state in states %} @@ -11,14 +11,14 @@ {% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %} include: - - mysql.server + - .server {% if mysql_salt_user %} - - mysql.salt-user + - .salt-user {% endif %} - - mysql.database - - mysql.user + - .database + - .user {% if mysql_dev %} - - mysql.dev + - .dev {% endif %} diff --git a/mysql/python.sls b/mysql/python.sls index 9288fe3..eea84be 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -1,4 +1,4 @@ -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} mysql_python: diff --git a/mysql/remove_test_database.sls b/mysql/remove_test_database.sls index 5f226d9..bb3204f 100644 --- a/mysql/remove_test_database.sls +++ b/mysql/remove_test_database.sls @@ -5,7 +5,7 @@ {% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} include: - - mysql.python + - .python mysql remove test database: mysql_database.absent: diff --git a/mysql/repo.sls b/mysql/repo.sls index a064347..7ff3f25 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -1,7 +1,7 @@ include: - - mysql.config + - .config -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} # Completely ignore non-RHEL based systems diff --git a/mysql/salt-user.sls b/mysql/salt-user.sls index fadff43..31df7f6 100644 --- a/mysql/salt-user.sls +++ b/mysql/salt-user.sls @@ -1,5 +1,5 @@ include: - - mysql.server + - .server {% set os_family = salt['grains.get']('os_family', None) %} {% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', 'salt') %} diff --git a/mysql/server.sls b/mysql/server.sls index 96bfde1..8fc70de 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,8 +1,8 @@ include: - - mysql.config - - mysql.python + - .config + - .python -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} {% set os = salt['grains.get']('os', None) %} @@ -163,7 +163,7 @@ mysqld: mysql_additional_config: file.managed: - name: /usr/my.cnf - - source: salt://mysql/files/usr-my.cnf + - source: salt://{{ tpldir }}/files/usr-my.cnf - create: False - watch_in: - service: mysqld diff --git a/mysql/user.sls b/mysql/user.sls index 0b2fa18..d777a49 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -1,4 +1,4 @@ -{% from "mysql/defaults.yaml" import rawmap with context %} +{% from tpldir ~ "/defaults.yaml" import rawmap with context %} {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} {%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} {%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} @@ -10,7 +10,7 @@ {% set user_hosts = [] %} include: - - mysql.python + - .python {% for name, user in salt['pillar.get']('mysql:user', {}).items() %} diff --git a/pillar.example b/pillar.example index 6b059d2..edde7f9 100644 --- a/pillar.example +++ b/pillar.example @@ -58,23 +58,23 @@ mysql: schema: foo: load: True - source: salt://mysql/files/foo.schema + source: salt://{{ tpldir }}/files/foo.schema bar: load: False baz: load: True - source: salt://mysql/files/baz.schema.tmpl + source: salt://{{ tpldir }}/files/baz.schema.tmpl template: jinja qux: load: True - source: salt://mysql/files/qux.schema.tmpl + source: salt://{{ tpldir }}/files/qux.schema.tmpl template: jinja context: encabulator: Turbo girdlespring: differential quux: load: True - source: salt://mysql/files/qux.schema.tmpl + source: salt://{{ tpldir }}/files/qux.schema.tmpl template: jinja context: encabulator: Retro From 2b55567b9d20a5999678c83a84f0c450facb032c Mon Sep 17 00:00:00 2001 From: "Marius B. Kotsbak" Date: Sat, 23 Jun 2018 16:37:25 +0200 Subject: [PATCH 023/139] Use tpldir for template files too Using tpldir sent to templates through context. --- mysql/config.sls | 10 ++++++++++ mysql/files/client.cnf | 4 ++-- mysql/files/galera.cnf | 4 ++-- mysql/files/my-include.cnf | 4 ++-- mysql/files/my.cnf | 4 ++-- mysql/files/mysql-clients.cnf | 4 ++-- mysql/files/server.cnf | 4 ++-- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/mysql/config.sls b/mysql/config.sls index 2f40051..20757da 100644 --- a/mysql/config.sls +++ b/mysql/config.sls @@ -20,6 +20,8 @@ mysql_server_config: - template: jinja - source: salt://{{ tpldir }}/files/server.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -33,6 +35,8 @@ mysql_galera_config: - template: jinja - source: salt://{{ tpldir }}/files/galera.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -46,6 +50,8 @@ mysql_library_config: - template: jinja - source: salt://{{ tpldir }}/files/client.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -59,6 +65,8 @@ mysql_clients_config: - template: jinja - source: salt://{{ tpldir }}/files/mysql-clients.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -76,6 +84,8 @@ mysql_config: {% else %} - source: salt://{{ tpldir }}/files/my.cnf {% endif %} + - context: + tpldir: {{ tpldir }} {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root diff --git a/mysql/files/client.cnf b/mysql/files/client.cnf index 0dee293..5e78100 100644 --- a/mysql/files/client.cnf +++ b/mysql/files/client.cnf @@ -4,8 +4,8 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} +{%- from tpldir ~ "/defaults.yaml" import rawmap with context -%} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:library:lookup')) -%} {#- ===== COMBINE DATA ===== diff --git a/mysql/files/galera.cnf b/mysql/files/galera.cnf index 982dafd..b6e1c0e 100644 --- a/mysql/files/galera.cnf +++ b/mysql/files/galera.cnf @@ -4,8 +4,8 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} +{%- from tpldir ~ "/defaults.yaml" import rawmap with context -%} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:galera:lookup')) -%} {#- ===== COMBINE DATA ===== diff --git a/mysql/files/my-include.cnf b/mysql/files/my-include.cnf index 5e65b7c..96a441a 100644 --- a/mysql/files/my-include.cnf +++ b/mysql/files/my-include.cnf @@ -4,8 +4,8 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} +{%- from tpldir ~ "/defaults.yaml" import rawmap with context -%} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:global:lookup')) -%} {#- ===== COMBINE DATA ===== diff --git a/mysql/files/my.cnf b/mysql/files/my.cnf index f36b633..c0594e2 100644 --- a/mysql/files/my.cnf +++ b/mysql/files/my.cnf @@ -4,8 +4,8 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} +{%- from tpldir ~ "/defaults.yaml" import rawmap with context -%} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) -%} {#- ===== COMBINE DATA ===== diff --git a/mysql/files/mysql-clients.cnf b/mysql/files/mysql-clients.cnf index d56177a..a148c2d 100644 --- a/mysql/files/mysql-clients.cnf +++ b/mysql/files/mysql-clients.cnf @@ -4,8 +4,8 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} +{%- from tpldir ~ "/defaults.yaml" import rawmap with context -%} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:clients:lookup')) -%} {#- ===== COMBINE DATA ===== diff --git a/mysql/files/server.cnf b/mysql/files/server.cnf index abd6b5b..cc7440f 100644 --- a/mysql/files/server.cnf +++ b/mysql/files/server.cnf @@ -4,8 +4,8 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} +{%- from tpldir ~ "/defaults.yaml" import rawmap with context -%} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) -%} {#- ===== COMBINE DATA ===== From 1e826ea4876d1808017ba1ec287f0eaee53aeff1 Mon Sep 17 00:00:00 2001 From: N Date: Sun, 24 Jun 2018 14:37:18 +0100 Subject: [PATCH 024/139] Introduce standardized mapping files --- mysql/client.sls | 5 +- mysql/config.sls | 13 +- mysql/database.sls | 3 +- mysql/defaults.yaml | 423 ++-------------------------------- mysql/dev.sls | 5 +- mysql/disabled.sls | 3 +- mysql/files/client.cnf | 11 +- mysql/files/galera.cnf | 11 +- mysql/files/my-include.cnf | 13 +- mysql/files/my.cnf | 11 +- mysql/files/mysql-clients.cnf | 11 +- mysql/files/server.cnf | 11 +- mysql/map.jinja | 17 ++ mysql/osfamilymap.yaml | 266 +++++++++++++++++++++ mysql/osmap.yaml | 79 +++++++ mysql/python.sls | 5 +- mysql/repo.sls | 7 +- mysql/server.sls | 21 +- mysql/user.sls | 3 +- 19 files changed, 443 insertions(+), 475 deletions(-) create mode 100644 mysql/map.jinja create mode 100644 mysql/osfamilymap.yaml create mode 100644 mysql/osmap.yaml diff --git a/mysql/client.sls b/mysql/client.sls index 27ede1a..92f9ee3 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,9 +1,8 @@ include: - .config -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} mysql: pkg.installed: - - name: {{ mysql.client }} + - name: {{ mysql.clientpkg }} diff --git a/mysql/config.sls b/mysql/config.sls index 2f40051..993c94b 100644 --- a/mysql/config.sls +++ b/mysql/config.sls @@ -1,5 +1,4 @@ -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} {% set os_family = salt['grains.get']('os_family', None) %} {% if "config_directory" in mysql %} @@ -20,6 +19,8 @@ mysql_server_config: - template: jinja - source: salt://{{ tpldir }}/files/server.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -33,6 +34,8 @@ mysql_galera_config: - template: jinja - source: salt://{{ tpldir }}/files/galera.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -46,6 +49,8 @@ mysql_library_config: - template: jinja - source: salt://{{ tpldir }}/files/client.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -59,6 +64,8 @@ mysql_clients_config: - template: jinja - source: salt://{{ tpldir }}/files/mysql-clients.cnf {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + - context: + tpldir: {{ tpldir }} - user: root - group: root - mode: 644 @@ -76,6 +83,8 @@ mysql_config: {% else %} - source: salt://{{ tpldir }}/files/my.cnf {% endif %} + - context: + tpldir: {{ tpldir }} {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root diff --git a/mysql/database.sls b/mysql/database.sls index 6966b8b..977a052 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -1,5 +1,4 @@ -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} {% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} {% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index b1319db..d189904 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -1,422 +1,33 @@ # vim: sts=2 ts=2 sw=2 et ai # -# SET ALL PARAMS IN CONFIG SECTION USING UNDERSCORE, NOT HYPHEN -# so that it works correctly -{% load_yaml as rawmap %} -Ubuntu: - server: mysql-server - client: mysql-client +mysql: + serverpkg: mysql-server + clientpkg: mysql-client service: mysql - python: python-mysqldb + pythonpkg: python-mysqldb + devpkg: mysql-devel debconf_utils: debconf-utils - dev: libmysqlclient-dev + config: file: /etc/mysql/my.cnf sections: client: port: 3306 socket: /var/run/mysqld/mysqld.sock - mysqld_safe: - socket: /var/run/mysqld/mysqld.sock - nice: 0 + mysqld_safe: {} mysqld: user: mysql - pid_file: /var/run/mysqld/mysqld.pid socket: /var/run/mysqld/mysqld.sock port: 3306 - basedir: /usr datadir: /var/lib/mysql - tmpdir: /tmp - lc_messages_dir: /usr/share/mysql - skip_external_locking: noarg_present - bind_address: 127.0.0.1 - key_buffer_size: 16M - max_allowed_packet: 16M - thread_stack: 192K - thread_cache_size: 8 - query_cache_limit: 1M - query_cache_size: 16M - log_error: /var/log/mysql/error.log - expire_logs_days: 10 - max_binlog_size: 100M - mysqldump: - quick: noarg_present - quote_names: noarg_present - max_allowed_packet: 16M - isamchk: - key_buffer_size: 16M - append: | - !includedir /etc/mysql/conf.d/ -Debian: - {%- if salt['grains.get']('osmajorrelease')|int >= 9 %} - {% set mysql_engine = 'mariadb' %} - {% set mysql_service = 'mysql' %} - {%- else %} - {% set mysql_engine = 'mysql' %} - {% set mysql_service = 'mysql' %} - {%- endif %} - server: {{ mysql_engine }}-server - service: {{ mysql_service }} - client: {{ mysql_engine }}-client - python: python-mysqldb - debconf_utils: debconf-utils - dev: lib{{ mysql_engine }}client-dev - config: - file: /etc/mysql/my.cnf - sections: - client: - port: 3306 - socket: /var/run/mysqld/mysqld.sock - mysqld_safe: - socket: /var/run/mysqld/mysqld.sock - nice: 0 - mysqld: - user: mysql - pid_file: /var/run/mysqld/mysqld.pid - socket: /var/run/mysqld/mysqld.sock - port: 3306 - basedir: /usr - datadir: /var/lib/mysql - tmpdir: /tmp - lc_messages_dir: /usr/share/mysql - skip_external_locking: noarg_present - bind_address: 127.0.0.1 - key_buffer_size: 16M - max_allowed_packet: 16M - thread_stack: 192K - thread_cache_size: 8 - query_cache_limit: 1M - query_cache_size: 16M - expire_logs_days: 10 - max_binlog_size: 100M - mysqldump: - quick: noarg_present - quote_names: noarg_present - max_allowed_packet: 16M - isamchk: - key_buffer_size: 16M - append: | - !includedir /etc/mysql/conf.d/ - # {% if salt['grains.get']('osmajorrelease')|int >= 9 -%} - # !includedir /etc/mysql/mariadb.conf.d/ - # {%- endif %} -CentOS: - # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if salt['grains.get']('osmajorrelease')|int in [7] %} - {% set mysql_engine = 'mariadb' %} - {% set mysql_service = 'mariadb' %} - {%- else %} - {% set mysql_engine = 'mysql' %} - {% set mysql_service = 'mysqld' %} - {%- endif %} - - server: {{ mysql_engine }}-server - service: {{ mysql_service }} - client: {{ mysql_engine }} - python: MySQL-python - dev: {{ mysql_engine }}-devel - config_directory: /etc/my.cnf.d/ - config: - file: /etc/my.cnf - server_config: - file: server.cnf - sections: - mysqld_safe: - log_error: /var/log/{{ mysql_engine }}/mysqld.log - pid_file: /var/run/{{ mysql_engine }}/mysqld.pid - mysqld: - datadir: /var/lib/mysql - socket: /var/lib/mysql/mysql.sock - user: mysql - port: 3306 - bind_address: 127.0.0.1 - symbolic_links: 0 -RedHat: - # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if salt['grains.get']('osmajorrelease')|int in [7] %} - {% set mysql_engine = 'mariadb' %} - {% set mysql_service = 'mariadb' %} - {%- else %} - {% set mysql_engine = 'mysql' %} - {% set mysql_service = 'mysqld' %} - {%- endif %} - - server: {{ mysql_engine }}-server - service: {{ mysql_service }} - client: {{ mysql_engine }} - python: MySQL-python - dev: {{ mysql_engine }}-devel - config: - file: /etc/my.cnf - sections: - mysqld_safe: - log_error: /var/log/{{ mysql_engine }}/mysqld.log - pid_file: /var/run/{{ mysql_engine }}/mysqld.pid - mysqld: - datadir: /var/lib/mysql - socket: /var/lib/mysql/mysql.sock - user: mysql - port: 3306 - bind_address: 127.0.0.1 - symbolic_links: 0 -Fedora: - server: mariadb-server - client: mariadb - service: mariadb - python: python2-mysql - config_directory: /etc/my.cnf.d/ - config: - file: /etc/my.cnf - server_config: - file: server.cnf - sections: - mysqld_safe: - log_error: /var/log/mysqld.log - pid_file: /var/run/mysqld/mysqld.pid - mysqld: - datadir: /var/lib/mysql - socket: /var/lib/mysql/mysql.sock - user: mysql - port: 3306 - bind_address: 127.0.0.1 - symbolic_links: 0 - galera_config: - file: galera.cnf - sections: - mysqld: - binlog_format: ROW - default-storage-engine: innodb - innodb_autoinc_lock_mode: 2 - bind-address: 0.0.0.0 - wsrep_provider: /usr/lib64/galera/libgalera_smm.so - wsrep_cluster_name: "my_wsrep_cluster" - wsrep_slave_threads: 1 - wsrep_certify_nonPK: 1 - wsrep_max_ws_rows: 131072 - wsrep_max_ws_size: 1073741824 - wsrep_debug: 0 - wsrep_convert_LOCK_to_trx: 0 - wsrep_retry_autocommit: 1 - wsrep_auto_increment_control: 1 - wsrep_drupal_282555_workaround: 0 - wsrep_causal_reads: 0 - wsrep_sst_method: rsync - wsrep_sst_auth: "root:" - -SUSE: - server: mariadb - client: mariadb-client - service: mysql - {%- if salt['grains.get']('osmajorrelease')|int == 42 %} - # "old" package name up to Leap 42.x - python: python-PyMySQL - {% else %} - python: python2-pymysql - {% endif %} - config: - file: /etc/my.cnf - sections: - client: - port: 3306 - socket: /var/run/mysql/mysql.sock - mysqld: - innodb_file_format: Barracuda - innodb_file_per_table: ON - server-id: 1 - sql_mode: NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES - mysqld_multi: - mysqld: /usr/bin/mysqld_safe - mysqladmin: /usr/bin/mysqladmin - log: /var/log/mysqld_multi.log - append: | - !includedir /etc/my.cnf.d - -Arch: - server: mariadb - client: mariadb-clients - service: mysqld - python: mysql-python - config: - file: /etc/mysql/my.cnf - sections: - client: - port: 3306 - socket: /run/mysqld/mysqld.sock - - mysqld: - datadir: /var/lib/mysql - socket: /run/mysqld/mysqld.sock - user: mysql - port: 3306 - symbolic_links: 0 - log-bin: mysql-bin - key_buffer_size: 16M - max_allowed_packet: 1M - table_open_cache: 64 - sort_buffer_size: 512K - net_buffer_length: 8K - read_buffer_size: 256K - read_rnd_buffer_size: 512K - myisam_sort_buffer_size: 8M - binlog_format: mixed - server-id: 1 - skip-external-locking: noarg_present - - mysqldump: - max_allowed_packet: 16M - quick: noarg_present - - mysql: - no-auto-rehash: noarg_present - - myisamchk: - key_buffer_size: 20M - sort_buffer_size: 20M - read_buffer: 2M - write_buffer: 2M - - mysqlhotcopy: - interactive-timeout: noarg_present - -Amazon: - server: mysql-server - client: mysql - service: mysqld - python: MySQL-python - dev: mysql-devel - config: - file: /etc/my.cnf - sections: - mysqld_safe: - log_error: /var/log/mysqld.log - pid_file: /var/run/mysqld/mysqld.pid - mysqld: - datadir: /var/lib/mysql - socket: /var/lib/mysql/mysql.sock - user: mysql - port: 3306 - bind_address: 127.0.0.1 - symbolic_links: 0 -Gentoo: - server: dev-db/mysql - client: dev-db/mysql - service: mysql - python: dev-python/mysql-python - dev: dev-db/mysqlced - config: - file: /etc/mysql/my.cnf - sections: - client: - port: 3306 - socket: /var/run/mysqld/mysqld.sock - mysql: - character_sets_dir: /usr/share/mysql/charsets - default_character_set: utf8 - mysqladmin: - character_sets_dir: /usr/share/mysql/charsets - default_character_set: utf8 - mysqlcheck: - character_sets_dir: /usr/share/mysql/charsets - default_character_set: utf8 - mysqldump: - character_sets_dir: /usr/share/mysql/charsets - default_character_set: utf8 - quick: noarg_present - max_allowed_packet: 16M - mysqlimport: - character_sets_dir: /usr/share/mysql/charsets - default_character_set: utf8 - mysqlshow: - character_sets_dir: /usr/share/mysql/charsets - default_character_set: utf8 - myisamchk: - character_sets_dir: /usr/share/mysql/charsets - key_buffer: 20M - sort_buffer_size: 20M - read_buffer: 2M - write_buffer: 2M - myisampack: - character_sets_dir: /usr/share/mysql/charsets - mysqld_safe: - err_log: /var/log/mysql/mysql.err - mysqld: - character_set_server: utf8 - user: mysql - port: 3306 - socket: /var/run/mysqld/mysqld.sock - # note: on gentoo the init.d script specifically relies on the variable called pid-file, so don't use the underscore - pid-file: /var/run/mysqld/mysqld.pid - log_error: /var/log/mysql/mysqld.err - basedir: /usr - datadir: /var/lib/mysql - skip_external_locking: noarg_present - key_buffer_size: 16M - max_allowed_packet: 1M - table_open_cache: 64 - sort_buffer_size: 512K - net_buffer_length: 8K - read_buffer_size: 256K - read_rnd_buffer_size: 512K - myisam_sort_buffer_size: 8M - language: /usr/share/mysql/english - bind_address: 127.0.0.1 - log_bin: noarg_present - server_id: 1 - tmpdir: /tmp/ - innodb_buffer_pool_size: 16M - innodb_additional_mem_pool_size: 2M - innodb_data_file_path: ibdata1:10M:autoextend:max:128M - innodb_log_file_size: 5M - innodb_log_buffer_size: 8M - innodb_log_files_in_group: 2 - innodb_flush_log_at_trx_commit: 1 - innodb_lock_wait_timeout: 50 - innodb_file_per_table: noarg_present - isamchk: - key_buffer: 20M - sort_buffer_size: 20M - read_buffer: 2M - write_buffer: 2M - mysqlhotcopy: - interactive_timeout: noarg_present -FreeBSD: - server: mysql56-server - client: mysql56-client - service: mysql-server - python: py27-pymysql - dev: mysql56-server - config: - file: /usr/local/etc/my.cnf - sections: - client: - port: 3306 - socket: /tmp/mysql.sock - mysqld: - port: 3306 - socket: /tmp/mysql.sock - skip-external-locking: noarg_present - key_buffer_size: 16M - max_allowed_packet: 1M - table_open_cache: 64 - sort_buffer_size: 512K - net_buffer_length: 8K - read_buffer_size: 256K - read_rnd_buffer_size: 512K - myisam_sort_buffer_size: 8M - log-bin: mysql-bin - binlog_format: mixed - server-id: 1 - mysqldump: - quick: noarg_present - max_allowed_packet: 16M - mysql: - no-auto-rehash: noarg_present - myisamchk: - key_buffer_size: 20M - sort_buffer_size: 20M - read_buffer: 2M - write_buffer: 2M - mysqlhotcopy: - interactive-timeout: noarg_present -{% endload %} + #The following dict names are reserved for pillar data (see pillar.example) + global: {} + clients: {} + library: {} + server: {} + salt_user: {} + database: {} + schema: {} + user: {} + dev: {} diff --git a/mysql/dev.sls b/mysql/dev.sls index d3606db..e1dd90b 100644 --- a/mysql/dev.sls +++ b/mysql/dev.sls @@ -1,7 +1,6 @@ -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} mysql_dev: pkg: - installed - - name: {{ mysql.dev }} + - name: {{ mysql.devpkg }} diff --git a/mysql/disabled.sls b/mysql/disabled.sls index 808ec37..fde0478 100644 --- a/mysql/disabled.sls +++ b/mysql/disabled.sls @@ -1,5 +1,4 @@ -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} mysql: service.dead: diff --git a/mysql/files/client.cnf b/mysql/files/client.cnf index 0dee293..6374042 100644 --- a/mysql/files/client.cnf +++ b/mysql/files/client.cnf @@ -4,15 +4,14 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} -{%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:library:lookup')) -%} +{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {#- ===== COMBINE DATA ===== -#} -{%- set goodParamList = datamap.library_config.sections -%} +{%- set goodParamList = mysql.library_config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = datamap.library_config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.library_config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:library:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} @@ -37,4 +36,4 @@ {%- endif -%} {%- endfor %} -{{ datamap.library_config.append | default('') }} +{{ mysql.library_config.append | default('') }} diff --git a/mysql/files/galera.cnf b/mysql/files/galera.cnf index 982dafd..d4736cf 100644 --- a/mysql/files/galera.cnf +++ b/mysql/files/galera.cnf @@ -4,15 +4,14 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} -{%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:galera:lookup')) -%} +{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {#- ===== COMBINE DATA ===== -#} -{%- set goodParamList = datamap.galera_config.sections -%} +{%- set goodParamList = mysql.galera_config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = datamap.galera_config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.galera_config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:galera:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} @@ -39,4 +38,4 @@ {%- endif -%} {%- endfor %} -{{ datamap.galera_config.append | default('') }} +{{ mysql.galera_config.append | default('') }} diff --git a/mysql/files/my-include.cnf b/mysql/files/my-include.cnf index 5e65b7c..eed0551 100644 --- a/mysql/files/my-include.cnf +++ b/mysql/files/my-include.cnf @@ -4,16 +4,15 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} -{%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:global:lookup')) -%} +{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {#- ===== COMBINE DATA ===== -#} -{%- if "sections" in datamap.config -%} -{%- set goodParamList = datamap.config.sections -%} +{%- if "sections" in mysql.config -%} +{%- set goodParamList = mysql.config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = datamap.config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:global:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} @@ -44,4 +43,4 @@ # # include all files from the config directory # -!includedir {{ datamap.config_directory }} +!includedir {{ mysql.config_directory }} diff --git a/mysql/files/my.cnf b/mysql/files/my.cnf index f36b633..b4882bd 100644 --- a/mysql/files/my.cnf +++ b/mysql/files/my.cnf @@ -4,15 +4,14 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} -{%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) -%} +{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {#- ===== COMBINE DATA ===== -#} -{%- set goodParamList = datamap.config.sections -%} +{%- set goodParamList = mysql.config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = datamap.config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:server:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} @@ -43,4 +42,4 @@ {%- endif -%} {%- endfor %} -{{ datamap.config.append | default('') }} +{{ mysql.config.append | default('') }} diff --git a/mysql/files/mysql-clients.cnf b/mysql/files/mysql-clients.cnf index d56177a..3840f84 100644 --- a/mysql/files/mysql-clients.cnf +++ b/mysql/files/mysql-clients.cnf @@ -4,15 +4,14 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} -{%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:clients:lookup')) -%} +{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {#- ===== COMBINE DATA ===== -#} -{%- set goodParamList = datamap.clients_config.sections -%} +{%- set goodParamList = mysql.clients_config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = datamap.clients_config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.clients_config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:clients:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} @@ -37,4 +36,4 @@ {%- endif -%} {%- endfor %} -{{ datamap.clients_config.append | default('') }} +{{ mysql.clients_config.append | default('') }} diff --git a/mysql/files/server.cnf b/mysql/files/server.cnf index abd6b5b..0ed6ce6 100644 --- a/mysql/files/server.cnf +++ b/mysql/files/server.cnf @@ -4,15 +4,14 @@ {#- ===== FETCH DATA ===== -#} -{%- from "mysql/defaults.yaml" import rawmap with context -%} -{%- from "mysql/supported_sections.yaml" import supported_sections with context -%} -{%- set datamap = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) -%} +{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/supported_sections.yaml" import supported_sections with context -%} {#- ===== COMBINE DATA ===== -#} -{%- set goodParamList = datamap.server_config.sections -%} +{%- set goodParamList = mysql.server_config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = datamap.server_config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.server_config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:server:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} @@ -39,4 +38,4 @@ {%- endif -%} {%- endfor %} -{{ datamap.server_config.append | default('') }} +{{ mysql.server_config.append | default('') }} diff --git a/mysql/map.jinja b/mysql/map.jinja new file mode 100644 index 0000000..5d6bfa8 --- /dev/null +++ b/mysql/map.jinja @@ -0,0 +1,17 @@ +{% import_yaml "mysql/defaults.yaml" as defaults %} +{% import_yaml "mysql/osfamilymap.yaml" as osfamilymap %} +{% import_yaml "mysql/osmap.yaml" as osmap %} + +{% set mysql = salt['grains.filter_by']( + defaults, + merge=salt['grains.filter_by']( + osfamilymap, + grain='os_family', + merge=salt['grains.filter_by']( + osmap, + grain='os', + merge=salt['pillar.get']('mysql', {}), + ), + ), + base='mysql', +) %} diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml new file mode 100644 index 0000000..5f8e5a3 --- /dev/null +++ b/mysql/osfamilymap.yaml @@ -0,0 +1,266 @@ +# vim: sts=2 ts=2 sw=2 et ai +# + +Debian: + {% if salt['grains.get']('osmajorrelease')|int >= 9 %} + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb-client + devpkg: libmariadbclient-dev + {% else %} + devpkg: libmysqlclient-dev + {% endif %} + + config: + sections: + mysqld_safe: + socket: /var/run/mysqld/mysqld.sock + nice: 0 + mysqld: + pid_file: /var/run/mysqld/mysqld.pid + basedir: /usr + tmpdir: /tmp + lc_messages_dir: /usr/share/mysql + skip_external_locking: noarg_present + bind_address: 127.0.0.1 + key_buffer_size: 16M + max_allowed_packet: 16M + thread_stack: 192K + thread_cache_size: 8 + query_cache_limit: 1M + query_cache_size: 16M + expire_logs_days: 10 + max_binlog_size: 100M + #innodb_flush_log_at_trx_commit: 1 + #innodb_lock_wait_timeout: 50 + #innodb_file_per_table: noarg_present + mysqldump: + quick: noarg_present + quote_names: noarg_present + max_allowed_packet: 16M + isamchk: + key_buffer_size: 16M + append: | + !includedir /etc/mysql/conf.d/ + # {% if salt['grains.get']('osmajorrelease')|int >= 9 -%} + # !includedir /etc/mysql/mariadb.conf.d/ + # {%- endif %} + +RedHat: + #https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look + {%- if salt['grains.get']('osmajorrelease')|int in [7] %} + {% set fork = 'mariadb' %} + serverpkg: mariadb-server + service: mariadb + devpkg: mariadb-devel + {%- else %} + {% set fork = 'mysql' %} + service: mysqld + {%- endif %} + + clientpkg: {{ fork }} + pythonpkg: MySQL-python + config: + file: /etc/my.cnf + sections: + client: + mysqld_safe: + log_error: /var/log/{{ fork }}/mysqld.log + pid_file: /var/run/{{ fork }}/mysqld.pid + mysqld: + socket: /var/lib/mysql/mysql.sock + bind_address: 127.0.0.1 + symbolic_links: 0 + +SUSE: + serverpkg: mariadb + clientpkg: mariadb-client + {%- if salt['grains.get']('osmajorrelease')|int == 42 %} + # "old" package name up to Leap 42.x + pythonpkg: python-PyMySQL + {% else %} + pythonpkg: python2-pymysql + {% endif %} + + config: + file: /etc/my.cnf + sections: + client: + socket: /var/run/mysql/mysql.sock + mysqld: + port: + user: + socket: + datadir: + tmpdir: + innodb_file_format: Barracuda + innodb_file_per_table: ON + server-id: 1 + sql_mode: NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + mysqld_multi: + mysqld: /usr/bin/mysqld_safe + mysqladmin: /usr/bin/mysqladmin + log: /var/log/mysqld_multi.log + append: | + !includedir /etc/my.cnf.d + +Arch: + serverpkg: mariadb + clientpkg: mariadb-clients + service: mysqld + pythonpkg: mysql-python + dev: + + config: + sections: + client: + socket: /run/mysqld/mysqld.sock + mysqld: + datadir: /var/lib/mysql + socket: /run/mysqld/mysqld.sock + symbolic_links: 0 + log-bin: mysql-bin + key_buffer_size: 16M + max_allowed_packet: 1M + table_open_cache: 64 + sort_buffer_size: 512K + net_buffer_length: 8K + read_buffer_size: 256K + read_rnd_buffer_size: 512K + myisam_sort_buffer_size: 8M + binlog_format: mixed + server-id: 1 + skip-external-locking: noarg_present + + mysqldump: + max_allowed_packet: 16M + quick: noarg_present + + mysql: + no-auto-rehash: noarg_present + + myisamchk: + key_buffer_size: 20M + sort_buffer_size: 20M + read_buffer: 2M + write_buffer: 2M + + mysqlhotcopy: + interactive-timeout: noarg_present + +Gentoo: + serverpkg: dev-db/mysql + clientpkg: dev-db/mysql + pythonpkg: dev-python/mysql-python + devpkg: dev-db/mysqlced + + config: + sections: + mysql: + character_sets_dir: /usr/share/mysql/charsets + default_character_set: utf8 + mysqladmin: + character_sets_dir: /usr/share/mysql/charsets + default_character_set: utf8 + mysqlcheck: + character_sets_dir: /usr/share/mysql/charsets + default_character_set: utf8 + mysqldump: + character_sets_dir: /usr/share/mysql/charsets + default_character_set: utf8 + quick: noarg_present + max_allowed_packet: 16M + mysqlimport: + character_sets_dir: /usr/share/mysql/charsets + default_character_set: utf8 + mysqlshow: + character_sets_dir: /usr/share/mysql/charsets + default_character_set: utf8 + myisamchk: + character_sets_dir: /usr/share/mysql/charsets + key_buffer: 20M ##????? key_buffer_size ? + sort_buffer_size: 20M + read_buffer: 2M + write_buffer: 2M + myisampack: + character_sets_dir: /usr/share/mysql/charsets + mysqld_safe: + err_log: /var/log/mysql/mysql.err + mysqld: + character_set_serverpkg: utf8 + # note: the gentoo init.d script specifically needs pid-file (dash not underscore) + pid-file: /var/run/mysqld/mysqld.pid + log_error: /var/log/mysql/mysqld.err + basedir: /usr + datadir: /var/lib/mysql + skip_external_locking: noarg_present + key_buffer_size: 16M + max_allowed_packet: 1M + table_open_cache: 64 + sort_buffer_size: 512K + net_buffer_length: 8K + read_buffer_size: 256K + read_rnd_buffer_size: 512K + myisam_sort_buffer_size: 8M + language: /usr/share/mysql/english + bind_address: 127.0.0.1 + log_bin: noarg_present + server_id: 1 + tmpdir: /tmp + innodb_buffer_pool_size: 16M + innodb_additional_mem_pool_size: 2M + innodb_data_file_path: ibdata1:10M:autoextend:max:128M + innodb_log_file_size: 5M + innodb_log_buffer_size: 8M + innodb_log_files_in_group: 2 + innodb_flush_log_at_trx_commit: 1 + innodb_lock_wait_timeout: 50 + innodb_file_per_table: noarg_present + isamchk: + key_buffer: 20M ##????? key_buffer_size ? + sort_buffer_size: 20M + read_buffer: 2M + write_buffer: 2M + mysqlhotcopy: + interactive_timeout: noarg_present + +FreeBSD: + serverpkg: mysql56-server + clientpkg: mysql56-client + service: mysql-server + pythonpkg: py27-pymysql + devpkg: mysql56-server + + config: + file: /usr/local/etc/my.cnf + sections: + client: + socket: /tmp/mysql.sock + mysqld: + user: + datadir: + socket: /tmp/mysql.sock + skip-external-locking: noarg_present + key_buffer_size: 16M + max_allowed_packet: 1M + table_open_cache: 64 + sort_buffer_size: 512K + net_buffer_length: 8K + read_buffer_size: 256K + read_rnd_buffer_size: 512K + myisam_sort_buffer_size: 8M + log-bin: mysql-bin + binlog_format: mixed + server-id: 1 + mysqldump: + quick: noarg_present + max_allowed_packet: 16M + mysql: + no-auto-rehash: noarg_present + myisamchk: + key_buffer_size: 20M + sort_buffer_size: 20M + read_buffer: 2M + write_buffer: 2M + mysqlhotcopy: + interactive-timeout: noarg_present diff --git a/mysql/osmap.yaml b/mysql/osmap.yaml new file mode 100644 index 0000000..29fd16f --- /dev/null +++ b/mysql/osmap.yaml @@ -0,0 +1,79 @@ +# vim: ft=sls +# vim: sts=2 ts=2 sw=2 et ai + +Ubuntu: + service: mysql + devpkg: libmysqlclient-dev + config: + sections: + mysqld: + tmpdir: /tmp + log_error: /var/log/mysql/error.log + append: | + !includedir /etc/mysql/conf.d/ + +CentOS: + # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look + {%- if salt['grains.get']('osmajorrelease')|int in [7] %} + {% set fork = 'mariadb' %} + {% set service = 'mariadb' %} + {%- else %} + {% set fork = 'mysql' %} + {% set service = 'mysqld' %} + {%- endif %} + + config_directory: /etc/my.cnf.d/ + server_config: + file: server.cnf + sections: + mysqld_safe: + log_error: /var/log/{{ fork }}/mysqld.log + pid_file: /var/run/{{ fork }}/mysqld.pid + mysqld: + socket: /var/lib/mysql/mysql.sock + bind_address: 127.0.0.1 + +Fedora: + serverpkg: mariadb-server + clientpkg: mariadb + service: mariadb + pythonpkg: python2-mysql + config_directory: /etc/my.cnf.d/ + + server_config: + file: server.cnf + sections: + mysqld_safe: + log_error: /var/log/mariadb/mariadb.log + pid_file: /var/lib/mysql/mysql.pid + mysqld: + socket: /var/lib/mysql/mysql.sock + bind_address: 127.0.0.1 + + galera_config: + file: galera.cnf + sections: + mysqld: + bind-address: 0.0.0.0 + binlog_format: ROW + default-storage-engine: innodb + innodb_autoinc_lock_mode: 2 + wsrep_provider: /usr/lib64/galera/libgalera_smm.so + wsrep_cluster_name: "my_wsrep_cluster" + wsrep_slave_threads: 1 + wsrep_certify_nonPK: 1 + wsrep_max_ws_rows: 131072 + wsrep_max_ws_size: 1073741824 + wsrep_debug: 0 + wsrep_convert_LOCK_to_trx: 0 + wsrep_retry_autocommit: 1 + wsrep_auto_increment_control: 1 + wsrep_drupal_282555_workaround: 0 + wsrep_causal_reads: 0 + wsrep_sst_method: rsync + wsrep_sst_auth: "root:" + +Amazon: + clientpkg: mysql + service: mysqld + pythonpkg: MySQL-python diff --git a/mysql/python.sls b/mysql/python.sls index eea84be..cecc83f 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -1,6 +1,5 @@ -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} mysql_python: pkg.installed: - - name: {{ mysql.python }} + - name: {{ mysql.pythonpkg }} diff --git a/mysql/repo.sls b/mysql/repo.sls index 7ff3f25..c3f4ff9 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -1,8 +1,7 @@ include: - .config -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} # Completely ignore non-RHEL based systems # TODO: Add Debian and Suse systems. @@ -40,10 +39,10 @@ mysql57_community_release: - file: install_pubkey_mysql - require_in: {% if "server_config" in mysql %} - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} {% endif %} {% if "clients_config" in mysql %} - - pkg: {{ mysql.client }} + - pkg: {{ mysql.clientpkg }} {% endif %} set_pubkey_mysql: diff --git a/mysql/server.sls b/mysql/server.sls index 8fc70de..ae81245 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -2,8 +2,7 @@ include: - .config - .python -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} {% set os = salt['grains.get']('os', None) %} {% set os_family = salt['grains.get']('os_family', None) %} @@ -26,7 +25,7 @@ mysql_debconf: - data: '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'} - require_in: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} - require: - pkg: mysql_debconf_utils @@ -38,7 +37,7 @@ mysql_password_debconf: 'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} 'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} - require_in: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} - require: - pkg: mysql_debconf_utils {% endif %} @@ -90,7 +89,7 @@ mysql_install_datadir: - env: - TMPDIR: '/tmp' - require: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} - file: mysql_config - require_in: - service: mysqld @@ -98,7 +97,7 @@ mysql_install_datadir: mysqld-packages: pkg.installed: - - name: {{ mysql.server }} + - name: {{ mysql.serverpkg }} {% if os_family == 'Debian' and mysql_root_password %} - require: - debconf: mysql_debconf @@ -114,7 +113,7 @@ mysql_initialize: - user: root - creates: {{ mysql_datadir}}/mysql/ - require: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} {% endif %} {% if os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %} @@ -126,7 +125,7 @@ mysql_initialize: - group: mysql - makedirs: True - require: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} {% endif %} {% if os_family in ['Gentoo'] %} @@ -136,7 +135,7 @@ mysql_initialize: - user: root - creates: {{ mysql_datadir}}/mysql/ - require: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} {% endif %} mysqld: @@ -144,14 +143,14 @@ mysqld: - name: {{ mysql.service }} - enable: True - require: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} {% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server != 'mariadb-server') or (os_family in ['Gentoo']) %} - cmd: mysql_initialize {% elif os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %} - file: {{ mysql_datadir }} {% endif %} - watch: - - pkg: {{ mysql.server }} + - pkg: {{ mysql.serverpkg }} - file: mysql_config {% if "config_directory" in mysql and "server_config" in mysql %} - file: mysql_server_config diff --git a/mysql/user.sls b/mysql/user.sls index d777a49..16b9b6d 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -1,5 +1,4 @@ -{% from tpldir ~ "/defaults.yaml" import rawmap with context %} -{%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %} +{% from tpldir ~ "/map.jinja" import mysql with context %} {%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} {%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} {%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} From 9c4c136daaa3413ffab32b0049513e1fc8ec3759 Mon Sep 17 00:00:00 2001 From: N Date: Sat, 30 Jun 2018 10:58:16 +0100 Subject: [PATCH 025/139] fix suse os_family grain --- mysql/osfamilymap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index 5f8e5a3..b402d6f 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -72,7 +72,7 @@ RedHat: bind_address: 127.0.0.1 symbolic_links: 0 -SUSE: +Suse: serverpkg: mariadb clientpkg: mariadb-client {%- if salt['grains.get']('osmajorrelease')|int == 42 %} From b8cf841e2956fa254c40f34960e687b0767193b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Fi=C5=A1er?= Date: Mon, 9 Jul 2018 16:51:32 +0200 Subject: [PATCH 026/139] Replaced removed mysql.server with new mysql.serverpkg map property --- mysql/server.sls | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index ae81245..b6ad14c 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -21,9 +21,9 @@ mysql_debconf_utils: mysql_debconf: debconf.set: - - name: {{ mysql.server }} + - name: {{ mysql.serverpkg }} - data: - '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'} + '{{ mysql.serverpkg }}/start_on_boot': {'type': 'boolean', 'value': 'true'} - require_in: - pkg: {{ mysql.serverpkg }} - require: @@ -105,7 +105,7 @@ mysqld-packages: - require_in: - file: mysql_config -{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server != 'mariadb-server' %} +{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg != 'mariadb-server' %} # Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out. mysql_initialize: cmd.run: @@ -116,7 +116,7 @@ mysql_initialize: - pkg: {{ mysql.serverpkg }} {% endif %} -{% if os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %} +{% if os_family in ['RedHat', 'Suse'] and mysql.serverpkg == 'mariadb-server' %} # For MariaDB it's enough to only create the datadir mysql_initialize: file.directory: @@ -131,7 +131,7 @@ mysql_initialize: {% if os_family in ['Gentoo'] %} mysql_initialize: cmd.run: - - name: emerge --config {{ mysql.server }} + - name: emerge --config {{ mysql.serverpkg }} - user: root - creates: {{ mysql_datadir}}/mysql/ - require: @@ -144,9 +144,9 @@ mysqld: - enable: True - require: - pkg: {{ mysql.serverpkg }} -{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server != 'mariadb-server') or (os_family in ['Gentoo']) %} +{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg != 'mariadb-server') or (os_family in ['Gentoo']) %} - cmd: mysql_initialize -{% elif os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %} +{% elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg == 'mariadb-server' %} - file: {{ mysql_datadir }} {% endif %} - watch: From 573f18c36b458b4cac88c41455457269696e85ec Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 5 Sep 2018 23:04:38 +0200 Subject: [PATCH 027/139] cmd.run: use 'runas' instead of 'user' --- mysql/server.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index b6ad14c..a559a8f 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -84,7 +84,7 @@ mysql_install_datadir: {% else %} - name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} {% endif %} - - user: root + - runas: root - creates: {{ mysql_datadir }}/mysql/user.frm - env: - TMPDIR: '/tmp' @@ -110,7 +110,7 @@ mysqld-packages: mysql_initialize: cmd.run: - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} - - user: root + - runas: root - creates: {{ mysql_datadir}}/mysql/ - require: - pkg: {{ mysql.serverpkg }} @@ -132,7 +132,7 @@ mysql_initialize: mysql_initialize: cmd.run: - name: emerge --config {{ mysql.serverpkg }} - - user: root + - runas: root - creates: {{ mysql_datadir}}/mysql/ - require: - pkg: {{ mysql.serverpkg }} From a779417b1a7fe7fa756541962a34bc348679b51d Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 5 Sep 2018 23:21:39 +0200 Subject: [PATCH 028/139] Prevent 'key: None' in config files --- mysql/files/client.cnf | 1 + mysql/files/galera.cnf | 1 + mysql/files/my-include.cnf | 1 + mysql/files/my.cnf | 2 ++ mysql/files/mysql-clients.cnf | 1 + mysql/files/server.cnf | 1 + 6 files changed, 7 insertions(+) diff --git a/mysql/files/client.cnf b/mysql/files/client.cnf index 6374042..292ec1e 100644 --- a/mysql/files/client.cnf +++ b/mysql/files/client.cnf @@ -26,6 +26,7 @@ [{{ sname }}] {%- for mparam, mvalue in sdata.items()|default([])|sort -%} +{%- if mvalue is none %}{% continue %}{% endif -%} {%- set indents = 40 - mparam|count %} {% if mvalue == "noarg_present" -%} {{ mparam }} diff --git a/mysql/files/galera.cnf b/mysql/files/galera.cnf index d4736cf..f3c154c 100644 --- a/mysql/files/galera.cnf +++ b/mysql/files/galera.cnf @@ -26,6 +26,7 @@ [{{ sname }}] {%- for mparam, mvalue in sdata.items()|default([])|sort -%} +{%- if mvalue is none %}{% continue %}{% endif -%} {%- set indents = 40 - mparam|count %} {% if mvalue == "noarg_present" -%} {{ mparam }} diff --git a/mysql/files/my-include.cnf b/mysql/files/my-include.cnf index eed0551..35eff10 100644 --- a/mysql/files/my-include.cnf +++ b/mysql/files/my-include.cnf @@ -30,6 +30,7 @@ [{{ sname }}] {%- for mparam, mvalue in sdata.items()|default([])|sort -%} +{%- if mvalue is none %}{% continue %}{% endif -%} {%- set indents = 40 - mparam|count %} {% if mvalue == "noarg_present" -%} {{ mparam }} diff --git a/mysql/files/my.cnf b/mysql/files/my.cnf index b4882bd..08df151 100644 --- a/mysql/files/my.cnf +++ b/mysql/files/my.cnf @@ -26,12 +26,14 @@ [{{ sname }}] {%- for mparam, mvalue in sdata.items()|default([])|sort -%} +{%- if mvalue is none %}{% continue %}{% endif -%} {%- set indents = 40 - mparam|count %} {% if mvalue == "noarg_present" -%} {{ mparam }} {%- else -%} {%- if mvalue is iterable and mvalue is not string -%} {%- for item in mvalue -%} +{%- if item is none %}{% continue %}{% endif -%} {{ mparam }}{{ '='|indent(indents, true) }} {{ item }} {% endfor -%} {%- else -%} diff --git a/mysql/files/mysql-clients.cnf b/mysql/files/mysql-clients.cnf index 3840f84..345e049 100644 --- a/mysql/files/mysql-clients.cnf +++ b/mysql/files/mysql-clients.cnf @@ -26,6 +26,7 @@ [{{ sname }}] {%- for mparam, mvalue in sdata.items()|default([])|sort -%} +{%- if mvalue is none %}{% continue %}{% endif -%} {%- set indents = 40 - mparam|count %} {% if mvalue == "noarg_present" -%} {{ mparam }} diff --git a/mysql/files/server.cnf b/mysql/files/server.cnf index 0ed6ce6..b7d915b 100644 --- a/mysql/files/server.cnf +++ b/mysql/files/server.cnf @@ -26,6 +26,7 @@ [{{ sname }}] {%- for mparam, mvalue in sdata.items()|default([])|sort -%} +{%- if mvalue is none %}{% continue %}{% endif -%} {%- set indents = 40 - mparam|count %} {% if mvalue == "noarg_present" -%} {{ mparam }} From 96a33374be852697c05bda6328e9b6aba2b2b23d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Thu, 6 Sep 2018 08:49:46 -0300 Subject: [PATCH 029/139] Update testing environment --- .kitchen.yml | 7 +++---- .travis.yml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 89ecf32..b7ac9f4 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -9,11 +9,10 @@ verifier: name: inspec platforms: - - name: ubuntu-12.04 - - name: ubuntu-14.04 - name: ubuntu-16.04 - - name: debian-7 - - name: debian-8 + - name: ubuntu-18.04 + - name: debian-9 + - name: centos-7 provisioner: name: salt_solo diff --git a/.travis.yml b/.travis.yml index 188dbfc..37ac9e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,10 @@ services: docker env: matrix: - - INSTANCE=default-ubuntu-1204 - - INSTANCE=default-ubuntu-1404 - INSTANCE=default-ubuntu-1604 - - INSTANCE=default-debian-7 - - INSTANCE=default-debian-8 + - INSTANCE=default-ubuntu-1804 + - INSTANCE=default-debian-9 + - INSTANCE=centos-7 # https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142455888 before_script: sudo iptables -L DOCKER || sudo iptables -N DOCKER From 4cdc21bc92f8265649209ee7d1bd9f5f6295dacc Mon Sep 17 00:00:00 2001 From: N Date: Mon, 1 Oct 2018 16:35:13 +0100 Subject: [PATCH 030/139] Add install/remove states for MacOS (downloads.mysql.com) --- README.rst | 20 ++++++---- mysql/defaults.yaml | 68 +++++++++++++++++++++++++++++++++ mysql/macos/init.sls | 3 ++ mysql/macos/install.sls | 85 +++++++++++++++++++++++++++++++++++++++++ mysql/macos/remove.sls | 36 +++++++++++++++++ mysql/osmap.yaml | 10 +++++ mysql/server.sls | 7 ++++ pillar.example | 47 +++++++++++++++++++++++ 8 files changed, 269 insertions(+), 7 deletions(-) create mode 100644 mysql/macos/init.sls create mode 100644 mysql/macos/install.sls create mode 100644 mysql/macos/remove.sls diff --git a/README.rst b/README.rst index 111bf10..d1e4f88 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ mysql ===== -Install the MySQL client and/or server. +Install the MySQL client and/or server on Linux and MacOS. .. note:: @@ -18,23 +18,29 @@ Available states ``mysql`` --------- -Meta-state that includes all server packages in the correct order. +Meta-state including all server packages in correct order. This meta-state does **not** include ``mysql.remove_test_database``. -This meta-state does **not** include ``mysql.remove_test_database``; see -below for details. +``mysql.macos`` +---------------- + +Install "MySQL Community Server", "MySQL Workbench", and any other enabled products on MacOS. + +``mysql.macos.remove`` +---------------- + +Remove "MySQL Community Server", "MySQL Workbench", and any other enabled products from MacOS. ``mysql.client`` ---------------- -Install the MySQL client package. +Install the MySQL client package on Linux. ``mysql.server`` ---------------- Install the MySQL server package and start the service. -Debian OS family supports setting MySQL root password during install via -debconf. +Debian OS family supports setting MySQL root password during install via debconf. .. note:: diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index d189904..807c17b 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -21,6 +21,74 @@ mysql: port: 3306 datadir: /var/lib/mysql + macos: + userhomes: /Users + user: + group: + dl: + tmpdir: /tmp/mysqltmp + bindir: /usr/local/bin + opts: -s -L + interval: 60 + retries: 2 + products: + community_server: + enabled: True + url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg + sum: 'md5=602a84390ecf3d82025b1d99fc594124' + dest: /Applications/MySQL.app + isapp: False + workbench: + enabled: True + url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg + sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' + dest: /Applications/MySQLWorkbench.app + cluster: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg + sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' + dest: /Applications/MySQLCluster.app + router: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg + sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' + dest: /Applications/MySQLRouter.app + utilities: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg + sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' + dest: /Applications/MySQLUtilities.app + shell: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg + sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' + dest: /Applications/MySQLShell.app + proxy: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz + sum: 'md5=107df22412aa8c483d2021e1af24ee22' + dest: /opt/mysql/proxy + connnector: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz + sum: 'md5=dece7fe5607918ba68499ef07c31508d' + dest: /opt/mysql/connector/nodejs + forvisualstudio: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip + sum: 'md5=fcf39316505ee2921e31a431eae77a9c' + dest: /opt/mysql/visualstudio + forexcel: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip + sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' + dest: /opt/mysql/excel + notifier: + enabled: False + url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip + sum: 'md5=349f1994681763fd6626a8ddf6be5363' + dest: /opt/mysql/notifier + #The following dict names are reserved for pillar data (see pillar.example) global: {} clients: {} diff --git a/mysql/macos/init.sls b/mysql/macos/init.sls new file mode 100644 index 0000000..dbe2ee1 --- /dev/null +++ b/mysql/macos/init.sls @@ -0,0 +1,3 @@ + +include: + - mysql.macos.install diff --git a/mysql/macos/install.sls b/mysql/macos/install.sls new file mode 100644 index 0000000..8f1e163 --- /dev/null +++ b/mysql/macos/install.sls @@ -0,0 +1,85 @@ +### mysql/macos/install.sls +# -*- coding: utf-8 -*- +# vim: ft=yaml +{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import mysql with context -%} + + {%- set dl = mysql.macos.dl %} + +mysql-macos-extract-dirs: + file.directory: + - name: {{ dl.tmpdir }} + - makedirs: True + - clean: True + + {%- for product, data in mysql.macos.products.items() if data.enabled %} + {%- set archivename = data.url.split('/')[-1]|quote %} + {%- set archiveformat = archivename.split('.')[-1] %} + +mysql-macos-remove-previous-{{ product }}-download-archive: + file.absent: + - name: {{ dl.tmpdir }}/{{ archivename }} + - require_in: + - mysql-macos-download-{{ product }}-archive + +mysql-macos-download-{{ product }}-archive: + pkg.installed: + - name: curl + cmd.run: + - name: curl {{ dl.opts }} -o {{ dl.tmpdir }}/{{ archivename }} {{ data.url }} + {% if grains['saltversioninfo'] >= [2017, 7, 0] %} + - retry: + attempts: {{ dl.retries }} + interval: {{ dl.interval }} + {% endif %} + - require: + - mysql-macos-extract-dirs + + {%- if data.sum %} +mysql-macos-check-{{ product }}-archive-hash: + module.run: + - name: file.check_hash + - path: {{ dl.tmpdir }}/{{ archivename }} + - file_hash: {{ data.sum }} + - onchanges: + - mysql-macos-download-{{ product }}-archive + - require_in: + - mysql-macos-{{ product }}-install + {%- endif %} + +mysql-macos-{{ product }}-install: + {%- if archiveformat in ('dmg',) %} + macpackage.installed: + - name: "{{ dl.tmpdir }}/{{ archivename }}" + - dmg: True + - app: {{ 'True' if "isapp" not in data else data.isapp }} + - force: True + - allow_untrusted: True + - onchanges: + - mysql-macos-download-{{ product }}-archive + - require_in: + - mysql-macos-remove-{{ product }}-archive + file.append: + - name: {{ mysql.macos.userhomes }}/{{ mysql.macos.user }}/.bash_profile + - text: 'export PATH=$PATH:{{ data.dest }}/Contents/Versions/latest/bin' + + {%- elif archiveformat in ('gz', 'zip',) %} + archive.extracted: + - source: file://{{ dl.tmpdir }}{{ archivename }} + - name: {{ dl.bindir }} + - trim_output: True + - source_hash: {{ data.sum }} + - onchanges: + - mysql-macos-download-{{ product }}-archive + - require_in: + - mysql-macos-remove-{{ product }}-archive + + {%- endif %} + +mysql-macos-remove-{{ product }}-archive: + file.absent: + - name: {{ dl.tmpdir }}/{{ archivename }} + - onchanges: + - mysql-macos-download-{{ product }}-archive + + {%- endfor %} + diff --git a/mysql/macos/remove.sls b/mysql/macos/remove.sls new file mode 100644 index 0000000..30fcb53 --- /dev/null +++ b/mysql/macos/remove.sls @@ -0,0 +1,36 @@ +### mysql/macos/remove.sls +# -*- coding: utf-8 -*- +# vim: ft=yaml +{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import mysql with context -%} + + {%- for product, data in mysql.macos.products.items() if data.enabled %} + {%- set archivename = data.url.split('/')[-1] %} + +mysql-macos-{{ product }}-remove-destdir: + file.absent: + - names: + - {{ data.dest }} + + {%- endfor %} + +##https://apple.stackexchange.com/questions/230333/how-could-i-remove-mysql-from-manually-installation-version +##https://community.jaspersoft.com/wiki/uninstall-mysql-mac-os-x +mysql-macos-remove-entry-in-/etc/hostconfig: + file.line: + - name: /etc/hostconfig + - mode: delete + - content: MYSQLCOM=-YES- + - onlyif: test -f /etc/hostconfig + +mysql-macos-remove-mysql-fully: + file.absent: + - names: + - {{ mysql.macos.dl.tmpdir }} + - /usr/local/mysql* + - /Library/PreferencePanes/MySQL.prefPane + - /Library/StartupItems/MySQLCOM + - /Library/Receipts/mysql* + - /Library/Receipts/MySQL* + - /private/var/db/receipts/*mysql* + - /Library/LaunchDaemons/com.oracle.oss.mysql.* + diff --git a/mysql/osmap.yaml b/mysql/osmap.yaml index 29fd16f..37e7d8c 100644 --- a/mysql/osmap.yaml +++ b/mysql/osmap.yaml @@ -1,6 +1,16 @@ # vim: ft=sls # vim: sts=2 ts=2 sw=2 et ai + {% if grains.os == 'MacOS' %} +MacOS: + macos: + user: {{ salt['pillar.get']('mysql:user', salt['cmd.run']("stat -f '%Su' /dev/console")) }} + group: {{ salt['pillar.get']('mysql:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) }} + {% endif %} + +Debian: + service: mysql + Ubuntu: service: mysql devpkg: libmysqlclient-dev diff --git a/mysql/server.sls b/mysql/server.sls index a559a8f..62ef0a0 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -156,6 +156,13 @@ mysqld: - file: mysql_server_config {% endif %} +mysql_what_is_status_of_{{ mysql.service }}: + cmd.run: + - names: + - service {{ mysql.service }} status + - onfail: + - service: mysqld + # official oracle mysql repo # creates this file, that rewrites /etc/mysql/my.cnf setting # so, make it empty diff --git a/pillar.example b/pillar.example index edde7f9..f78d3a1 100644 --- a/pillar.example +++ b/pillar.example @@ -134,3 +134,50 @@ mysql: # Install dev package - defaults to False install: False + macos: + products: + community_server: + enabled: True # default + url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg + sum: 'md5=602a84390ecf3d82025b1d99fc594124' + workbench: + enabled: True # default + url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg + sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' + cluster: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg + sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' + router: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg + sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' + utilities: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg + sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' + shell: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg + sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' + proxy: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz + sum: 'md5=107df22412aa8c483d2021e1af24ee22' + connnector: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz + sum: 'md5=dece7fe5607918ba68499ef07c31508d' + forvisualstudio: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip + sum: 'md5=fcf39316505ee2921e31a431eae77a9c' + forexcel: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip + sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' + notifier: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip + sum: 'md5=349f1994681763fd6626a8ddf6be5363' + From 0e382508fca98fea1dec41b157f3776e659e89cb Mon Sep 17 00:00:00 2001 From: N Date: Tue, 2 Oct 2018 13:19:57 +0100 Subject: [PATCH 031/139] MacOS Desktop shortcut handling --- README.rst | 2 +- mysql/defaults.yaml | 28 +++++++------- mysql/files/mac_shortcut.sh | 10 +++++ mysql/macos/install.sls | 75 ++++++++++++++++++++++++------------- mysql/macos/remove.sls | 24 ++++++++++-- 5 files changed, 97 insertions(+), 42 deletions(-) create mode 100755 mysql/files/mac_shortcut.sh diff --git a/README.rst b/README.rst index d1e4f88..fb81acb 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ Meta-state including all server packages in correct order. This meta-state does ``mysql.macos`` ---------------- -Install "MySQL Community Server", "MySQL Workbench", and any other enabled products on MacOS. +Install "MySQL Community Server", "MySQL Workbench", and other related mysql products on MacOS (and create Desktop shortcuts). ``mysql.macos.remove`` ---------------- diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 807c17b..1c46974 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -27,7 +27,7 @@ mysql: group: dl: tmpdir: /tmp/mysqltmp - bindir: /usr/local/bin + prefix: /usr/local opts: -s -L interval: 60 retries: 2 @@ -36,58 +36,60 @@ mysql: enabled: True url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg sum: 'md5=602a84390ecf3d82025b1d99fc594124' - dest: /Applications/MySQL.app isapp: False + path: /usr/local/mysql + app: mysql workbench: enabled: True url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' - dest: /Applications/MySQLWorkbench.app + isapp: True + path: /Applications/MySQLWorkbench/Contents/Versions/latest + app: MySQLWorkbench cluster: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' - dest: /Applications/MySQLCluster.app + isapp: False + path: /usr/local/mysqlcluster + app: MySQLCluster router: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' - dest: /Applications/MySQLRouter.app + isapp: False + app: MySQLRouter utilities: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' - dest: /Applications/MySQLUtilities.app + isapp: True ## ?? + app: MySQLUtilties shell: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' - dest: /Applications/MySQLShell.app + isapp: True ## ?? + app: MySQLShell proxy: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' - dest: /opt/mysql/proxy connnector: - enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' - dest: /opt/mysql/connector/nodejs forvisualstudio: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip sum: 'md5=fcf39316505ee2921e31a431eae77a9c' - dest: /opt/mysql/visualstudio forexcel: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' - dest: /opt/mysql/excel notifier: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip sum: 'md5=349f1994681763fd6626a8ddf6be5363' - dest: /opt/mysql/notifier #The following dict names are reserved for pillar data (see pillar.example) global: {} diff --git a/mysql/files/mac_shortcut.sh b/mysql/files/mac_shortcut.sh new file mode 100755 index 0000000..f768592 --- /dev/null +++ b/mysql/files/mac_shortcut.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +CMD='/usr/bin/osascript -e' +if [[ -f "{{ home }}/{{ user }}/Desktop/{{ app }}" ]] && [[ "${1}" -eq "remove" ]] +then + ${CMD} "tell application \"Finder\" to delete file \"{{home}}/{{user}}/Desktop/{{ app }}\"" +elif [[ -d "{{ dir }}/{{ app }}" ]] && [[ "${1}" -eq "add" ]] +then + ${CMD} "tell application \"Finder\" to make new Alias at (path to desktop folder) to POSIX file \"{{ dir }}/{{ app }}\"" +fi diff --git a/mysql/macos/install.sls b/mysql/macos/install.sls index 8f1e163..024b4f5 100644 --- a/mysql/macos/install.sls +++ b/mysql/macos/install.sls @@ -1,9 +1,9 @@ ### mysql/macos/install.sls # -*- coding: utf-8 -*- # vim: ft=yaml -{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import mysql with context -%} +{%- from salt.file.dirname(tpldir) ~ "/map.jinja" import mysql with context %} - {%- set dl = mysql.macos.dl %} + {%- set dl = mysql.macos.dl %} mysql-macos-extract-dirs: file.directory: @@ -11,13 +11,14 @@ mysql-macos-extract-dirs: - makedirs: True - clean: True - {%- for product, data in mysql.macos.products.items() if data.enabled %} - {%- set archivename = data.url.split('/')[-1]|quote %} - {%- set archiveformat = archivename.split('.')[-1] %} + {%- for product, data in mysql.macos.products.items() if "enabled" in data and data.enabled %} + {%- set archivefile = data.url.split('/')[-1] %} + {%- set archiveformat = archivefile.split('.')[-1] %} + {%- set archivename = archivefile|replace('.dmg', '')|replace('.tar.gz', '')|replace('.zip', '') %} mysql-macos-remove-previous-{{ product }}-download-archive: file.absent: - - name: {{ dl.tmpdir }}/{{ archivename }} + - name: {{ dl.tmpdir }}/{{ archivefile }} - require_in: - mysql-macos-download-{{ product }}-archive @@ -25,7 +26,7 @@ mysql-macos-download-{{ product }}-archive: pkg.installed: - name: curl cmd.run: - - name: curl {{ dl.opts }} -o {{ dl.tmpdir }}/{{ archivename }} {{ data.url }} + - name: curl {{ dl.opts }} -o {{ dl.tmpdir }}/{{ archivefile }} {{ data.url }} {% if grains['saltversioninfo'] >= [2017, 7, 0] %} - retry: attempts: {{ dl.retries }} @@ -34,52 +35,76 @@ mysql-macos-download-{{ product }}-archive: - require: - mysql-macos-extract-dirs - {%- if data.sum %} + {%- if data.sum %} mysql-macos-check-{{ product }}-archive-hash: module.run: - name: file.check_hash - - path: {{ dl.tmpdir }}/{{ archivename }} + - path: {{ dl.tmpdir }}/{{ archivefile }} - file_hash: {{ data.sum }} - onchanges: - mysql-macos-download-{{ product }}-archive - require_in: - mysql-macos-{{ product }}-install - {%- endif %} + {%- endif %} mysql-macos-{{ product }}-install: - {%- if archiveformat in ('dmg',) %} + {%- if archiveformat in ("dmg",) %} + macpackage.installed: - - name: "{{ dl.tmpdir }}/{{ archivename }}" + - name: "{{ dl.tmpdir }}/{{ archivefile }}" - dmg: True - app: {{ 'True' if "isapp" not in data else data.isapp }} - force: True - allow_untrusted: True - onchanges: - mysql-macos-download-{{ product }}-archive - - require_in: - - mysql-macos-remove-{{ product }}-archive - file.append: - - name: {{ mysql.macos.userhomes }}/{{ mysql.macos.user }}/.bash_profile - - text: 'export PATH=$PATH:{{ data.dest }}/Contents/Versions/latest/bin' - {%- elif archiveformat in ('gz', 'zip',) %} + {%- elif archiveformat in ("gz", "zip",) %} + archive.extracted: - - source: file://{{ dl.tmpdir }}{{ archivename }} - - name: {{ dl.bindir }} + - source: file://{{ dl.tmpdir }}{{ archivefile }} + - name: {{ dl.prefix }}/{{ archivename }} - trim_output: True - source_hash: {{ data.sum }} - onchanges: - mysql-macos-download-{{ product }}-archive + + {%- endif %} - require_in: - - mysql-macos-remove-{{ product }}-archive + - mysql-macos-tidyup-{{ product }} - {%- endif %} + {%- if "path" in data and data.path and "app" in data and data.app %} -mysql-macos-remove-{{ product }}-archive: +mysql-macos-append-{{ product }}-path-to-bash-profile: + file.append: + - name: {{ mysql.macos.userhomes }}/{{ mysql.macos.user }}/.bash_profile + - text: 'export PATH=$PATH:{{ data.path }}/bin' + - onlyif: test -d {{ data.path }}/bin + +mysql-macos-{{ product }}-desktop-shortcut-add: + file.managed: + - name: /tmp/mac_shortcut.sh + - source: salt://mysql/files/mac_shortcut.sh + - mode: 755 + - template: jinja + - context: + user: {{ mysql.macos.user }} + home: {{ mysql.macos.userhomes }} + dir: {{'/Applications/' ~ data.app ~ '.app' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin'}} + app: {{ data.app }} + cmd.run: + - name: /tmp/mac_shortcut.sh add + - runas: {{ mysql.macos.user }} + - require: + - file: mysql-macos-{{ product }}-desktop-shortcut-add + + {%- endif %} + +mysql-macos-tidyup-{{ product }}: file.absent: - - name: {{ dl.tmpdir }}/{{ archivename }} + - name: {{ dl.tmpdir }}/{{ archivefile }} - onchanges: - mysql-macos-download-{{ product }}-archive - {%- endfor %} + {% endfor %} diff --git a/mysql/macos/remove.sls b/mysql/macos/remove.sls index 30fcb53..77c7c2e 100644 --- a/mysql/macos/remove.sls +++ b/mysql/macos/remove.sls @@ -3,13 +3,31 @@ # vim: ft=yaml {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import mysql with context -%} - {%- for product, data in mysql.macos.products.items() if data.enabled %} - {%- set archivename = data.url.split('/')[-1] %} + {%- set dl = mysql.macos.dl %} + {%- for product, data in mysql.macos.products.items() if "enabled" in data and data.enabled %} + {%- set archivename = data.url.split('/')[-1]|replace('.dmg', '')|replace('.tar.gz', '')|replace('.zip', '') %} mysql-macos-{{ product }}-remove-destdir: file.absent: - names: - - {{ data.dest }} + - {{ data.path }} + +mysql-macos-{{ product }}-desktop-shortcut-remove: + file.managed: + - name: /tmp/mac_shortcut.sh + - source: salt://mysql/files/mac_shortcut.sh + - mode: 755 + - template: jinja + - context: + user: {{ mysql.macos.user }} + home: {{ mysql.macos.userhomes }} + dir: {{'/Applications/' ~ data.app ~ '.app' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin'}} + app: {{ data.app }} + cmd.run: + - name: /tmp/mac_shortcut.sh remove + - runas: {{ mysql.macos.user }} + - require: + - file: mysql-macos-{{ product }}-desktop-shortcut-remove {%- endfor %} From d20ce192cb250acdb8e7b940a64e982bd867b724 Mon Sep 17 00:00:00 2001 From: N Date: Tue, 2 Oct 2018 20:29:24 +0100 Subject: [PATCH 032/139] fix code for MacOS desktop shortcuts --- mysql/files/mac_shortcut.sh | 10 ++++++---- mysql/macos/install.sls | 3 ++- mysql/macos/remove.sls | 7 ++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/mysql/files/mac_shortcut.sh b/mysql/files/mac_shortcut.sh index f768592..96e1163 100755 --- a/mysql/files/mac_shortcut.sh +++ b/mysql/files/mac_shortcut.sh @@ -1,10 +1,12 @@ #!/usr/bin/env bash CMD='/usr/bin/osascript -e' -if [[ -f "{{ home }}/{{ user }}/Desktop/{{ app }}" ]] && [[ "${1}" -eq "remove" ]] + +if [[ -e "{{ home }}/{{ user }}/Desktop/{{ app }}" ]] && [[ "${1}" -eq "remove" ]] then - ${CMD} "tell application \"Finder\" to delete file \"{{home}}/{{user}}/Desktop/{{ app }}\"" -elif [[ -d "{{ dir }}/{{ app }}" ]] && [[ "${1}" -eq "add" ]] + $CMD "tell application \"Finder\" to delete POSIX file \"{{home}}/{{user}}/Desktop/{{ app }}\"" +elif [[ -e "{{ dir }}/{{ app ~ '.app' if suffix else app }}" ]] && [[ "${1}" -eq "add" ]] then - ${CMD} "tell application \"Finder\" to make new Alias at (path to desktop folder) to POSIX file \"{{ dir }}/{{ app }}\"" + $CMD "tell application \"Finder\" to delete POSIX file \"{{home}}/{{user}}/Desktop/{{ app }}\"" >/dev/null 2>&1 + $CMD "tell application \"Finder\" to make new Alias at (path to desktop folder) to POSIX file \"{{ dir }}/{{ app }}{{ suffix or '' }}\"" fi diff --git a/mysql/macos/install.sls b/mysql/macos/install.sls index 024b4f5..7e5509b 100644 --- a/mysql/macos/install.sls +++ b/mysql/macos/install.sls @@ -90,8 +90,9 @@ mysql-macos-{{ product }}-desktop-shortcut-add: - context: user: {{ mysql.macos.user }} home: {{ mysql.macos.userhomes }} - dir: {{'/Applications/' ~ data.app ~ '.app' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin'}} app: {{ data.app }} + dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }} + suffix: {{ '.app' if "isapp" in data and data.isapp else '' }} cmd.run: - name: /tmp/mac_shortcut.sh add - runas: {{ mysql.macos.user }} diff --git a/mysql/macos/remove.sls b/mysql/macos/remove.sls index 77c7c2e..d81f2ad 100644 --- a/mysql/macos/remove.sls +++ b/mysql/macos/remove.sls @@ -4,13 +4,13 @@ {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import mysql with context -%} {%- set dl = mysql.macos.dl %} - {%- for product, data in mysql.macos.products.items() if "enabled" in data and data.enabled %} + {%- for product, data in mysql.macos.products.items() if "app" in data and data.app and "url" in data and data.url %} {%- set archivename = data.url.split('/')[-1]|replace('.dmg', '')|replace('.tar.gz', '')|replace('.zip', '') %} mysql-macos-{{ product }}-remove-destdir: file.absent: - names: - - {{ data.path }} + - {{ '/Applications' ~ data.app ~ '.app' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename }} mysql-macos-{{ product }}-desktop-shortcut-remove: file.managed: @@ -21,8 +21,9 @@ mysql-macos-{{ product }}-desktop-shortcut-remove: - context: user: {{ mysql.macos.user }} home: {{ mysql.macos.userhomes }} - dir: {{'/Applications/' ~ data.app ~ '.app' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin'}} app: {{ data.app }} + dir: {{ '/Applications' if "isapp" in data and data.isapp else dl.prefix ~ '/' ~ archivename ~ '/bin' }} + suffix: {{ '.app' if "isapp" in data and data.isapp else '' }} cmd.run: - name: /tmp/mac_shortcut.sh remove - runas: {{ mysql.macos.user }} From eba57badd3ed1d929923a8b4d1c10111579b4405 Mon Sep 17 00:00:00 2001 From: Shannon Little Date: Thu, 1 Nov 2018 16:19:46 -0600 Subject: [PATCH 033/139] Updated example pillar name overrides to match new keys --- pillar.example | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pillar.example b/pillar.example index f78d3a1..e17b79c 100644 --- a/pillar.example +++ b/pillar.example @@ -121,13 +121,12 @@ mysql: grants: ['select', 'insert', 'update'] # Override any names defined in map.jinja -# lookup: -# server: mysql-server -# client: mysql-client -# service: mysql-service -# server: -# lookup: -# python: python-mysqldb + # serverpkg: mysql-server + # clientpkg: mysql-client + # service: mysql + # pythonpkg: python-mysqldb + # devpkg: mysql-devel + # debconf_utils: debconf-utils # Install MySQL headers dev: From 165bdf675e4d6214a1e5351bc3bd7a28ae9653b2 Mon Sep 17 00:00:00 2001 From: Damien Tardy-Panis Date: Tue, 14 Mar 2017 17:28:50 +0100 Subject: [PATCH 034/139] Add support for user creation with SSL when no databases are defined --- mysql/user.sls | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mysql/user.sls b/mysql/user.sls index 16b9b6d..a2f6c53 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -58,6 +58,22 @@ include: - grant: {{ user['grants']|join(",") }} - database: '*.*' - grant_option: {{ user['grant_option'] | default(False) }} + {% if 'ssl' in user or 'ssl-X509' in user %} + - ssl_option: + - SSL: {{ user['ssl'] | default(False) }} + {% if user['ssl-X509'] is defined %} + - X509: {{ user['ssl-X509'] }} + {% endif %} + {% if user['ssl-SUBJECT'] is defined %} + - SUBJECT: {{ user['ssl-SUBJECT'] }} + {% endif %} + {% if user['ssl-ISSUER'] is defined %} + - ISSUER: {{ user['ssl-ISSUER'] }} + {% endif %} + {% if user['ssl-CIPHER'] is defined %} + - CIPHER: {{ user['ssl-CIPHER'] }} + {% endif %} + {% endif %} - user: {{ name }} - host: '{{ host }}' - connection_host: '{{ mysql_host }}' From c2ca424dac9723a69f315b953ab10d643c087dff Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Wed, 14 Nov 2018 10:33:31 +0100 Subject: [PATCH 035/139] Use separate global config section when using a config directory. --- mysql/files/my-include.cnf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql/files/my-include.cnf b/mysql/files/my-include.cnf index 35eff10..2ea1102 100644 --- a/mysql/files/my-include.cnf +++ b/mysql/files/my-include.cnf @@ -9,10 +9,10 @@ {#- ===== COMBINE DATA ===== -#} -{%- if "sections" in mysql.config -%} -{%- set goodParamList = mysql.config.sections -%} +{%- if "global_config" in mysql and "sections" in mysql.global_config -%} +{%- set goodParamList = mysql.global_config.sections -%} {%- for section_name in supported_sections -%} - {%- set sectdict = mysql.config.sections[section_name] | default({}) -%} + {%- set sectdict = mysql.global_config.sections[section_name] | default({}) -%} {%- for mparam, mvalue in salt['pillar.get']('mysql:global:'+section_name, {}).items() -%} {%- set mparamUnderscore = mparam | replace('-','_') -%} {%- do sectdict.update({mparamUnderscore:mvalue}) -%} From b20ace26b59f2368f320168f1e8da19eb7c8825e Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Wed, 14 Nov 2018 11:15:04 +0100 Subject: [PATCH 036/139] RPM in mariadb repos is called 'MariaDB-server'. --- mysql/server.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index 62ef0a0..a4d785d 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -105,7 +105,7 @@ mysqld-packages: - require_in: - file: mysql_config -{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg != 'mariadb-server' %} +{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %} # Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out. mysql_initialize: cmd.run: @@ -116,7 +116,7 @@ mysql_initialize: - pkg: {{ mysql.serverpkg }} {% endif %} -{% if os_family in ['RedHat', 'Suse'] and mysql.serverpkg == 'mariadb-server' %} +{% if os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} # For MariaDB it's enough to only create the datadir mysql_initialize: file.directory: @@ -144,9 +144,9 @@ mysqld: - enable: True - require: - pkg: {{ mysql.serverpkg }} -{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg != 'mariadb-server') or (os_family in ['Gentoo']) %} +{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo']) %} - cmd: mysql_initialize -{% elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg == 'mariadb-server' %} +{% elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} - file: {{ mysql_datadir }} {% endif %} - watch: From 624c7a8642a431f35518fb8b7cb39c9690d23be0 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Wed, 14 Nov 2018 13:40:18 +0100 Subject: [PATCH 037/139] Make sure the config directory and files within are handled after install. --- mysql/config.sls | 8 ++++++++ mysql/server.sls | 3 +++ 2 files changed, 11 insertions(+) diff --git a/mysql/config.sls b/mysql/config.sls index 993c94b..1d3d343 100644 --- a/mysql/config.sls +++ b/mysql/config.sls @@ -25,6 +25,8 @@ mysql_server_config: - group: root - mode: 644 {% endif %} + - require: + - file: mysql_config_directory {% endif %} {% if "galera_config" in mysql %} @@ -40,6 +42,8 @@ mysql_galera_config: - group: root - mode: 644 {% endif %} + - require: + - file: mysql_config_directory {% endif %} {% if "library_config" in mysql %} @@ -55,6 +59,8 @@ mysql_library_config: - group: root - mode: 644 {% endif %} + - require: + - file: mysql_config_directory {% endif %} {% if "clients_config" in mysql %} @@ -70,6 +76,8 @@ mysql_clients_config: - group: root - mode: 644 {% endif %} + - require: + - file: mysql_config_directory {% endif %} {% endif %} diff --git a/mysql/server.sls b/mysql/server.sls index a4d785d..275c085 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -104,6 +104,9 @@ mysqld-packages: {% endif %} - require_in: - file: mysql_config +{% if "config_directory" in mysql %} + - file: mysql_config_directory +{% endif %} {% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %} # Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out. From 9c335fb71bfec36bed71ec3fd3f2c42aa8982234 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Thu, 15 Nov 2018 14:34:26 +0100 Subject: [PATCH 038/139] Explain config file management state in README. --- README.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.rst b/README.rst index fb81acb..3944815 100644 --- a/README.rst +++ b/README.rst @@ -118,3 +118,20 @@ Add the official MySQL 5.7 repository. Debian and Suse support to be added. Also need to add the option to allow selection of MySQL version (5.6 and 5.5 repos are added but disabled) and changed enabled repository accordingly. + +``mysql.config`` +------------------ + +Manage the MySQL configuration. + +.. note:: + There are currently two common ways to configure MySQL, a monolithic configuration file + or a configuration directory with configuration files per component. By default this + state will use a configuration directory for CentOS and Fedora, and a monolithic + configuration file for all other supported OSes. + + Whether the configuration directory is used or not depends on whether `mysql.config_directory` + is defined in the pillar. If it is present it will pick the configuration from individual + component keys (`mysql.server`, `mysql.galera`, `mysql.libraries`, etc) with optional global + configuration from `mysql.global`. The monolithic configuration, however, is defined separately + in `mysql.config`. From a82f2c1bc0b5c98f73d58fcd5fdcee12cc55bf46 Mon Sep 17 00:00:00 2001 From: N Date: Thu, 6 Dec 2018 09:24:07 +0000 Subject: [PATCH 039/139] Apparmor support --- mysql/defaults.yaml | 3 +++ mysql/server.sls | 25 +++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 1c46974..f8854a0 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -20,6 +20,9 @@ mysql: socket: /var/run/mysqld/mysqld.sock port: 3306 datadir: /var/lib/mysql + apparmor: + dir: /etc/apparmor.d/local + file: usr.sbin.mysqld macos: userhomes: /Users diff --git a/mysql/server.sls b/mysql/server.sls index 275c085..ab144b7 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -29,7 +29,8 @@ mysql_debconf: - require: - pkg: mysql_debconf_utils -{% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} + {% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} + mysql_password_debconf: debconf.set: - name: mysql-server @@ -40,7 +41,8 @@ mysql_password_debconf: - pkg: {{ mysql.serverpkg }} - require: - pkg: mysql_debconf_utils -{% endif %} + + {% endif %} {% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: @@ -48,7 +50,7 @@ mysql_root_password: - name: mysqladmin --host "{{ mysql_host }}" --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' - unless: mysql --host "{{ mysql_host }}" --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" - require: - - service: mysqld + - service: mysqld-service-running {% for host in {'localhost': '', 'localhost.localdomain': '', salt['grains.get']('fqdn'): ''}.keys() %} mysql_delete_anonymous_user_{{ host }}: @@ -63,7 +65,7 @@ mysql_delete_anonymous_user_{{ host }}: {% endif %} - connection_charset: utf8 - require: - - service: mysqld + - service: mysqld-service-running - pkg: mysql_python {%- if (mysql_salt_user == mysql_root_user) and mysql_root_password %} - cmd: mysql_root_password @@ -92,7 +94,7 @@ mysql_install_datadir: - pkg: {{ mysql.serverpkg }} - file: mysql_config - require_in: - - service: mysqld + - service: mysqld-service-running {% endif %} mysqld-packages: @@ -141,7 +143,14 @@ mysql_initialize: - pkg: {{ mysql.serverpkg }} {% endif %} -mysqld: +mysqld-service-running: + file.append: + - name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }} + - onlyif: test -d {{ mysql.config.apparmor.dir }} + - makedirs: True + - text: + - '{{ mysql.config.sections.mysqld.datadir }}/ r,' + - '{{ mysql.config.sections.mysqld.datadir }}/** rwk,' service.running: - name: {{ mysql.service }} - enable: True @@ -164,7 +173,7 @@ mysql_what_is_status_of_{{ mysql.service }}: - names: - service {{ mysql.service }} status - onfail: - - service: mysqld + - service: mysqld-service-running # official oracle mysql repo # creates this file, that rewrites /etc/mysql/my.cnf setting @@ -175,4 +184,4 @@ mysql_additional_config: - source: salt://{{ tpldir }}/files/usr-my.cnf - create: False - watch_in: - - service: mysqld + - service: mysqld-service-running From fc056f2419a16f6c5baa511f2081a879f9b4c257 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sun, 9 Dec 2018 00:34:58 +0100 Subject: [PATCH 040/139] fix init.sls extend --- mysql/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/init.sls b/mysql/init.sls index 5452c2b..a84c016 100644 --- a/mysql/init.sls +++ b/mysql/init.sls @@ -24,7 +24,7 @@ include: {% if (db_states|length() + user_states|length()) > 0 %} extend: - mysqld: + mysqld-service-running: service: - require_in: {{ requisites('mysql_database', db_states) }} From bb8e64685c8dcffeff509dada6c13315ecc16c34 Mon Sep 17 00:00:00 2001 From: N Date: Sun, 9 Dec 2018 01:27:48 +0000 Subject: [PATCH 041/139] Add server.apparmor state; rm unused dirs --- mysql/apparmor.sls | 10 ++++++++++ mysql/server.sls | 8 +------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 mysql/apparmor.sls diff --git a/mysql/apparmor.sls b/mysql/apparmor.sls new file mode 100644 index 0000000..9ab92ef --- /dev/null +++ b/mysql/apparmor.sls @@ -0,0 +1,10 @@ +{% from tpldir ~ "/map.jinja" import mysql with context %} + +mysqld-apparmor-allow: + file.append: + - name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }} + - onlyif: test -d {{ mysql.config.apparmor.dir }} + - makedirs: True + - text: + - '{{ mysql.config.sections.mysqld.datadir }}/ r,' + - '{{ mysql.config.sections.mysqld.datadir }}/** rwk,' diff --git a/mysql/server.sls b/mysql/server.sls index ab144b7..ca7efda 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,6 +1,7 @@ include: - .config - .python + - .apparmor {% from tpldir ~ "/map.jinja" import mysql with context %} @@ -144,13 +145,6 @@ mysql_initialize: {% endif %} mysqld-service-running: - file.append: - - name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }} - - onlyif: test -d {{ mysql.config.apparmor.dir }} - - makedirs: True - - text: - - '{{ mysql.config.sections.mysqld.datadir }}/ r,' - - '{{ mysql.config.sections.mysqld.datadir }}/** rwk,' service.running: - name: {{ mysql.service }} - enable: True From 78b00b6dcacdedcb14757bd64adb8b81157a3fb9 Mon Sep 17 00:00:00 2001 From: N Date: Sun, 9 Dec 2018 15:57:54 +0000 Subject: [PATCH 042/139] Make apparmor standalone state . --- mysql/server.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql/server.sls b/mysql/server.sls index ca7efda..5f3e6f5 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,7 +1,6 @@ include: - .config - .python - - .apparmor {% from tpldir ~ "/map.jinja" import mysql with context %} From c7945aabac6fefdeb238256c9adbc2ffd993574f Mon Sep 17 00:00:00 2001 From: N Date: Wed, 12 Dec 2018 14:32:33 +0000 Subject: [PATCH 043/139] Don't fail on missing mysql.config.apparmor --- mysql/apparmor.sls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mysql/apparmor.sls b/mysql/apparmor.sls index 9ab92ef..41f3748 100644 --- a/mysql/apparmor.sls +++ b/mysql/apparmor.sls @@ -1,5 +1,7 @@ {% from tpldir ~ "/map.jinja" import mysql with context %} +{%- if "apparmor" in mysql.config %} + mysqld-apparmor-allow: file.append: - name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }} @@ -8,3 +10,5 @@ mysqld-apparmor-allow: - text: - '{{ mysql.config.sections.mysqld.datadir }}/ r,' - '{{ mysql.config.sections.mysqld.datadir }}/** rwk,' + +{%- endif %} From a7145a59da4f8a9907213d22c68e18faa979e46d Mon Sep 17 00:00:00 2001 From: N Date: Wed, 12 Dec 2018 22:27:12 +0000 Subject: [PATCH 044/139] Add config section to pillar example --- pillar.example | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pillar.example b/pillar.example index e17b79c..0dfa2b0 100644 --- a/pillar.example +++ b/pillar.example @@ -47,6 +47,23 @@ mysql: grants: - 'all privileges' + # Manage config + config: + file: ~/.my.cnf + sections: + client: + port: 33306 + socket: /var/lib/mysql-socket/mysql.sock + mysqld_safe: + plugin-dir: '~/mysql/plugins' + mysqld: + user: myself + port: 33306 + datadir: ~/mysql/datadir + apparmor: + dir: /etc/apparmor.d/local + file: usr.sbin.mysqld + # Manage databases database: # Simple definition using default charset and collate From e540589cb06da9d077943f953cd226f45ee0bcc2 Mon Sep 17 00:00:00 2001 From: Nuno Esteves Date: Tue, 18 Dec 2018 22:35:51 +0000 Subject: [PATCH 045/139] Include an example of using a wildcard with a reference to salt/saltstack#41178. Thanks to @scambra for the fix. --- pillar.example | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index 7f82ab2..21ebdfa 100644 --- a/pillar.example +++ b/pillar.example @@ -97,7 +97,11 @@ mysql: ssl-ISSUER: Name ssl-CIPHER: Cipher databases: - - database: "foo_%%" + # https://github.com/saltstack/salt/issues/41178 + # If you want to refer to databases using wildcards, turn off escape so + # the renderer does not escape them, enclose the string in '`' and + # use two '%' + - database: '`foo\_%%`' grants: ['all privileges'] grant_option: True escape: False From 168d1e2c125b1efbb4808b67160a7c0a6a139c5f Mon Sep 17 00:00:00 2001 From: Wayne Gemmell Date: Fri, 18 Jan 2019 13:28:15 +0200 Subject: [PATCH 046/139] Support for official mysql 8 packages I've added support for the official mysql 8.0 packages and the relevant repositories. Package names are mysql-community-server and mysql-community-client. I know the repo setting breaks convention a bit but it is compulsory so I'm not sure how else to properly include it. This change requires the salt pull request I created https://github.com/saltstack/salt/pull/51240 to be able to grant users. --- mysql/osfamilymap.yaml | 2 -- mysql/server.sls | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index b402d6f..eb306dc 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -27,8 +27,6 @@ Debian: max_allowed_packet: 16M thread_stack: 192K thread_cache_size: 8 - query_cache_limit: 1M - query_cache_size: 16M expire_logs_days: 10 max_binlog_size: 100M #innodb_flush_log_at_trx_commit: 1 diff --git a/mysql/server.sls b/mysql/server.sls index 5f3e6f5..6d5160c 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -4,6 +4,7 @@ include: {% from tpldir ~ "/map.jinja" import mysql with context %} + {% set os = salt['grains.get']('os', None) %} {% set os_family = salt['grains.get']('os_family', None) %} {% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} @@ -12,9 +13,21 @@ include: {% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} {% set mysql_salt_password = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_password) %} {% set mysql_datadir = salt['pillar.get']('mysql:server:mysqld:datadir', '/var/lib/mysql') %} - +{% set lsb_distrib_codename = salt['grains.get']('lsb_distrib_codename', None) %} {% if mysql_root_password %} {% if os_family == 'Debian' %} + +{% if mysql.serverpkg == 'mysql-community-server' %} +mysql-community-server_repo: + pkgrepo.managed: + - humanname: "Mysql official repo" + - name: deb http://repo.mysql.com/apt/ubuntu/ {{ lsb_distrib_codename }} mysql-8.0 + - file: /etc/apt/sources.list.d/mysql.list + - refresh: True + - require_in: + - pkg: mysql-community-server +{% endif %} + mysql_debconf_utils: pkg.installed: - name: {{ mysql.debconf_utils }} @@ -31,18 +44,32 @@ mysql_debconf: {% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} +{% if mysql.serverpkg == 'mysql-community-server' %} mysql_password_debconf: debconf.set: - - name: mysql-server + - name: 'mysql-community-server' - data: - 'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} - 'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} + 'mysql-community-server/root-pass': {'type': 'password', 'value': '{{ mysql_root_password }}'} + 'mysql-community-server/re-root-pass': {'type': 'password', 'value': '{{ mysql_root_password }}'} + 'mysql-server/default-auth-override': {'type': 'string', 'value':'Use Legacy Authentication Method (Retain MySQL 5.x Compatibility)'} + - require_in: + - pkg: {{ mysql.serverpkg }} + - require: + - pkg: mysql_debconf_utils +{% else %} +mysql_password_debconf: + debconf.set: + - name: {{ mysql.serverpkg }} + - data: + '{{ mysql.serverpkg }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} + '{{ mysql.serverpkg }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} - require_in: - pkg: {{ mysql.serverpkg }} - require: - pkg: mysql_debconf_utils - {% endif %} +{% endif %} + {% endif %} {% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: From e156ddaf6e5ef1ca168b2428747ae0da880e3aab Mon Sep 17 00:00:00 2001 From: "james@getsurreal.com" Date: Fri, 18 Jan 2019 21:27:24 -0600 Subject: [PATCH 047/139] Include pillar example for granting permissions to user on Any host --- pillar.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pillar.example b/pillar.example index 006b2e9..399f483 100644 --- a/pillar.example +++ b/pillar.example @@ -111,7 +111,7 @@ mysql: grants: ['all privileges'] bob: password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' - host: localhost + host: '%' # Any host ssl: True ssl-X509: True ssl-SUBJECT: Subject From d40a6c5d47dd1f2c8417257ca2f749360b6106e1 Mon Sep 17 00:00:00 2001 From: N Date: Sun, 27 Jan 2019 20:17:46 +0000 Subject: [PATCH 048/139] Only download archive if necessary --- mysql/macos/install.sls | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/mysql/macos/install.sls b/mysql/macos/install.sls index 7e5509b..f57cd71 100644 --- a/mysql/macos/install.sls +++ b/mysql/macos/install.sls @@ -9,28 +9,24 @@ mysql-macos-extract-dirs: file.directory: - name: {{ dl.tmpdir }} - makedirs: True - - clean: True {%- for product, data in mysql.macos.products.items() if "enabled" in data and data.enabled %} {%- set archivefile = data.url.split('/')[-1] %} {%- set archiveformat = archivefile.split('.')[-1] %} {%- set archivename = archivefile|replace('.dmg', '')|replace('.tar.gz', '')|replace('.zip', '') %} -mysql-macos-remove-previous-{{ product }}-download-archive: - file.absent: - - name: {{ dl.tmpdir }}/{{ archivefile }} - - require_in: - - mysql-macos-download-{{ product }}-archive - mysql-macos-download-{{ product }}-archive: pkg.installed: - name: curl cmd.run: - name: curl {{ dl.opts }} -o {{ dl.tmpdir }}/{{ archivefile }} {{ data.url }} + - unless: test -f {{ dl.tmpdir }}/{{ archivefile }} {% if grains['saltversioninfo'] >= [2017, 7, 0] %} - retry: attempts: {{ dl.retries }} interval: {{ dl.interval }} + until: True + splay: 10 {% endif %} - require: - mysql-macos-extract-dirs @@ -41,8 +37,8 @@ mysql-macos-check-{{ product }}-archive-hash: - name: file.check_hash - path: {{ dl.tmpdir }}/{{ archivefile }} - file_hash: {{ data.sum }} - - onchanges: - - mysql-macos-download-{{ product }}-archive + - require: + - cmd: mysql-macos-download-{{ product }}-archive - require_in: - mysql-macos-{{ product }}-install {%- endif %} @@ -68,10 +64,7 @@ mysql-macos-{{ product }}-install: - source_hash: {{ data.sum }} - onchanges: - mysql-macos-download-{{ product }}-archive - {%- endif %} - - require_in: - - mysql-macos-tidyup-{{ product }} {%- if "path" in data and data.path and "app" in data and data.app %} @@ -100,12 +93,4 @@ mysql-macos-{{ product }}-desktop-shortcut-add: - file: mysql-macos-{{ product }}-desktop-shortcut-add {%- endif %} - -mysql-macos-tidyup-{{ product }}: - file.absent: - - name: {{ dl.tmpdir }}/{{ archivefile }} - - onchanges: - - mysql-macos-download-{{ product }}-archive - {% endfor %} - From 577c5a1120aef1d63634631cdc55380d379d3658 Mon Sep 17 00:00:00 2001 From: Joshua Cannon Date: Mon, 11 Feb 2019 09:00:52 -0600 Subject: [PATCH 049/139] Update hash for MySQL community server RPM repo --- mysql/repo.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/repo.sls b/mysql/repo.sls index c3f4ff9..c344abb 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -20,7 +20,7 @@ include: # A lookup table for MySQL Repo GPG keys & RPM URLs for various RedHat releases {% set pkg = { 'key': 'http://repo.mysql.com/RPM-GPG-KEY-mysql', - 'key_hash': 'md5=472a4a4867adfd31a68e8c9bbfacc23d', + 'key_hash': 'md5=162ec8cb41add661b357e926a083b0cc', 'rpm': rpm_source } %} From d1de0fdfc6c1c6daf34b19cae2efb6b3d9789223 Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Tue, 9 Apr 2019 22:54:36 +0200 Subject: [PATCH 050/139] Allow to remove DB user --- mysql/user.sls | 34 ++++++++++++++++++++-------------- pillar.example | 6 ++++++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/mysql/user.sls b/mysql/user.sls index e729bf8..fa0b6e4 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -34,22 +34,28 @@ include: {% set state_id = 'mysql_user_' ~ name ~ '_' ~ host%} {{ state_id }}: - mysql_user.present: - - name: {{ name }} - - host: '{{ host }}' - {%- if user['password_hash'] is defined %} - - password_hash: '{{ user['password_hash'] }}' - {%- elif user['password'] is defined and user['password'] != None %} - - password: '{{ user['password'] }}' + {%- if user.get('present', True) %} + mysql_user.present: + - name: {{ name }} + - host: '{{ host }}' + {%- if user['password_hash'] is defined %} + - password_hash: '{{ user['password_hash'] }}' + {%- elif user['password'] is defined and user['password'] != None %} + - password: '{{ user['password'] }}' + {%- else %} + - allow_passwordless: True + {%- endif %} {%- else %} - - allow_passwordless: True + mysql_user.absent: + - name: {{ name }} + - host: '{{ host }}' {%- endif %} - - connection_host: '{{ mysql_host }}' - - connection_user: '{{ mysql_salt_user }}' - {% if mysql_salt_pass %} - - connection_pass: '{{ mysql_salt_pass }}' - {% endif %} - - connection_charset: utf8 + - connection_host: '{{ mysql_host }}' + - connection_user: '{{ mysql_salt_user }}' + {%- if mysql_salt_pass %} + - connection_pass: '{{ mysql_salt_pass }}' + {%- endif %} + - connection_charset: utf8 {%- if 'grants' in user %} {{ state_id ~ '_grants' }}: diff --git a/pillar.example b/pillar.example index 399f483..bcdbf82 100644 --- a/pillar.example +++ b/pillar.example @@ -143,6 +143,12 @@ mysql: - database: foo grants: ['select', 'insert', 'update'] + # Remove a user + obsoleteuser: + host: localhost + # defaults to True + present: False + # Override any names defined in map.jinja # serverpkg: mysql-server # clientpkg: mysql-client From 3633a6ec84350baa1ace9e134bc086883589657e Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Tue, 9 Apr 2019 23:59:44 +0200 Subject: [PATCH 051/139] Allow to remove DB --- mysql/database.sls | 20 +++++++++++++++----- pillar.example | 3 +++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/mysql/database.sls b/mysql/database.sls index 977a052..c3f5dd3 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -13,19 +13,29 @@ include: {% for database_obj in salt['pillar.get']('mysql:database', []) %} {% set state_id = 'mysql_db_' ~ loop.index0 %} -{% set database = database_obj.get('name') if database_obj is mapping else database_obj %} +{% if database_obj is mapping %} +{% set database = database_obj.get('name') %} +{% set present = database_obj.get('present', True) %} +{% else %} +{% set database = database_obj %} +{% set present = True %} +{% endif %} {{ state_id }}: + {%- if present %} mysql_database.present: + {% if database_obj is mapping %} + - character_set: {{ database_obj.get('character_set', '') }} + - collate: {{ database_obj.get('collate', '') }} + {% endif %} + {% else %} + mysql_database.absent: + {% endif %} - name: {{ database }} - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' {% if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' {% endif %} - {% if database_obj is mapping %} - - character_set: {{ database_obj.get('character_set', '') }} - - collate: {{ database_obj.get('collate', '') }} - {% endif %} - connection_charset: utf8 {% if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %} diff --git a/pillar.example b/pillar.example index bcdbf82..112d542 100644 --- a/pillar.example +++ b/pillar.example @@ -72,6 +72,9 @@ mysql: - name: bar character_set: utf8 collate: utf8_general_ci + # Delete DB + - name: obsolete_db + present: False schema: foo: load: True From 39915a49fd12e86eb5f4e042c37d701342bc2bad Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Wed, 24 Apr 2019 12:45:34 +0200 Subject: [PATCH 052/139] Handle empty/Null database_obj --- mysql/database.sls | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql/database.sls b/mysql/database.sls index c3f5dd3..9a517ef 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -13,7 +13,9 @@ include: {% for database_obj in salt['pillar.get']('mysql:database', []) %} {% set state_id = 'mysql_db_' ~ loop.index0 %} -{% if database_obj is mapping %} +{% if not database_obj %}{# in case database_obj == [] #} +{% continue %} +{% elif database_obj is mapping %} {% set database = database_obj.get('name') %} {% set present = database_obj.get('present', True) %} {% else %} From 1d2e2f59dd5d2d051eef065fb516b03f0eccbfbf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 6 Jul 2019 10:46:03 +0100 Subject: [PATCH 053/139] feat(semantic-release): implement for this formula * Include latest pre-salted images replacing EOL platforms - Ref: https://github.com/saltstack-formulas/template-formula/pull/148 --- .gitignore | 115 +++++++++- .kitchen.docker.yml | 6 - .kitchen.yml | 31 --- .travis.yml | 90 ++++++-- FORMULA | 1 + Gemfile | 20 +- Rakefile | 31 --- bin/kitchen | 29 +++ commitlint.config.js | 3 + docs/CONTRIBUTING.rst | 158 +++++++++++++ README.rst => docs/README.rst | 114 ++++++++-- kitchen.yml | 149 ++++++++++++ mysql/defaults.yaml | 4 + mysql/salt-user.sls | 6 +- pre-commit_semantic-release.sh | 30 +++ release-rules.js | 18 ++ release.config.js | 106 +++++++++ test/integration/default/README.md | 50 ++++ .../default/controls/packages_spec.rb | 15 ++ test/integration/default/inspec.yml | 12 + test/salt/pillar/mysql.sls | 213 ++++++++++++++++++ 21 files changed, 1073 insertions(+), 128 deletions(-) delete mode 100644 .kitchen.docker.yml delete mode 100644 .kitchen.yml delete mode 100644 Rakefile create mode 100755 bin/kitchen create mode 100644 commitlint.config.js create mode 100644 docs/CONTRIBUTING.rst rename README.rst => docs/README.rst (58%) create mode 100644 kitchen.yml create mode 100755 pre-commit_semantic-release.sh create mode 100644 release-rules.js create mode 100644 release.config.js create mode 100644 test/integration/default/README.md create mode 100644 test/integration/default/controls/packages_spec.rb create mode 100644 test/integration/default/inspec.yml create mode 100644 test/salt/pillar/mysql.sls diff --git a/.gitignore b/.gitignore index 7715275..ba07ed8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,113 @@ -*.pyc -*~ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a packager +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.kitchen +.kitchen.local.yml +kitchen.local.yml + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# dotenv +.env + +# virtualenv +.venv +venv/ +ENV/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +# Bundler Gemfile.lock -.kitchen/ + +# copied `.md` files used for conversion to `.rst` using `m2r` +docs/*.md + +# Vim +*.sw? diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml deleted file mode 100644 index f6c458a..0000000 --- a/.kitchen.docker.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -driver: - name: docker - hostname: salt-formula.ci.local - use_sudo: true - require_chef_omnibus: false diff --git a/.kitchen.yml b/.kitchen.yml deleted file mode 100644 index b7ac9f4..0000000 --- a/.kitchen.yml +++ /dev/null @@ -1,31 +0,0 @@ -<% -require 'yaml' - -formula = YAML.load_file('FORMULA') -formula_name = formula['name'] -%> ---- -verifier: - name: inspec - -platforms: - - name: ubuntu-16.04 - - name: ubuntu-18.04 - - name: debian-9 - - name: centos-7 - -provisioner: - name: salt_solo - salt_install: bootstrap - salt_bootstrap_url: https://bootstrap.saltstack.com - salt_version: latest - salt_pillar_root: pillar.example - log_level: <%= ENV['SALT_DEBUG_LEVEL'] || 'info' %> - formula: <%= formula_name %> - state_top: - base: - '*': - - <%= formula_name %> - -suites: - - name: default diff --git a/.travis.yml b/.travis.yml index 37ac9e4..e26d989 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,78 @@ -language: ruby - -rvm: - - 2.2.5 +stages: + - test + - commitlint + - name: release + if: branch = master AND type != pull_request sudo: required -services: docker +cache: bundler +language: ruby +dist: xenial +services: + - docker + +# Make sure the instances listed below match up with +# the `platforms` defined in `kitchen.yml` env: matrix: - - INSTANCE=default-ubuntu-1604 - - INSTANCE=default-ubuntu-1804 - - INSTANCE=default-debian-9 - - INSTANCE=centos-7 - -# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142455888 -before_script: sudo iptables -L DOCKER || sudo iptables -N DOCKER - -install: - # setup ci for test formula - - export BUNDLE_GEMFILE=$PWD/Gemfile - - bundle install + - INSTANCE: default-debian-10-develop-py3 + - INSTANCE: default-ubuntu-1804-develop-py3 + # - INSTANCE: default-centos-7-develop-py3 + # - INSTANCE: default-fedora-30-develop-py3 + # - INSTANCE: default-opensuse-leap-15-develop-py3 + # - INSTANCE: default-amazonlinux-2-develop-py2 + - INSTANCE: default-debian-9-2019-2-py3 + - INSTANCE: default-ubuntu-1804-2019-2-py3 + # - INSTANCE: default-centos-7-2019-2-py3 + # - INSTANCE: default-fedora-30-2019-2-py3 + # - INSTANCE: default-opensuse-leap-15-2019-2-py3 + # - INSTANCE: default-amazonlinux-2-2019-2-py2 + - INSTANCE: default-debian-9-2018-3-py2 + # - INSTANCE: default-ubuntu-1604-2018-3-py2 + # - INSTANCE: default-centos-7-2018-3-py2 + # - INSTANCE: default-fedora-29-2018-3-py2 + # - INSTANCE: default-opensuse-leap-15-2018-3-py2 + # - INSTANCE: default-amazonlinux-2-2018-3-py2 + - INSTANCE: default-debian-8-2017-7-py2 + # - INSTANCE: default-ubuntu-1604-2017-7-py2 + # - INSTANCE: default-centos-6-2017-7-py2 + # - INSTANCE: default-fedora-29-2017-7-py2 + # - INSTANCE: default-opensuse-leap-15-2017-7-py2 + # - INSTANCE: default-amazonlinux-2-2017-7-py2 script: - # Run unit tests - - KITCHEN_LOCAL_YAML=.kitchen.docker.yml bundle exec kitchen verify ${INSTANCE} + - bundle exec kitchen verify ${INSTANCE} + +jobs: + include: + # Define the commitlint stage + - stage: commitlint + language: node_js + node_js: lts/* + before_install: skip + script: + - npm install @commitlint/config-conventional -D + - npm install @commitlint/travis-cli -D + - commitlint-travis + # Define the release stage that runs semantic-release + - stage: release + language: node_js + node_js: lts/* + before_install: skip + script: + # Update `AUTHORS.md` + - export MAINTAINER_TOKEN=${GH_TOKEN} + - go get github.com/myii/maintainer + - maintainer contributor + + # Install all dependencies required for `semantic-release` + - npm install @semantic-release/changelog@3 -D + - npm install @semantic-release/exec@3 -D + - npm install @semantic-release/git@7 -D + deploy: + provider: script + skip_cleanup: true + script: + # Run `semantic-release` + - npx semantic-release@15 diff --git a/FORMULA b/FORMULA index ebf0129..0a2f4ce 100644 --- a/FORMULA +++ b/FORMULA @@ -6,3 +6,4 @@ release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL description: Formula for installing MySQL database client and/or server +top_level_dir: mysql diff --git a/Gemfile b/Gemfile index f74e267..3b36de3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,6 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'codeclimate-test-reporter', group: :test, require: nil -gem 'rake' -gem 'berkshelf', '~> 4.0' +gem 'kitchen-docker', '>= 2.9' +gem 'kitchen-salt', '>= 0.6.0' +gem 'kitchen-inspec', '>= 1.1' -group :integration do - gem 'test-kitchen' - gem 'kitchen-salt' - gem 'kitchen-inspec' -end - -group :docker do - gem 'kitchen-docker' -end - -# vi: set ft=ruby : -gem "kitchen-vagrant" diff --git a/Rakefile b/Rakefile deleted file mode 100644 index 2a6eafb..0000000 --- a/Rakefile +++ /dev/null @@ -1,31 +0,0 @@ -require 'rake' -require 'rake/testtask' -require 'bundler/setup' - -Rake::TestTask.new do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = false -end - -desc 'Run Test Kitchen integration tests' -namespace :integration do - desc 'Run integration tests with kitchen-docker' - task :docker do - require 'kitchen' - Kitchen.logger = Kitchen.default_file_logger - @loader = Kitchen::Loader::YAML.new(local_config: '.kitchen.docker.yml') - Kitchen::Config.new(loader: @loader).instances.each do |instance| - instance.test(:always) - end - end -end - -task default: :test - -begin - require 'kitchen/rake_tasks' - Kitchen::RakeTasks.new -rescue LoadError - puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI'] -end diff --git a/bin/kitchen b/bin/kitchen new file mode 100755 index 0000000..1cd44f3 --- /dev/null +++ b/bin/kitchen @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'kitchen' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +bundle_binstub = File.expand_path("../bundle", __FILE__) + +if File.file?(bundle_binstub) + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ + load(bundle_binstub) + else + abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. +Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + end +end + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("test-kitchen", "kitchen") diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 0000000..2f9d1aa --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1,3 @@ +module.exports = { + extends: ['@commitlint/config-conventional'], +}; diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst new file mode 100644 index 0000000..5da9ae8 --- /dev/null +++ b/docs/CONTRIBUTING.rst @@ -0,0 +1,158 @@ +.. _contributing: + +How to contribute +================= + +This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one. +What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo. +It also covers how to contribute to this *formula's documentation*. + +.. contents:: **Table of Contents** + +Overview +-------- + +Submitting a pull request is more than just code! +To achieve a quality product, the *tests* and *documentation* need to be updated as well. +An excellent pull request will include these in the changes, wherever relevant. + +Commit message formatting +------------------------- + +Since every type of change requires making Git commits, +we will start by covering the importance of ensuring that all of your commit +messages are in the correct format. + +Automation of multiple processes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This formula uses `semantic-release `_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog. +The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation. + +Full details are available in the upstream docs regarding the `Angular Commit Message Conventions `_. +The key factor is that the first line of the commit message must follow this format: + +.. code-block:: + + type(scope): subject + + +* E.g. ``docs(contributing): add commit message formatting instructions``. + +Besides the version bump, the changelog and release notes are formatted accordingly. +So based on the example above: + +.. + + .. raw:: html + +

Documentation

+ + * **contributing:** add commit message formatting instructions + + +* The ``type`` translates into a ``Documentation`` sub-heading. +* The ``(scope):`` will be shown in bold text without the brackets. +* The ``subject`` follows the ``scope`` as standard text. + +Linting commit messages in Travis CI +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This formula uses `commitlint `_ for checking commit messages during CI testing. +This ensures that they are in accordance with the ``semantic-release`` settings. + +For more details about the default settings, refer back to the ``commitlint`` `reference rules `_. + +Relationship between commit type and version bump +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This formula applies some customisations to the defaults, as outlined in the table below, +based upon the `type `_ of the commit: + +.. list-table:: + :name: commit-type-vs-version-bump + :header-rows: 1 + :stub-columns: 0 + :widths: 1,2,3,1,1 + + * - Type + - Heading + - Description + - Bump (default) + - Bump (custom) + * - ``build`` + - Build System + - Changes related to the build system + - – + - + * - ``chore`` + - – + - Changes to the build process or auxiliary tools and libraries such as + documentation generation + - – + - + * - ``ci`` + - Continuous Integration + - Changes to the continuous integration configuration + - – + - + * - ``docs`` + - Documentation + - Documentation only changes + - – + - 0.0.1 + * - ``feat`` + - Features + - A new feature + - 0.1.0 + - + * - ``fix`` + - Bug Fixes + - A bug fix + - 0.0.1 + - + * - ``perf`` + - Performance Improvements + - A code change that improves performance + - 0.0.1 + - + * - ``refactor`` + - Code Refactoring + - A code change that neither fixes a bug nor adds a feature + - – + - 0.0.1 + * - ``revert`` + - Reverts + - A commit used to revert a previous commit + - – + - 0.0.1 + * - ``style`` + - Styles + - Changes that do not affect the meaning of the code (white-space, + formatting, missing semi-colons, etc.) + - – + - 0.0.1 + * - ``test`` + - Tests + - Adding missing or correcting existing tests + - – + - 0.0.1 + +Use ``BREAKING CHANGE`` to trigger a ``major`` version change +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used. +This will be appended to the changelog and release notes as well. +To preserve good formatting of these notes, the following format is prescribed: + +* ``BREAKING CHANGE: .`` + +An example of that: + +.. code-block:: git + + ... + + BREAKING CHANGE: With the removal of all of the `.sls` files under + `template package`, this formula no longer supports the installation of + packages. diff --git a/README.rst b/docs/README.rst similarity index 58% rename from README.rst rename to docs/README.rst index 3944815..e21d996 100644 --- a/README.rst +++ b/docs/README.rst @@ -1,42 +1,72 @@ -===== +.. _readme: + mysql ===== +|img_travis| |img_sr| + +.. |img_travis| image:: https://travis-ci.com/saltstack-formulas/mysql-formula.svg?branch=master + :alt: Travis CI Build Status + :scale: 100% + :target: https://travis-ci.com/saltstack-formulas/mysql-formula +.. |img_sr| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg + :alt: Semantic Release + :scale: 100% + :target: https://github.com/semantic-release/semantic-release + Install the MySQL client and/or server on Linux and MacOS. -.. note:: +.. contents:: **Table of Contents** - See the full `Salt Formulas installation and usage instructions - `_. +General notes +------------- + +See the full `SaltStack Formulas installation and usage instructions +`_. + +If you are interested in writing or contributing to formulas, please pay attention to the `Writing Formula Section +`_. + +If you want to use this formula, please pay attention to the ``FORMULA`` file and/or ``git tag``, +which contains the currently released version. This formula is versioned according to `Semantic Versioning `_. + +See `Formula Versioning Section `_ for more details. + +Contributing to this repo +------------------------- + +**Commit message formatting is significant!!** + +Please see :ref:`How to contribute ` for more details. Available states -================ +---------------- .. contents:: :local: ``mysql`` ---------- +^^^^^^^^^ Meta-state including all server packages in correct order. This meta-state does **not** include ``mysql.remove_test_database``. ``mysql.macos`` ----------------- +^^^^^^^^^^^^^^^^ Install "MySQL Community Server", "MySQL Workbench", and other related mysql products on MacOS (and create Desktop shortcuts). ``mysql.macos.remove`` ----------------- +^^^^^^^^^^^^^^^^ Remove "MySQL Community Server", "MySQL Workbench", and any other enabled products from MacOS. ``mysql.client`` ----------------- +^^^^^^^^^^^^^^^^ Install the MySQL client package on Linux. ``mysql.server`` ----------------- +^^^^^^^^^^^^^^^^ Install the MySQL server package and start the service. @@ -52,28 +82,28 @@ Debian OS family supports setting MySQL root password during install via debconf newly available ``random.get_str`` method. ``mysql.server_checks`` ------------------------ +^^^^^^^^^^^^^^^^^^^^^^^ Enforces a root password to be set. ``mysql.disabled`` ------------------- +^^^^^^^^^^^^^^^^^^ Ensure that the MySQL service is not running. ``mysql.database`` ------------------- +^^^^^^^^^^^^^^^^^^ Create and manage MySQL databases. ``mysql.python`` ----------------- +^^^^^^^^^^^^^^^^ Install mysql python bindings. ``mysql.user`` --------------- +^^^^^^^^^^^^^^ Create and manage MySQL database users with definable GRANT privileges. @@ -88,7 +118,7 @@ priority. Make sure to **quote the passwords** in the pillar so YAML doesn't throw an exception. ``mysql.remove_test_database`` ------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. warning:: @@ -100,7 +130,7 @@ MySQL installation. This state is **not** included as part of the meta-state above as this name may conflict with a real database. ``mysql.dev`` -------------- +^^^^^^^^^^^^^ Install the MySQL development libraries and header files. @@ -109,7 +139,7 @@ Install the MySQL development libraries and header files. your pillar data accordingly. ``mysql.repo`` --------------- +^^^^^^^^^^^^^^ Add the official MySQL 5.7 repository. @@ -120,7 +150,7 @@ Add the official MySQL 5.7 repository. changed enabled repository accordingly. ``mysql.config`` ------------------- +^^^^^^^^^^^^^^^^^^ Manage the MySQL configuration. @@ -135,3 +165,49 @@ Manage the MySQL configuration. component keys (`mysql.server`, `mysql.galera`, `mysql.libraries`, etc) with optional global configuration from `mysql.global`. The monolithic configuration, however, is defined separately in `mysql.config`. + + +Testing +------- + +Linux testing is done with ``kitchen-salt``. + +Requirements +^^^^^^^^^^^^ + +* Ruby +* Docker + +.. code-block:: bash + + $ gem install bundler + $ bundle install + $ bin/kitchen test [platform] + +Where ``[platform]`` is the platform name defined in ``kitchen.yml``, +e.g. ``debian-9-2019-2-py3``. + +``bin/kitchen converge`` +^^^^^^^^^^^^^^^^^^^^^^^^ + +Creates the docker instance and runs the ``mysql`` main state, ready for testing. + +``bin/kitchen verify`` +^^^^^^^^^^^^^^^^^^^^^^ + +Runs the ``inspec`` tests on the actual instance. + +``bin/kitchen destroy`` +^^^^^^^^^^^^^^^^^^^^^^^ + +Removes the docker instance. + +``bin/kitchen test`` +^^^^^^^^^^^^^^^^^^^^ + +Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``verify`` + ``destroy``. + +``bin/kitchen login`` +^^^^^^^^^^^^^^^^^^^^^ + +Gives you SSH access to the instance for manual testing. diff --git a/kitchen.yml b/kitchen.yml new file mode 100644 index 0000000..510cd28 --- /dev/null +++ b/kitchen.yml @@ -0,0 +1,149 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +# For help on this file's format, see https://kitchen.ci/ +driver: + name: docker + use_sudo: false + privileged: true + run_command: /lib/systemd/systemd + +# Make sure the platforms listed below match up with +# the `env.matrix` instances defined in `.travis.yml` +platforms: + ## SALT `develop` + - name: debian-10-develop-py3 + driver: + image: netmanagers/salt-develop-py3:debian-10 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: ubuntu-1804-develop-py3 + driver: + image: netmanagers/salt-develop-py3:ubuntu-18.04 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: centos-7-develop-py3 + driver: + image: netmanagers/salt-develop-py3:centos-7 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: fedora-30-develop-py3 + driver: + image: netmanagers/salt-develop-py3:fedora-30 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - name: opensuse-leap-15-develop-py3 + driver: + image: netmanagers/salt-develop-py3:opensuse-leap-15 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + run_command: /usr/lib/systemd/systemd + - name: amazonlinux-2-develop-py2 + driver: + image: netmanagers/salt-develop-py2:amazonlinux-2 + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + + ## SALT 2019.2 + - name: debian-9-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:debian-9 + - name: ubuntu-1804-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:ubuntu-18.04 + - name: centos-7-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:centos-7 + - name: fedora-30-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:fedora-30 + - name: opensuse-leap-15-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:opensuse-leap-15 + run_command: /usr/lib/systemd/systemd + - name: amazonlinux-2-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:amazonlinux-2 + + ## SALT 2018.3 + - name: debian-9-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:debian-9 + - name: ubuntu-1604-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:ubuntu-16.04 + - name: centos-7-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:centos-7 + - name: fedora-29-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:fedora-29 + - name: opensuse-leap-15-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:opensuse-leap-15 + run_command: /usr/lib/systemd/systemd + - name: amazonlinux-2-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:amazonlinux-2 + + ## SALT 2017.7 + - name: debian-8-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:debian-8 + - name: ubuntu-1604-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:ubuntu-16.04 + - name: centos-6-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:centos-6 + run_command: /sbin/init + - name: fedora-29-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:fedora-29 + - name: opensuse-leap-15-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:opensuse-leap-15 + run_command: /usr/lib/systemd/systemd + - name: amazonlinux-2-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:amazonlinux-2 + +provisioner: + name: salt_solo + log_level: info + salt_install: none + require_chef: false + formula: mysql + salt_copy_filter: + - .kitchen + - .git + state_top: + base: + '*': + - mysql + pillars: + top.sls: + base: + '*': + - mysql + pillars_from_files: + mysql.sls: test/salt/pillar/mysql.sls + +verifier: + # https://www.inspec.io/ + name: inspec + sudo: true + # cli, documentation, html, progress, json, json-min, json-rspec, junit + reporter: + - cli + inspec_tests: + - path: test/integration/default + +suites: + - name: default diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index f8854a0..5d3fac0 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -4,7 +4,11 @@ mysql: serverpkg: mysql-server clientpkg: mysql-client service: mysql + {%- if grains.pythonversion[0] == 2 %} pythonpkg: python-mysqldb + {% else %} + pythonpkg: python3-mysqldb + {% endif %} devpkg: mysql-devel debconf_utils: debconf-utils diff --git a/mysql/salt-user.sls b/mysql/salt-user.sls index 31df7f6..ed569df 100644 --- a/mysql/salt-user.sls +++ b/mysql/salt-user.sls @@ -25,9 +25,9 @@ mysql_salt_user_with_salt_user: - connection_user: '{{ mysql_salt_user }}' - connection_pass: '{{ mysql_salt_pass }}' - connection_charset: utf8 - - onlyif: - - mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;" - - VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi + # - onlyif: + # - mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;" + # - VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi {% if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh new file mode 100755 index 0000000..9d34d74 --- /dev/null +++ b/pre-commit_semantic-release.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +############################################################################### +# (A) Update `FORMULA` with `${nextRelease.version}` +############################################################################### +sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA + + +############################################################################### +# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst` +############################################################################### + +# Install `m2r` +sudo -H pip install m2r + +# Copy and then convert the `.md` docs +cp *.md docs/ +cd docs/ +m2r --overwrite *.md + +# Change excess `H1` headings to `H2` in converted `CHANGELOG.rst` +sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst +sed -i -e '1,4s/-/=/g' CHANGELOG.rst + +# Use for debugging output, when required +# cat AUTHORS.rst +# cat CHANGELOG.rst + +# Return back to the main directory +cd .. diff --git a/release-rules.js b/release-rules.js new file mode 100644 index 0000000..c63c850 --- /dev/null +++ b/release-rules.js @@ -0,0 +1,18 @@ +// No release is triggered for the types commented out below. +// Commits using these types will be incorporated into the next release. +// +// NOTE: Any changes here must be reflected in `CONTRIBUTING.md`. +module.exports = [ + {breaking: true, release: 'major'}, + // {type: 'build', release: 'patch'}, + // {type: 'chore', release: 'patch'}, + // {type: 'ci', release: 'patch'}, + {type: 'docs', release: 'patch'}, + {type: 'feat', release: 'minor'}, + {type: 'fix', release: 'patch'}, + {type: 'perf', release: 'patch'}, + {type: 'refactor', release: 'patch'}, + {type: 'revert', release: 'patch'}, + {type: 'style', release: 'patch'}, + {type: 'test', release: 'patch'}, +]; diff --git a/release.config.js b/release.config.js new file mode 100644 index 0000000..afa0cb1 --- /dev/null +++ b/release.config.js @@ -0,0 +1,106 @@ +module.exports = { + branch: 'master', + plugins: [ + ['@semantic-release/commit-analyzer', { + preset: 'angular', + releaseRules: './release-rules.js', + }], + '@semantic-release/release-notes-generator', + ['@semantic-release/changelog', { + changelogFile: 'CHANGELOG.md', + changelogTitle: '# Changelog', + }], + ['@semantic-release/exec', { + prepareCmd: 'sh ./pre-commit_semantic-release.sh ${nextRelease.version}', + }], + ['@semantic-release/git', { + assets: ['*.md', 'docs/*.rst', 'FORMULA'], + }], + '@semantic-release/github', + ], + generateNotes: { + preset: 'angular', + writerOpts: { + // Required due to upstream bug preventing all types being displayed. + // Bug: https://github.com/conventional-changelog/conventional-changelog/issues/317 + // Fix: https://github.com/conventional-changelog/conventional-changelog/pull/410 + transform: (commit, context) => { + const issues = [] + + commit.notes.forEach(note => { + note.title = `BREAKING CHANGES` + }) + + // NOTE: Any changes here must be reflected in `CONTRIBUTING.md`. + if (commit.type === `feat`) { + commit.type = `Features` + } else if (commit.type === `fix`) { + commit.type = `Bug Fixes` + } else if (commit.type === `perf`) { + commit.type = `Performance Improvements` + } else if (commit.type === `revert`) { + commit.type = `Reverts` + } else if (commit.type === `docs`) { + commit.type = `Documentation` + } else if (commit.type === `style`) { + commit.type = `Styles` + } else if (commit.type === `refactor`) { + commit.type = `Code Refactoring` + } else if (commit.type === `test`) { + commit.type = `Tests` + } else if (commit.type === `build`) { + commit.type = `Build System` + // } else if (commit.type === `chore`) { + // commit.type = `Maintenance` + } else if (commit.type === `ci`) { + commit.type = `Continuous Integration` + } else { + return + } + + if (commit.scope === `*`) { + commit.scope = `` + } + + if (typeof commit.hash === `string`) { + commit.hash = commit.hash.substring(0, 7) + } + + if (typeof commit.subject === `string`) { + let url = context.repository + ? `${context.host}/${context.owner}/${context.repository}` + : context.repoUrl + if (url) { + url = `${url}/issues/` + // Issue URLs. + commit.subject = commit.subject.replace(/#([0-9]+)/g, (_, issue) => { + issues.push(issue) + return `[#${issue}](${url}${issue})` + }) + } + if (context.host) { + // User URLs. + commit.subject = commit.subject.replace(/\B@([a-z0-9](?:-?[a-z0-9/]){0,38})/g, (_, username) => { + if (username.includes('/')) { + return `@${username}` + } + + return `[@${username}](${context.host}/${username})` + }) + } + } + + // remove references that already appear in the subject + commit.references = commit.references.filter(reference => { + if (issues.indexOf(reference.issue) === -1) { + return true + } + + return false + }) + + return commit + }, + }, + }, +}; diff --git a/test/integration/default/README.md b/test/integration/default/README.md new file mode 100644 index 0000000..8019607 --- /dev/null +++ b/test/integration/default/README.md @@ -0,0 +1,50 @@ +# Default InSpec Profile + +This shows the implementation of the Default InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). + +## Verify a profile + +InSpec ships with built-in features to verify a profile structure. + +```bash +$ inspec check default +Summary +------- +Location: default +Profile: profile +Controls: 4 +Timestamp: 2019-06-24T23:09:01+00:00 +Valid: true + +Errors +------ + +Warnings +-------- +``` + +## Execute a profile + +To run all **supported** controls on a local machine use `inspec exec /path/to/profile`. + +```bash +$ inspec exec default +.. + +Finished in 0.0025 seconds (files took 0.12449 seconds to load) +8 examples, 0 failures +``` + +## Execute a specific control from a profile + +To run one control from the profile use `inspec exec /path/to/profile --controls name`. + +```bash +$ inspec exec default --controls package +. + +Finished in 0.0025 seconds (files took 0.12449 seconds to load) +1 examples, 0 failures +``` + +See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb). diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages_spec.rb new file mode 100644 index 0000000..3be6792 --- /dev/null +++ b/test/integration/default/controls/packages_spec.rb @@ -0,0 +1,15 @@ +# Override by OS +package_name = 'mariadb-server' +if os[:name] == 'suse' or os[:name] == 'opensuse' + package_name = 'mariadb' +elsif os[:name] == 'debian' and os[:release].start_with?('8') + package_name = 'mysql-server' +end + +control 'mysql package' do + title 'should be installed' + + describe package(package_name) do + it { should be_installed } + end +end diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml new file mode 100644 index 0000000..8a3f50e --- /dev/null +++ b/test/integration/default/inspec.yml @@ -0,0 +1,12 @@ +name: mysql +title: mysql formula +maintainer: SaltStack Formulas +license: Apache-2.0 +summary: Verify that the mysql formula is setup and configured correctly +supports: + - platform-name: debian + - platform-name: ubuntu + - platform-name: centos + - platform-name: fedora + - platform-name: opensuse + - platform-name: suse diff --git a/test/salt/pillar/mysql.sls b/test/salt/pillar/mysql.sls new file mode 100644 index 0000000..13fe377 --- /dev/null +++ b/test/salt/pillar/mysql.sls @@ -0,0 +1,213 @@ +mysql: + global: + client-server: + default_character_set: utf8 + + clients: + mysql: + default_character_set: utf8 + mysqldump: + default_character_set: utf8 + + library: + client: + default_character_set: utf8 + + server: + # Use this account for database admin (defaults to root) + # root_user: 'admin' + # root_password: '' - to have root@localhost without password + root_password: 'somepass' + root_password_hash: '*13883BDDBE566ECECC0501CDE9B293303116521A' + user: mysql + # If you only manage the dbs and users and the server is on + # another host + # host: 123.123.123.123 + # my.cnf sections changes + mysqld: + # you can use either underscore or hyphen in param names + bind-address: 0.0.0.0 + log_bin: /var/log/mysql/mysql-bin.log + datadir: /var/lib/mysql + port: 3307 + binlog_do_db: foo + auto_increment_increment: 5 + binlog-ignore-db: + - mysql + - sys + - information_schema + - performance_schema + mysql: + # my.cnf param that not require value + no-auto-rehash: noarg_present + + # salt_user: + # salt_user_name: 'salt' + # salt_user_password: 'someotherpass' + # grants: + # - 'all privileges' + + # Manage config + config: + file: ~/.my.cnf + sections: + client: + port: 33306 + socket: /var/lib/mysql-socket/mysql.sock + mysqld_safe: + plugin-dir: '~/mysql/plugins' + mysqld: + user: myself + port: 33306 + datadir: ~/mysql/datadir + apparmor: + dir: /etc/apparmor.d/local + file: usr.sbin.mysqld + + # Manage databases + database: + # Simple definition using default charset and collate + - foo + # Detailed definition + - name: bar + character_set: utf8 + collate: utf8_general_ci + # Delete DB + - name: obsolete_db + present: False + schema: + foo: + load: False + bar: + load: False + baz: + load: True + source: salt://{{ tpldir }}/files/baz.schema.tmpl + template: jinja + qux: + load: True + source: salt://{{ tpldir }}/files/qux.schema.tmpl + template: jinja + context: + encabulator: Turbo + girdlespring: differential + quux: + load: True + source: salt://{{ tpldir }}/files/qux.schema.tmpl + template: jinja + context: + encabulator: Retro + girdlespring: integral + + # Manage users + # you can get pillar for existing server using scripts/import_users.py script + user: + frank: + password: 'somepass' + host: localhost + databases: + - database: foo + grants: ['select', 'insert', 'update'] + escape: True + - database: bar + grants: ['all privileges'] + # bob: + # password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' + # host: '%' # Any host + # ssl: True + # ssl-X509: True + # ssl-SUBJECT: Subject + # ssl-ISSUER: Name + # ssl-CIPHER: Cipher + # databases: + # # https://github.com/saltstack/salt/issues/41178 + # # If you want to refer to databases using wildcards, turn off escape so + # # the renderer does not escape them, enclose the string in '`' and + # # use two '%' + # - database: '`foo\_%%`' + # grants: ['all privileges'] + # grant_option: True + # escape: False + # - database: bar + # table: foobar + # grants: ['select', 'insert', 'update', 'delete'] + nopassuser: + password: ~ + host: localhost + databases: [] + application: + password: 'somepass' + mine_hosts: + target: "G@role:database and *.example.com" + function: "network.get_hostname" + expr_form: compound + databases: + - database: foo + grants: ['select', 'insert', 'update'] + + # Remove a user + obsoleteuser: + host: localhost + # defaults to True + present: False + + # Override any names defined in map.jinja + # serverpkg: mysql-server + # clientpkg: mysql-client + # service: mysql + # pythonpkg: python-mysqldb + # devpkg: mysql-devel + # debconf_utils: debconf-utils + + # Install MySQL headers + dev: + # Install dev package - defaults to False + install: False + + macos: + products: + community_server: + enabled: True # default + url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg + sum: 'md5=602a84390ecf3d82025b1d99fc594124' + workbench: + enabled: True # default + url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg + sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' + cluster: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg + sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' + router: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg + sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' + utilities: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg + sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' + shell: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg + sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' + proxy: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz + sum: 'md5=107df22412aa8c483d2021e1af24ee22' + connnector: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz + sum: 'md5=dece7fe5607918ba68499ef07c31508d' + forvisualstudio: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip + sum: 'md5=fcf39316505ee2921e31a431eae77a9c' + forexcel: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip + sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' + notifier: + enabled: False #default + url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip + sum: 'md5=349f1994681763fd6626a8ddf6be5363' + From 981adf7f7808e899ef44d517b1e81c98ffb3bfa9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 12 Jul 2019 17:56:48 +0000 Subject: [PATCH 054/139] chore(release): 0.50.0 [skip ci] # [0.50.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.49.0...v0.50.0) (2019-07-12) ### Features * **semantic-release:** implement for this formula ([1d2e2f5](https://github.com/saltstack-formulas/mysql-formula/commit/1d2e2f5)) --- AUTHORS.md | 84 ++++++++++++++++ CHANGELOG.md | 8 ++ FORMULA | 2 +- docs/AUTHORS.rst | 242 +++++++++++++++++++++++++++++++++++++++++++++ docs/CHANGELOG.rst | 12 +++ 5 files changed, 347 insertions(+), 1 deletion(-) create mode 100644 AUTHORS.md create mode 100644 CHANGELOG.md create mode 100644 docs/AUTHORS.rst create mode 100644 docs/CHANGELOG.rst diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 0000000..34f0f9a --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,84 @@ +# Authors + +This list is sorted by the number of commits per contributor in _descending_ order. + +Avatar|Contributor|Contributions +:-:|---|:-: +@gravyboat|[@gravyboat](https://github.com/gravyboat)|38 +@aboe76|[@aboe76](https://github.com/aboe76)|33 +@nmadhok|[@nmadhok](https://github.com/nmadhok)|28 +@whiteinge|[@whiteinge](https://github.com/whiteinge)|27 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|17 +@alxwr|[@alxwr](https://github.com/alxwr)|14 +@cheuschober|[@cheuschober](https://github.com/cheuschober)|11 +@babilen5|[@babilen5](https://github.com/babilen5)|11 +@pprkut|[@pprkut](https://github.com/pprkut)|9 +@techhat|[@techhat](https://github.com/techhat)|7 +@roock|[@roock](https://github.com/roock)|6 +@Routhinator|[@Routhinator](https://github.com/Routhinator)|5 +@puneetk|[@puneetk](https://github.com/puneetk)|5 +@davidjb|[@davidjb](https://github.com/davidjb)|5 +@xenophonf|[@xenophonf](https://github.com/xenophonf)|4 +@thatch45|[@thatch45](https://github.com/thatch45)|4 +@toanju|[@toanju](https://github.com/toanju)|4 +@tiger-seo|[@tiger-seo](https://github.com/tiger-seo)|4 +@gtmanfred|[@gtmanfred](https://github.com/gtmanfred)|4 +@alexhayes|[@alexhayes](https://github.com/alexhayes)|3 +@alfonsfoubert|[@alfonsfoubert](https://github.com/alfonsfoubert)|3 +@cboltz|[@cboltz](https://github.com/cboltz)|3 +@pcdummy|[@pcdummy](https://github.com/pcdummy)|3 +@amontalban|[@amontalban](https://github.com/amontalban)|2 +@iggy|[@iggy](https://github.com/iggy)|2 +@ogabrielsantos|[@ogabrielsantos](https://github.com/ogabrielsantos)|2 +@kaharlichenko|[@kaharlichenko](https://github.com/kaharlichenko)|2 +@javierbertoli|[@javierbertoli](https://github.com/javierbertoli)|2 +@neuhalje|[@neuhalje](https://github.com/neuhalje)|2 +@stp-ip|[@stp-ip](https://github.com/stp-ip)|2 +@RonWilliams|[@RonWilliams](https://github.com/RonWilliams)|2 +@ross-p|[@ross-p](https://github.com/ross-p)|2 +@srse|[@srse](https://github.com/srse)|2 +@tomasfejfar|[@tomasfejfar](https://github.com/tomasfejfar)|2 +@vschum|[@vschum](https://github.com/vschum)|2 +@madflojo|[@madflojo](https://github.com/madflojo)|2 +@UtahDave|[@UtahDave](https://github.com/UtahDave)|2 +@nesteves|[@nesteves](https://github.com/nesteves)|2 +@1exx|[@1exx](https://github.com/1exx)|1 +@aaronm-cloudtek|[@aaronm-cloudtek](https://github.com/aaronm-cloudtek)|1 +@Achimh3011|[@Achimh3011](https://github.com/Achimh3011)|1 +@word|[@word](https://github.com/word)|1 +@arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|1 +@johnklehm|[@johnklehm](https://github.com/johnklehm)|1 +@tardypad|[@tardypad](https://github.com/tardypad)|1 +@dosercz|[@dosercz](https://github.com/dosercz)|1 +@edusperoni|[@edusperoni](https://github.com/edusperoni)|1 +@sivir|[@sivir](https://github.com/sivir)|1 +@terminalmage|[@terminalmage](https://github.com/terminalmage)|1 +@replicant0wnz|[@replicant0wnz](https://github.com/replicant0wnz)|1 +@imran1008|[@imran1008](https://github.com/imran1008)|1 +@myii|[@myii](https://github.com/myii)|1 +@JubbaSmail|[@JubbaSmail](https://github.com/JubbaSmail)|1 +@h4ck3rm1k3|[@h4ck3rm1k3](https://github.com/h4ck3rm1k3)|1 +@dijit|[@dijit](https://github.com/dijit)|1 +@joejulian|[@joejulian](https://github.com/joejulian)|1 +@stromnet|[@stromnet](https://github.com/stromnet)|1 +@thejcannon|[@thejcannon](https://github.com/thejcannon)|1 +@TaiSHiNet|[@TaiSHiNet](https://github.com/TaiSHiNet)|1 +@mkotsbak|[@mkotsbak](https://github.com/mkotsbak)|1 +@natehouk|[@natehouk](https://github.com/natehouk)|1 +@phil-lavin|[@phil-lavin](https://github.com/phil-lavin)|1 +@S-Wilhelm|[@S-Wilhelm](https://github.com/S-Wilhelm)|1 +@Cottser|[@Cottser](https://github.com/Cottser)|1 +@soniah|[@soniah](https://github.com/soniah)|1 +@tapetersen|[@tapetersen](https://github.com/tapetersen)|1 +@tony|[@tony](https://github.com/tony)|1 +@wido|[@wido](https://github.com/wido)|1 +@abednarik|[@abednarik](https://github.com/abednarik)|1 +@jam13|[@jam13](https://github.com/jam13)|1 +@getSurreal|[@getSurreal](https://github.com/getSurreal)|1 +@slawekp|[@slawekp](https://github.com/slawekp)|1 +@tsia|[@tsia](https://github.com/tsia)|1 +@zhujinhe|[@zhujinhe](https://github.com/zhujinhe)|1 + +--- + +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-12. diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..3900c5c --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +# [0.50.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.49.0...v0.50.0) (2019-07-12) + + +### Features + +* **semantic-release:** implement for this formula ([1d2e2f5](https://github.com/saltstack-formulas/mysql-formula/commit/1d2e2f5)) diff --git a/FORMULA b/FORMULA index 0a2f4ce..ae7fdda 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 201507 +version: 0.50.0 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst new file mode 100644 index 0000000..f40929f --- /dev/null +++ b/docs/AUTHORS.rst @@ -0,0 +1,242 @@ +.. role:: raw-html-m2r(raw) + :format: html + + +Authors +======= + +This list is sorted by the number of commits per contributor in *descending* order. + +.. list-table:: + :header-rows: 1 + + * - Avatar + - Contributor + - Contributions + * - :raw-html-m2r:`@gravyboat` + - `@gravyboat `_ + - 38 + * - :raw-html-m2r:`@aboe76` + - `@aboe76 `_ + - 33 + * - :raw-html-m2r:`@nmadhok` + - `@nmadhok `_ + - 28 + * - :raw-html-m2r:`@whiteinge` + - `@whiteinge `_ + - 27 + * - :raw-html-m2r:`@noelmcloughlin` + - `@noelmcloughlin `_ + - 17 + * - :raw-html-m2r:`@alxwr` + - `@alxwr `_ + - 14 + * - :raw-html-m2r:`@cheuschober` + - `@cheuschober `_ + - 11 + * - :raw-html-m2r:`@babilen5` + - `@babilen5 `_ + - 11 + * - :raw-html-m2r:`@pprkut` + - `@pprkut `_ + - 9 + * - :raw-html-m2r:`@techhat` + - `@techhat `_ + - 7 + * - :raw-html-m2r:`@roock` + - `@roock `_ + - 6 + * - :raw-html-m2r:`@Routhinator` + - `@Routhinator `_ + - 5 + * - :raw-html-m2r:`@puneetk` + - `@puneetk `_ + - 5 + * - :raw-html-m2r:`@davidjb` + - `@davidjb `_ + - 5 + * - :raw-html-m2r:`@xenophonf` + - `@xenophonf `_ + - 4 + * - :raw-html-m2r:`@thatch45` + - `@thatch45 `_ + - 4 + * - :raw-html-m2r:`@toanju` + - `@toanju `_ + - 4 + * - :raw-html-m2r:`@tiger-seo` + - `@tiger-seo `_ + - 4 + * - :raw-html-m2r:`@gtmanfred` + - `@gtmanfred `_ + - 4 + * - :raw-html-m2r:`@alexhayes` + - `@alexhayes `_ + - 3 + * - :raw-html-m2r:`@alfonsfoubert` + - `@alfonsfoubert `_ + - 3 + * - :raw-html-m2r:`@cboltz` + - `@cboltz `_ + - 3 + * - :raw-html-m2r:`@pcdummy` + - `@pcdummy `_ + - 3 + * - :raw-html-m2r:`@amontalban` + - `@amontalban `_ + - 2 + * - :raw-html-m2r:`@iggy` + - `@iggy `_ + - 2 + * - :raw-html-m2r:`@ogabrielsantos` + - `@ogabrielsantos `_ + - 2 + * - :raw-html-m2r:`@kaharlichenko` + - `@kaharlichenko `_ + - 2 + * - :raw-html-m2r:`@javierbertoli` + - `@javierbertoli `_ + - 2 + * - :raw-html-m2r:`@neuhalje` + - `@neuhalje `_ + - 2 + * - :raw-html-m2r:`@stp-ip` + - `@stp-ip `_ + - 2 + * - :raw-html-m2r:`@RonWilliams` + - `@RonWilliams `_ + - 2 + * - :raw-html-m2r:`@ross-p` + - `@ross-p `_ + - 2 + * - :raw-html-m2r:`@srse` + - `@srse `_ + - 2 + * - :raw-html-m2r:`@tomasfejfar` + - `@tomasfejfar `_ + - 2 + * - :raw-html-m2r:`@vschum` + - `@vschum `_ + - 2 + * - :raw-html-m2r:`@madflojo` + - `@madflojo `_ + - 2 + * - :raw-html-m2r:`@UtahDave` + - `@UtahDave `_ + - 2 + * - :raw-html-m2r:`@nesteves` + - `@nesteves `_ + - 2 + * - :raw-html-m2r:`@1exx` + - `@1exx `_ + - 1 + * - :raw-html-m2r:`@aaronm-cloudtek` + - `@aaronm-cloudtek `_ + - 1 + * - :raw-html-m2r:`@Achimh3011` + - `@Achimh3011 `_ + - 1 + * - :raw-html-m2r:`@word` + - `@word `_ + - 1 + * - :raw-html-m2r:`@arthurlogilab` + - `@arthurlogilab `_ + - 1 + * - :raw-html-m2r:`@johnklehm` + - `@johnklehm `_ + - 1 + * - :raw-html-m2r:`@tardypad` + - `@tardypad `_ + - 1 + * - :raw-html-m2r:`@dosercz` + - `@dosercz `_ + - 1 + * - :raw-html-m2r:`@edusperoni` + - `@edusperoni `_ + - 1 + * - :raw-html-m2r:`@sivir` + - `@sivir `_ + - 1 + * - :raw-html-m2r:`@terminalmage` + - `@terminalmage `_ + - 1 + * - :raw-html-m2r:`@replicant0wnz` + - `@replicant0wnz `_ + - 1 + * - :raw-html-m2r:`@imran1008` + - `@imran1008 `_ + - 1 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 1 + * - :raw-html-m2r:`@JubbaSmail` + - `@JubbaSmail `_ + - 1 + * - :raw-html-m2r:`@h4ck3rm1k3` + - `@h4ck3rm1k3 `_ + - 1 + * - :raw-html-m2r:`@dijit` + - `@dijit `_ + - 1 + * - :raw-html-m2r:`@joejulian` + - `@joejulian `_ + - 1 + * - :raw-html-m2r:`@stromnet` + - `@stromnet `_ + - 1 + * - :raw-html-m2r:`@thejcannon` + - `@thejcannon `_ + - 1 + * - :raw-html-m2r:`@TaiSHiNet` + - `@TaiSHiNet `_ + - 1 + * - :raw-html-m2r:`@mkotsbak` + - `@mkotsbak `_ + - 1 + * - :raw-html-m2r:`@natehouk` + - `@natehouk `_ + - 1 + * - :raw-html-m2r:`@phil-lavin` + - `@phil-lavin `_ + - 1 + * - :raw-html-m2r:`@S-Wilhelm` + - `@S-Wilhelm `_ + - 1 + * - :raw-html-m2r:`@Cottser` + - `@Cottser `_ + - 1 + * - :raw-html-m2r:`@soniah` + - `@soniah `_ + - 1 + * - :raw-html-m2r:`@tapetersen` + - `@tapetersen `_ + - 1 + * - :raw-html-m2r:`@tony` + - `@tony `_ + - 1 + * - :raw-html-m2r:`@wido` + - `@wido `_ + - 1 + * - :raw-html-m2r:`@abednarik` + - `@abednarik `_ + - 1 + * - :raw-html-m2r:`@jam13` + - `@jam13 `_ + - 1 + * - :raw-html-m2r:`@getSurreal` + - `@getSurreal `_ + - 1 + * - :raw-html-m2r:`@slawekp` + - `@slawekp `_ + - 1 + * - :raw-html-m2r:`@tsia` + - `@tsia `_ + - 1 + * - :raw-html-m2r:`@zhujinhe` + - `@zhujinhe `_ + - 1 + + +---- + +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-07-12. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst new file mode 100644 index 0000000..849c299 --- /dev/null +++ b/docs/CHANGELOG.rst @@ -0,0 +1,12 @@ + +Changelog +========= + +`0.50.0 `_ (2019-07-12) +---------------------------------------------------------------------------------------------------------- + +Features +^^^^^^^^ + + +* **semantic-release:** implement for this formula (\ `1d2e2f5 `_\ ) From a067c5853ad996b093c503242cacbb9dfe8e43d7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 18 Jul 2019 03:59:59 +0100 Subject: [PATCH 055/139] chore: use `semantic-release` cross-formula standard structure * Automated using `ssf-formula` (v0.1.0-rc.1) --- .gitignore | 9 ++++++++ .travis.yml | 5 ++++- docs/CONTRIBUTING.rst | 1 + kitchen.yml | 34 +++++++++++++++-------------- test/integration/default/README.md | 4 ++-- test/integration/default/inspec.yml | 4 +++- 6 files changed, 37 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index ba07ed8..0bbb03c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ coverage.xml .kitchen .kitchen.local.yml kitchen.local.yml +junit-*.xml # Translations *.mo @@ -111,3 +112,11 @@ docs/*.md # Vim *.sw? + +## Collected when centralising formulas (check and sort) +# `collectd-formula` +.pytest_cache/ +/.idea/ +Dockerfile.*_* +ignore/ +tmp/ diff --git a/.travis.yml b/.travis.yml index e26d989..f4d3d87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- stages: - test - commitlint @@ -42,7 +45,7 @@ env: # - INSTANCE: default-amazonlinux-2-2017-7-py2 script: - - bundle exec kitchen verify ${INSTANCE} + - bin/kitchen verify ${INSTANCE} jobs: include: diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 5da9ae8..b7da8f4 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -156,3 +156,4 @@ An example of that: BREAKING CHANGE: With the removal of all of the `.sls` files under `template package`, this formula no longer supports the installation of packages. + diff --git a/kitchen.yml b/kitchen.yml index 510cd28..1d201c7 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -50,7 +50,7 @@ platforms: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - ## SALT 2019.2 + ## SALT `2019.2` - name: debian-9-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:debian-9 @@ -71,7 +71,7 @@ platforms: driver: image: netmanagers/salt-2019.2-py2:amazonlinux-2 - ## SALT 2018.3 + ## SALT `2018.3` - name: debian-9-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:debian-9 @@ -92,7 +92,7 @@ platforms: driver: image: netmanagers/salt-2018.3-py2:amazonlinux-2 - ## SALT 2017.7 + ## SALT `2017.7` - name: debian-8-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:debian-8 @@ -123,17 +123,6 @@ provisioner: salt_copy_filter: - .kitchen - .git - state_top: - base: - '*': - - mysql - pillars: - top.sls: - base: - '*': - - mysql - pillars_from_files: - mysql.sls: test/salt/pillar/mysql.sls verifier: # https://www.inspec.io/ @@ -142,8 +131,21 @@ verifier: # cli, documentation, html, progress, json, json-min, json-rspec, junit reporter: - cli - inspec_tests: - - path: test/integration/default suites: - name: default + provisioner: + state_top: + base: + '*': + - mysql + pillars: + top.sls: + base: + '*': + - mysql + pillars_from_files: + mysql.sls: test/salt/pillar/mysql.sls + verifier: + inspec_tests: + - path: test/integration/default diff --git a/test/integration/default/README.md b/test/integration/default/README.md index 8019607..37cf963 100644 --- a/test/integration/default/README.md +++ b/test/integration/default/README.md @@ -1,6 +1,6 @@ -# Default InSpec Profile +# InSpec Profile: `default` -This shows the implementation of the Default InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). +This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md). ## Verify a profile diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 8a3f50e..e8225c4 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -1,4 +1,4 @@ -name: mysql +name: default title: mysql formula maintainer: SaltStack Formulas license: Apache-2.0 @@ -10,3 +10,5 @@ supports: - platform-name: fedora - platform-name: opensuse - platform-name: suse + - platform-name: freebsd + - platform-name: amazon From 4b4ad882c883c8c19cabf16bd3eefdf57a65dff5 Mon Sep 17 00:00:00 2001 From: N Date: Sat, 3 Aug 2019 15:15:24 +0100 Subject: [PATCH 056/139] feat(linux): archlinux support (no osmajorrelase grain) --- mysql/osfamilymap.yaml | 8 ++++---- mysql/osmap.yaml | 2 +- mysql/repo.sls | 2 +- mysql/server.sls | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index b402d6f..bde1923 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -2,7 +2,7 @@ # Debian: - {% if salt['grains.get']('osmajorrelease')|int >= 9 %} + {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int >= 9 %} serverpkg: mariadb-server service: mariadb clientpkg: mariadb-client @@ -42,13 +42,13 @@ Debian: key_buffer_size: 16M append: | !includedir /etc/mysql/conf.d/ - # {% if salt['grains.get']('osmajorrelease')|int >= 9 -%} + # {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int >= 9 -%} # !includedir /etc/mysql/mariadb.conf.d/ # {%- endif %} RedHat: #https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if salt['grains.get']('osmajorrelease')|int in [7] %} + {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int in [7] %} {% set fork = 'mariadb' %} serverpkg: mariadb-server service: mariadb @@ -75,7 +75,7 @@ RedHat: Suse: serverpkg: mariadb clientpkg: mariadb-client - {%- if salt['grains.get']('osmajorrelease')|int == 42 %} + {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int == 42 %} # "old" package name up to Leap 42.x pythonpkg: python-PyMySQL {% else %} diff --git a/mysql/osmap.yaml b/mysql/osmap.yaml index 37e7d8c..88f1618 100644 --- a/mysql/osmap.yaml +++ b/mysql/osmap.yaml @@ -24,7 +24,7 @@ Ubuntu: CentOS: # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if salt['grains.get']('osmajorrelease')|int in [7] %} + {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int in [7] %} {% set fork = 'mariadb' %} {% set service = 'mariadb' %} {%- else %} diff --git a/mysql/repo.sls b/mysql/repo.sls index c344abb..d817107 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -6,7 +6,7 @@ include: # Completely ignore non-RHEL based systems # TODO: Add Debian and Suse systems. # TODO: Allow user to specify MySQL version and alter yum repo file accordingly. -{% if grains['os_family'] == 'RedHat' %} +{% if grains['os_family'] == 'RedHat' and `osmajorrelease` in grains %} {% if grains['osmajorrelease']|int == 5 %} {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %} {% elif grains['osmajorrelease']|int == 6 %} diff --git a/mysql/server.sls b/mysql/server.sls index 5f3e6f5..c69c98e 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -29,7 +29,7 @@ mysql_debconf: - require: - pkg: mysql_debconf_utils - {% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} + {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} mysql_password_debconf: debconf.set: From bdee94aaed853b1451fa1727353f5c98a0f9b88f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 8 Aug 2019 15:36:34 +0100 Subject: [PATCH 057/139] fix(connector): fix typos (connnector) and missing `enabled` --- mysql/defaults.yaml | 3 ++- pillar.example | 2 +- test/salt/pillar/mysql.sls | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 5d3fac0..89c04b2 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -82,7 +82,8 @@ mysql: enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' - connnector: + connector: + enabled: False url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' forvisualstudio: diff --git a/pillar.example b/pillar.example index 112d542..97be825 100644 --- a/pillar.example +++ b/pillar.example @@ -195,7 +195,7 @@ mysql: enabled: False #default url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' - connnector: + connector: enabled: False #default url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' diff --git a/test/salt/pillar/mysql.sls b/test/salt/pillar/mysql.sls index 13fe377..458fa06 100644 --- a/test/salt/pillar/mysql.sls +++ b/test/salt/pillar/mysql.sls @@ -194,7 +194,7 @@ mysql: enabled: False #default url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' - connnector: + connector: enabled: False #default url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' From c57511124d73b429154dcfa141752c1d861606ff Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 8 Aug 2019 20:14:33 +0000 Subject: [PATCH 058/139] chore(release): 0.51.0 [skip ci] # [0.51.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.50.0...v0.51.0) (2019-08-08) ### Bug Fixes * **connector:** fix typos (connnector) and missing `enabled` ([bdee94a](https://github.com/saltstack-formulas/mysql-formula/commit/bdee94a)) ### Features * **linux:** archlinux support (no osmajorrelase grain) ([4b4ad88](https://github.com/saltstack-formulas/mysql-formula/commit/4b4ad88)) --- AUTHORS.md | 9 +++++---- CHANGELOG.md | 12 ++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 15 +++++++++------ docs/CHANGELOG.rst | 15 +++++++++++++++ 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 34f0f9a..6d4086b 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,10 +5,10 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 -@aboe76|[@aboe76](https://github.com/aboe76)|33 +@aboe76|[@aboe76](https://github.com/aboe76)|35 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @whiteinge|[@whiteinge](https://github.com/whiteinge)|27 -@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|17 +@noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @alxwr|[@alxwr](https://github.com/alxwr)|14 @cheuschober|[@cheuschober](https://github.com/cheuschober)|11 @babilen5|[@babilen5](https://github.com/babilen5)|11 @@ -24,6 +24,7 @@ Avatar|Contributor|Contributions @tiger-seo|[@tiger-seo](https://github.com/tiger-seo)|4 @gtmanfred|[@gtmanfred](https://github.com/gtmanfred)|4 @alexhayes|[@alexhayes](https://github.com/alexhayes)|3 +@myii|[@myii](https://github.com/myii)|3 @alfonsfoubert|[@alfonsfoubert](https://github.com/alfonsfoubert)|3 @cboltz|[@cboltz](https://github.com/cboltz)|3 @pcdummy|[@pcdummy](https://github.com/pcdummy)|3 @@ -55,7 +56,6 @@ Avatar|Contributor|Contributions @terminalmage|[@terminalmage](https://github.com/terminalmage)|1 @replicant0wnz|[@replicant0wnz](https://github.com/replicant0wnz)|1 @imran1008|[@imran1008](https://github.com/imran1008)|1 -@myii|[@myii](https://github.com/myii)|1 @JubbaSmail|[@JubbaSmail](https://github.com/JubbaSmail)|1 @h4ck3rm1k3|[@h4ck3rm1k3](https://github.com/h4ck3rm1k3)|1 @dijit|[@dijit](https://github.com/dijit)|1 @@ -78,7 +78,8 @@ Avatar|Contributor|Contributions @slawekp|[@slawekp](https://github.com/slawekp)|1 @tsia|[@tsia](https://github.com/tsia)|1 @zhujinhe|[@zhujinhe](https://github.com/zhujinhe)|1 +@daks|[@daks](https://github.com/daks)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-12. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-08. diff --git a/CHANGELOG.md b/CHANGELOG.md index 3900c5c..0c80a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +# [0.51.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.50.0...v0.51.0) (2019-08-08) + + +### Bug Fixes + +* **connector:** fix typos (connnector) and missing `enabled` ([bdee94a](https://github.com/saltstack-formulas/mysql-formula/commit/bdee94a)) + + +### Features + +* **linux:** archlinux support (no osmajorrelase grain) ([4b4ad88](https://github.com/saltstack-formulas/mysql-formula/commit/4b4ad88)) + # [0.50.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.49.0...v0.50.0) (2019-07-12) diff --git a/FORMULA b/FORMULA index ae7fdda..6c0f35f 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.50.0 +version: 0.51.0 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index f40929f..06f50d2 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -18,7 +18,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 38 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - - 33 + - 35 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 28 @@ -27,7 +27,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 27 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - - 17 + - 18 * - :raw-html-m2r:`@alxwr` - `@alxwr `_ - 14 @@ -73,6 +73,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@alexhayes` - `@alexhayes `_ - 3 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 3 * - :raw-html-m2r:`@alfonsfoubert` - `@alfonsfoubert `_ - 3 @@ -166,9 +169,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@imran1008` - `@imran1008 `_ - 1 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 1 * - :raw-html-m2r:`@JubbaSmail` - `@JubbaSmail `_ - 1 @@ -235,8 +235,11 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@zhujinhe` - `@zhujinhe `_ - 1 + * - :raw-html-m2r:`@daks` + - `@daks `_ + - 1 ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-07-12. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-08. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 849c299..a47f02e 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`0.51.0 `_ (2019-08-08) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **connector:** fix typos (connnector) and missing ``enabled`` (\ `bdee94a `_\ ) + +Features +^^^^^^^^ + + +* **linux:** archlinux support (no osmajorrelase grain) (\ `4b4ad88 `_\ ) + `0.50.0 `_ (2019-07-12) ---------------------------------------------------------------------------------------------------------- From 6cd8e36da0b225bb1bc8e11d55c3c96602dcdbbd Mon Sep 17 00:00:00 2001 From: Andre Sencioles Date: Tue, 13 Aug 2019 12:17:22 +1200 Subject: [PATCH 059/139] Fix typo in repo.sls --- mysql/repo.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/repo.sls b/mysql/repo.sls index d817107..63d01ec 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -6,7 +6,7 @@ include: # Completely ignore non-RHEL based systems # TODO: Add Debian and Suse systems. # TODO: Allow user to specify MySQL version and alter yum repo file accordingly. -{% if grains['os_family'] == 'RedHat' and `osmajorrelease` in grains %} +{% if grains['os_family'] == 'RedHat' and 'osmajorrelease' in grains %} {% if grains['osmajorrelease']|int == 5 %} {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %} {% elif grains['osmajorrelease']|int == 6 %} From 9f739fa8b448085ecac2b2a41bf90a3ec2c5eded Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 6 Aug 2019 20:54:25 +0100 Subject: [PATCH 060/139] feat(yamllint): include for this repo and apply rules throughout * Semi-automated using `ssf-formula` (v0.5.0) * Fix (or ignore) errors shown below: ```bash mysql-formula$ $(grep "\- yamllint" .travis.yml | sed -e "s:^\s\+-\s\(.*\):\1:") ./mysql/osfamilymap.yaml 4:1 warning missing document start "---" (document-start) 5:6 error syntax error: found character '%' that cannot start any token 94:17 error trailing spaces (trailing-spaces) 191:89 error line too long (90 > 88 characters) (line-length) ./mysql/defaults.yaml 3:1 warning missing document start "---" (document-start) 7:4 error syntax error: found character '%' that cannot start any token 44:89 error line too long (93 > 88 characters) (line-length) 51:89 error line too long (111 > 88 characters) (line-length) 58:89 error line too long (104 > 88 characters) (line-length) 65:89 error line too long (103 > 88 characters) (line-length) 71:89 error line too long (95 > 88 characters) (line-length) 77:89 error line too long (102 > 88 characters) (line-length) 83:89 error line too long (101 > 88 characters) (line-length) 86:89 error line too long (95 > 88 characters) (line-length) 90:89 error line too long (95 > 88 characters) (line-length) ./mysql/supported_sections.yaml 2:2 error syntax error: found character '%' that cannot start any token ./mysql/osmap.yaml 4:4 error syntax error: found character '%' that cannot start any token 7:89 error line too long (96 > 88 characters) (line-length) 8:89 error line too long (97 > 88 characters) (line-length) pillar.example 1:1 warning missing document start "---" (document-start) 36:8 error wrong indentation: expected 8 but found 7 (indentation) 77:16 warning truthy value should be one of [false, true] (truthy) 80:13 warning truthy value should be one of [false, true] (truthy) 83:13 warning truthy value should be one of [false, true] (truthy) 85:13 warning truthy value should be one of [false, true] (truthy) 89:13 warning truthy value should be one of [false, true] (truthy) 96:13 warning truthy value should be one of [false, true] (truthy) 112:19 warning truthy value should be one of [false, true] (truthy) 117:17 warning too few spaces before comment (comments) 118:12 warning truthy value should be one of [false, true] (truthy) 119:17 warning truthy value should be one of [false, true] (truthy) 130:25 warning truthy value should be one of [false, true] (truthy) 131:19 warning truthy value should be one of [false, true] (truthy) 153:16 warning truthy value should be one of [false, true] (truthy) 166:14 warning truthy value should be one of [false, true] (truthy) 171:18 warning truthy value should be one of [false, true] (truthy) 172:89 error line too long (93 > 88 characters) (line-length) 175:18 warning truthy value should be one of [false, true] (truthy) 176:89 error line too long (111 > 88 characters) (line-length) 179:18 warning truthy value should be one of [false, true] (truthy) 179:26 warning missing starting space in comment (comments) 180:89 error line too long (104 > 88 characters) (line-length) 183:18 warning truthy value should be one of [false, true] (truthy) 183:26 warning missing starting space in comment (comments) 184:89 error line too long (103 > 88 characters) (line-length) 187:18 warning truthy value should be one of [false, true] (truthy) 187:26 warning missing starting space in comment (comments) 188:89 error line too long (95 > 88 characters) (line-length) 191:18 warning truthy value should be one of [false, true] (truthy) 191:26 warning missing starting space in comment (comments) 192:89 error line too long (102 > 88 characters) (line-length) 195:18 warning truthy value should be one of [false, true] (truthy) 195:26 warning missing starting space in comment (comments) 196:89 error line too long (101 > 88 characters) (line-length) 199:18 warning truthy value should be one of [false, true] (truthy) 199:26 warning missing starting space in comment (comments) 200:89 error line too long (95 > 88 characters) (line-length) 203:18 warning truthy value should be one of [false, true] (truthy) 203:26 warning missing starting space in comment (comments) 204:89 error line too long (95 > 88 characters) (line-length) 207:18 warning truthy value should be one of [false, true] (truthy) 207:26 warning missing starting space in comment (comments) 211:18 warning truthy value should be one of [false, true] (truthy) 211:26 warning missing starting space in comment (comments) 214:1 error too many blank lines (1 > 0) (empty-lines) test/salt/pillar/mysql.sls 1:1 warning missing document start "---" (document-start) 36:8 error wrong indentation: expected 8 but found 7 (indentation) 77:16 warning truthy value should be one of [false, true] (truthy) 80:13 warning truthy value should be one of [false, true] (truthy) 82:13 warning truthy value should be one of [false, true] (truthy) 84:13 warning truthy value should be one of [false, true] (truthy) 88:13 warning truthy value should be one of [false, true] (truthy) 95:13 warning truthy value should be one of [false, true] (truthy) 111:19 warning truthy value should be one of [false, true] (truthy) 152:16 warning truthy value should be one of [false, true] (truthy) 165:14 warning truthy value should be one of [false, true] (truthy) 170:18 warning truthy value should be one of [false, true] (truthy) 171:89 error line too long (93 > 88 characters) (line-length) 174:18 warning truthy value should be one of [false, true] (truthy) 175:89 error line too long (111 > 88 characters) (line-length) 178:18 warning truthy value should be one of [false, true] (truthy) 178:26 warning missing starting space in comment (comments) 179:89 error line too long (104 > 88 characters) (line-length) 182:18 warning truthy value should be one of [false, true] (truthy) 182:26 warning missing starting space in comment (comments) 183:89 error line too long (103 > 88 characters) (line-length) 186:18 warning truthy value should be one of [false, true] (truthy) 186:26 warning missing starting space in comment (comments) 187:89 error line too long (95 > 88 characters) (line-length) 190:18 warning truthy value should be one of [false, true] (truthy) 190:26 warning missing starting space in comment (comments) 191:89 error line too long (102 > 88 characters) (line-length) 194:18 warning truthy value should be one of [false, true] (truthy) 194:26 warning missing starting space in comment (comments) 195:89 error line too long (101 > 88 characters) (line-length) 198:18 warning truthy value should be one of [false, true] (truthy) 198:26 warning missing starting space in comment (comments) 199:89 error line too long (95 > 88 characters) (line-length) 202:18 warning truthy value should be one of [false, true] (truthy) 202:26 warning missing starting space in comment (comments) 203:89 error line too long (95 > 88 characters) (line-length) 206:18 warning truthy value should be one of [false, true] (truthy) 206:26 warning missing starting space in comment (comments) 210:18 warning truthy value should be one of [false, true] (truthy) 210:26 warning missing starting space in comment (comments) 213:1 error too many blank lines (1 > 0) (empty-lines) ``` --- .travis.yml | 13 +++-- .yamllint | 18 +++++++ mysql/defaults.yaml | 57 +++++++++++---------- mysql/map.jinja | 70 +++++++++++++++++++++----- mysql/osfamilymap.yaml | 56 ++++++--------------- mysql/osfingermap.yaml | 67 +++++++++++++++++++++++++ mysql/osmap.yaml | 26 ++-------- pillar.example | 77 +++++++++++++++++------------ test/integration/default/inspec.yml | 3 ++ test/salt/pillar/mysql.sls | 75 ++++++++++++++++------------ 10 files changed, 296 insertions(+), 166 deletions(-) create mode 100644 .yamllint create mode 100644 mysql/osfingermap.yaml diff --git a/.travis.yml b/.travis.yml index f4d3d87..17291d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ --- stages: - test - - commitlint + - lint - name: release if: branch = master AND type != pull_request @@ -49,16 +49,21 @@ script: jobs: include: - # Define the commitlint stage - - stage: commitlint + # Define the `lint` stage (runs `yamllint` and `commitlint`) + - stage: lint language: node_js node_js: lts/* before_install: skip script: + # Install and run `yamllint` + - pip install --user yamllint + # yamllint disable-line rule:line-length + - yamllint -s . .yamllint pillar.example test/salt/pillar/mysql.sls + # Install and run `commitlint` - npm install @commitlint/config-conventional -D - npm install @commitlint/travis-cli -D - commitlint-travis - # Define the release stage that runs semantic-release + # Define the release stage that runs `semantic-release` - stage: release language: node_js node_js: lts/* diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..8cee7a4 --- /dev/null +++ b/.yamllint @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +# Extend the `default` configuration provided by `yamllint` +extends: default + +# Files to ignore completely +# 1. All YAML files under directory `node_modules/`, introduced during the Travis run +# 2. Any YAML files using Jinja (result in `yamllint` syntax errors) +ignore: | + node_modules/ + mysql/supported_sections.yaml + +rules: + line-length: + # Increase from default of `80` + # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) + max: 88 diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 89c04b2..0e96037 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -1,14 +1,10 @@ -# vim: sts=2 ts=2 sw=2 et ai -# +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- mysql: serverpkg: mysql-server clientpkg: mysql-client service: mysql - {%- if grains.pythonversion[0] == 2 %} - pythonpkg: python-mysqldb - {% else %} - pythonpkg: python3-mysqldb - {% endif %} devpkg: mysql-devel debconf_utils: debconf-utils @@ -40,66 +36,77 @@ mysql: retries: 2 products: community_server: - enabled: True + enabled: true + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg sum: 'md5=602a84390ecf3d82025b1d99fc594124' - isapp: False + isapp: false path: /usr/local/mysql app: mysql workbench: - enabled: True + enabled: true + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' - isapp: True + isapp: true path: /Applications/MySQLWorkbench/Contents/Versions/latest app: MySQLWorkbench cluster: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' - isapp: False + isapp: false path: /usr/local/mysqlcluster app: MySQLCluster router: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' - isapp: False + isapp: false app: MySQLRouter utilities: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' - isapp: True ## ?? + isapp: true ## ?? app: MySQLUtilties shell: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' - isapp: True ## ?? + isapp: true ## ?? app: MySQLShell proxy: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' connector: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' forvisualstudio: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip sum: 'md5=fcf39316505ee2921e31a431eae77a9c' forexcel: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' notifier: - enabled: False + enabled: false + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip sum: 'md5=349f1994681763fd6626a8ddf6be5363' - #The following dict names are reserved for pillar data (see pillar.example) + # The following dict names are reserved for pillar data (see pillar.example) global: {} clients: {} library: {} diff --git a/mysql/map.jinja b/mysql/map.jinja index 5d6bfa8..f4351ac 100644 --- a/mysql/map.jinja +++ b/mysql/map.jinja @@ -1,17 +1,61 @@ -{% import_yaml "mysql/defaults.yaml" as defaults %} -{% import_yaml "mysql/osfamilymap.yaml" as osfamilymap %} -{% import_yaml "mysql/osmap.yaml" as osmap %} +# -*- coding: utf-8 -*- +# vim: ft=jinja -{% set mysql = salt['grains.filter_by']( - defaults, - merge=salt['grains.filter_by']( - osfamilymap, - grain='os_family', +{#- Get the `tplroot` from `tpldir` #} +{%- set tplroot = tpldir.split('/')[0] %} +{#- Start imports as #} +{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %} +{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %} +{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %} +{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %} + +{#- Retrieve the config dict only once #} +{%- set _config = salt['config.get'](tplroot, default={}) %} + +{%- set py_ver_settings = { + 2: {'pythonpkg': 'python-mysqldb'}, + 3: {'pythonpkg': 'python3-mysqldb'}, + } %} + +{%- set defaults = salt['grains.filter_by']( + py_ver_settings, + default=grains.pythonversion[0], + merge=salt['grains.filter_by']( + default_settings, + default=tplroot, merge=salt['grains.filter_by']( + osfamilymap, + grain='os_family', + merge=salt['grains.filter_by']( osmap, grain='os', - merge=salt['pillar.get']('mysql', {}), - ), - ), - base='mysql', -) %} + merge=salt['grains.filter_by']( + osfingermap, + grain='osfinger', + merge=salt['grains.filter_by']( + _config, + default='lookup' + ) + ) + ) + ) + ) + ) +%} + +{%- set config = salt['grains.filter_by']( + {'defaults': defaults}, + default='defaults', + merge=_config + ) +%} + +{%- set mysql = config %} + +{#- Post-processing for specific non-YAML customisations #} +{%- if grains.os == 'MacOS' %} +{%- set macos_user = salt['pillar.get']('mysql:user', salt['cmd.run']("stat -f '%Su' /dev/console")) %} +{%- set macos_group = salt['pillar.get']('mysql:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) %} +{%- do mysql.macos.update({'user': macos_user}) %} +{%- do mysql.macos.update({'group': macos_group}) %} +{%- endif %} diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index bde1923..9e032db 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -1,15 +1,8 @@ -# vim: sts=2 ts=2 sw=2 et ai -# - +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- Debian: - {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int >= 9 %} - serverpkg: mariadb-server - service: mariadb - clientpkg: mariadb-client - devpkg: libmariadbclient-dev - {% else %} devpkg: libmysqlclient-dev - {% endif %} config: sections: @@ -20,7 +13,7 @@ Debian: pid_file: /var/run/mysqld/mysqld.pid basedir: /usr tmpdir: /tmp - lc_messages_dir: /usr/share/mysql + lc_messages_dir: /usr/share/mysql skip_external_locking: noarg_present bind_address: 127.0.0.1 key_buffer_size: 16M @@ -31,9 +24,9 @@ Debian: query_cache_size: 16M expire_logs_days: 10 max_binlog_size: 100M - #innodb_flush_log_at_trx_commit: 1 - #innodb_lock_wait_timeout: 50 - #innodb_file_per_table: noarg_present + # innodb_flush_log_at_trx_commit: 1 + # innodb_lock_wait_timeout: 50 + # innodb_file_per_table: noarg_present mysqldump: quick: noarg_present quote_names: noarg_present @@ -42,31 +35,18 @@ Debian: key_buffer_size: 16M append: | !includedir /etc/mysql/conf.d/ - # {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int >= 9 -%} - # !includedir /etc/mysql/mariadb.conf.d/ - # {%- endif %} RedHat: - #https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int in [7] %} - {% set fork = 'mariadb' %} - serverpkg: mariadb-server - service: mariadb - devpkg: mariadb-devel - {%- else %} - {% set fork = 'mysql' %} service: mysqld - {%- endif %} - - clientpkg: {{ fork }} + clientpkg: mysql pythonpkg: MySQL-python config: file: /etc/my.cnf sections: client: mysqld_safe: - log_error: /var/log/{{ fork }}/mysqld.log - pid_file: /var/run/{{ fork }}/mysqld.pid + log_error: /var/log/mysql/mysqld.log + pid_file: /var/run/mysql/mysqld.pid mysqld: socket: /var/lib/mysql/mysql.sock bind_address: 127.0.0.1 @@ -75,12 +55,7 @@ RedHat: Suse: serverpkg: mariadb clientpkg: mariadb-client - {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int == 42 %} - # "old" package name up to Leap 42.x - pythonpkg: python-PyMySQL - {% else %} pythonpkg: python2-pymysql - {% endif %} config: file: /etc/my.cnf @@ -91,10 +66,10 @@ Suse: port: user: socket: - datadir: + datadir: tmpdir: innodb_file_format: Barracuda - innodb_file_per_table: ON + innodb_file_per_table: 'ON' server-id: 1 sql_mode: NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES mysqld_multi: @@ -178,7 +153,7 @@ Gentoo: default_character_set: utf8 myisamchk: character_sets_dir: /usr/share/mysql/charsets - key_buffer: 20M ##????? key_buffer_size ? + key_buffer: 20M ## ????? key_buffer_size ? sort_buffer_size: 20M read_buffer: 2M write_buffer: 2M @@ -188,7 +163,8 @@ Gentoo: err_log: /var/log/mysql/mysql.err mysqld: character_set_serverpkg: utf8 - # note: the gentoo init.d script specifically needs pid-file (dash not underscore) + # note: the gentoo init.d script specifically needs pid-file + # (dash not underscore) pid-file: /var/run/mysqld/mysqld.pid log_error: /var/log/mysql/mysqld.err basedir: /usr @@ -217,7 +193,7 @@ Gentoo: innodb_lock_wait_timeout: 50 innodb_file_per_table: noarg_present isamchk: - key_buffer: 20M ##????? key_buffer_size ? + key_buffer: 20M ## ????? key_buffer_size ? sort_buffer_size: 20M read_buffer: 2M write_buffer: 2M diff --git a/mysql/osfingermap.yaml b/mysql/osfingermap.yaml new file mode 100644 index 0000000..7797a8b --- /dev/null +++ b/mysql/osfingermap.yaml @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +# Debian +Debian-10: + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb-client + devpkg: libmariadbclient-dev + config: + append: | + !includedir /etc/mysql/conf.d/ + # !includedir /etc/mysql/mariadb.conf.d/ +Debian-9: + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb-client + devpkg: libmariadbclient-dev + config: + append: | + !includedir /etc/mysql/conf.d/ + # !includedir /etc/mysql/mariadb.conf.d/ +# Ubuntu +Ubuntu-18.04: + serverpkg: mariadb-server + # service: mariadb + clientpkg: mariadb-client + # devpkg: libmariadbclient-dev +Ubuntu-16.04: + serverpkg: mariadb-server + # service: mariadb + clientpkg: mariadb-client + # devpkg: libmariadbclient-dev + +# Redhat +Redhat-7: + # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb + devpkg: mariadb-devel + config: + sections: + mysqld_safe: + log_error: /var/log/mariadb/mysqld.log + pid_file: /var/run/mariadb/mysqld.pid +# CentOS +CentOS Linux-7: + # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb + devpkg: mariadb-devel + config: + sections: + mysqld_safe: + log_error: /var/log/mariadb/mysqld.log + pid_file: /var/run/mariadb/mysqld.pid + server_config: + sections: + mysqld_safe: + log_error: /var/log/mariadb/mysqld.log + pid_file: /var/run/mariadb/mysqld.pid + +# Suse +Leap-42: + pythonpkg: python-PyMySQL diff --git a/mysql/osmap.yaml b/mysql/osmap.yaml index 88f1618..c2cf746 100644 --- a/mysql/osmap.yaml +++ b/mysql/osmap.yaml @@ -1,13 +1,6 @@ -# vim: ft=sls -# vim: sts=2 ts=2 sw=2 et ai - - {% if grains.os == 'MacOS' %} -MacOS: - macos: - user: {{ salt['pillar.get']('mysql:user', salt['cmd.run']("stat -f '%Su' /dev/console")) }} - group: {{ salt['pillar.get']('mysql:group', salt['cmd.run']("stat -f '%Sg' /dev/console")) }} - {% endif %} - +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- Debian: service: mysql @@ -23,22 +16,13 @@ Ubuntu: !includedir /etc/mysql/conf.d/ CentOS: - # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look - {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int in [7] %} - {% set fork = 'mariadb' %} - {% set service = 'mariadb' %} - {%- else %} - {% set fork = 'mysql' %} - {% set service = 'mysqld' %} - {%- endif %} - config_directory: /etc/my.cnf.d/ server_config: file: server.cnf sections: mysqld_safe: - log_error: /var/log/{{ fork }}/mysqld.log - pid_file: /var/run/{{ fork }}/mysqld.pid + log_error: /var/log/mysql/mysqld.log + pid_file: /var/run/mysql/mysqld.pid mysqld: socket: /var/lib/mysql/mysql.sock bind_address: 127.0.0.1 diff --git a/pillar.example b/pillar.example index 97be825..e2944f9 100644 --- a/pillar.example +++ b/pillar.example @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- mysql: global: client-server: @@ -33,10 +36,10 @@ mysql: binlog_do_db: foo auto_increment_increment: 5 binlog-ignore-db: - - mysql - - sys - - information_schema - - performance_schema + - mysql + - sys + - information_schema + - performance_schema mysql: # my.cnf param that not require value no-auto-rehash: noarg_present @@ -74,26 +77,26 @@ mysql: collate: utf8_general_ci # Delete DB - name: obsolete_db - present: False + present: false schema: foo: - load: True + load: true source: salt://{{ tpldir }}/files/foo.schema bar: - load: False + load: false baz: - load: True + load: true source: salt://{{ tpldir }}/files/baz.schema.tmpl template: jinja qux: - load: True + load: true source: salt://{{ tpldir }}/files/qux.schema.tmpl template: jinja context: encabulator: Turbo girdlespring: differential quux: - load: True + load: true source: salt://{{ tpldir }}/files/qux.schema.tmpl template: jinja context: @@ -109,14 +112,14 @@ mysql: databases: - database: foo grants: ['select', 'insert', 'update'] - escape: True + escape: true - database: bar grants: ['all privileges'] bob: password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' - host: '%' # Any host - ssl: True - ssl-X509: True + host: '%' # Any host + ssl: true + ssl-X509: true ssl-SUBJECT: Subject ssl-ISSUER: Name ssl-CIPHER: Cipher @@ -127,8 +130,8 @@ mysql: # use two '%' - database: '`foo\_%%`' grants: ['all privileges'] - grant_option: True - escape: False + grant_option: true + escape: false - database: bar table: foobar grants: ['select', 'insert', 'update', 'delete'] @@ -149,8 +152,8 @@ mysql: # Remove a user obsoleteuser: host: localhost - # defaults to True - present: False + # defaults to true + present: false # Override any names defined in map.jinja # serverpkg: mysql-server @@ -162,53 +165,63 @@ mysql: # Install MySQL headers dev: - # Install dev package - defaults to False - install: False + # Install dev package - defaults to false + install: false macos: products: community_server: - enabled: True # default + enabled: true # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg sum: 'md5=602a84390ecf3d82025b1d99fc594124' workbench: - enabled: True # default + enabled: true # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' cluster: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' router: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' utilities: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' shell: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' proxy: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' connector: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' forvisualstudio: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip sum: 'md5=fcf39316505ee2921e31a431eae77a9c' forexcel: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' notifier: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip sum: 'md5=349f1994681763fd6626a8ddf6be5363' - diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index e8225c4..37a67a2 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- name: default title: mysql formula maintainer: SaltStack Formulas diff --git a/test/salt/pillar/mysql.sls b/test/salt/pillar/mysql.sls index 458fa06..17a3124 100644 --- a/test/salt/pillar/mysql.sls +++ b/test/salt/pillar/mysql.sls @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- mysql: global: client-server: @@ -33,10 +36,10 @@ mysql: binlog_do_db: foo auto_increment_increment: 5 binlog-ignore-db: - - mysql - - sys - - information_schema - - performance_schema + - mysql + - sys + - information_schema + - performance_schema mysql: # my.cnf param that not require value no-auto-rehash: noarg_present @@ -74,25 +77,25 @@ mysql: collate: utf8_general_ci # Delete DB - name: obsolete_db - present: False + present: false schema: foo: - load: False + load: false bar: - load: False + load: false baz: - load: True + load: true source: salt://{{ tpldir }}/files/baz.schema.tmpl template: jinja qux: - load: True + load: true source: salt://{{ tpldir }}/files/qux.schema.tmpl template: jinja context: encabulator: Turbo girdlespring: differential quux: - load: True + load: true source: salt://{{ tpldir }}/files/qux.schema.tmpl template: jinja context: @@ -108,14 +111,14 @@ mysql: databases: - database: foo grants: ['select', 'insert', 'update'] - escape: True + escape: true - database: bar grants: ['all privileges'] # bob: # password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' # host: '%' # Any host - # ssl: True - # ssl-X509: True + # ssl: true + # ssl-X509: true # ssl-SUBJECT: Subject # ssl-ISSUER: Name # ssl-CIPHER: Cipher @@ -126,8 +129,8 @@ mysql: # # use two '%' # - database: '`foo\_%%`' # grants: ['all privileges'] - # grant_option: True - # escape: False + # grant_option: true + # escape: false # - database: bar # table: foobar # grants: ['select', 'insert', 'update', 'delete'] @@ -148,8 +151,8 @@ mysql: # Remove a user obsoleteuser: host: localhost - # defaults to True - present: False + # defaults to true + present: false # Override any names defined in map.jinja # serverpkg: mysql-server @@ -161,53 +164,63 @@ mysql: # Install MySQL headers dev: - # Install dev package - defaults to False - install: False + # Install dev package - defaults to false + install: false macos: products: community_server: - enabled: True # default + enabled: true # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-8.0.11-macos10.13-x86_64.dmg sum: 'md5=602a84390ecf3d82025b1d99fc594124' workbench: - enabled: True # default + enabled: true # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-workbench-community-8.0.11-rc-macos-x86_64.dmg sum: 'md5=37c5ae5bd75a4e1804ae6e0127d68611' cluster: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-cluster-gpl-7.6.6-macos10.13-x86_64.dmg sum: 'md5=0df975908e7d8e4e8c1003d95edf4721' router: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-router-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=8dd536f2f223933ecbfb8b19e54ee2f6' utilities: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-utilities-1.6.5-macos10.12.dmg sum: 'md5=4c8e75bb217b8293dcdeb915b649c2c8' shell: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-shell-8.0.11-macos10.13-x86-64bit.dmg sum: 'md5=43db4f0fc39f88c1d7be4a4f52cec363' proxy: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-proxy-0.8.5-osx10.7-x86-32bit.tar.gz sum: 'md5=107df22412aa8c483d2021e1af24ee22' connector: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-connector-nodejs-8.0.11.tar.gz sum: 'md5=dece7fe5607918ba68499ef07c31508d' forvisualstudio: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-for-visualstudio-2.0.4-src.zip sum: 'md5=fcf39316505ee2921e31a431eae77a9c' forexcel: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-for-excel-1.3.6-src.zip sum: 'md5=2cc8b65eb72a1b07a6e4e2665e2a29e3' notifier: - enabled: False #default + enabled: false # default + # yamllint disable-line rule:line-length url: https://downloads.mysql.com/archives/get/file/mysql-notifier-1.1.6-src.zip sum: 'md5=349f1994681763fd6626a8ddf6be5363' - From 4a9a2a1ab54c0fb4a0f2495410316b663f93ed13 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 17 Aug 2019 09:04:53 +0000 Subject: [PATCH 061/139] chore(release): 0.52.0 [skip ci] # [0.52.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.51.0...v0.52.0) (2019-08-17) ### Features * **yamllint:** include for this repo and apply rules throughout ([9f739fa](https://github.com/saltstack-formulas/mysql-formula/commit/9f739fa)) --- AUTHORS.md | 7 ++++--- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 13 ++++++++----- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 6d4086b..1cabef8 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,7 +5,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 -@aboe76|[@aboe76](https://github.com/aboe76)|35 +@aboe76|[@aboe76](https://github.com/aboe76)|36 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @whiteinge|[@whiteinge](https://github.com/whiteinge)|27 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @@ -18,13 +18,13 @@ Avatar|Contributor|Contributions @Routhinator|[@Routhinator](https://github.com/Routhinator)|5 @puneetk|[@puneetk](https://github.com/puneetk)|5 @davidjb|[@davidjb](https://github.com/davidjb)|5 +@myii|[@myii](https://github.com/myii)|5 @xenophonf|[@xenophonf](https://github.com/xenophonf)|4 @thatch45|[@thatch45](https://github.com/thatch45)|4 @toanju|[@toanju](https://github.com/toanju)|4 @tiger-seo|[@tiger-seo](https://github.com/tiger-seo)|4 @gtmanfred|[@gtmanfred](https://github.com/gtmanfred)|4 @alexhayes|[@alexhayes](https://github.com/alexhayes)|3 -@myii|[@myii](https://github.com/myii)|3 @alfonsfoubert|[@alfonsfoubert](https://github.com/alfonsfoubert)|3 @cboltz|[@cboltz](https://github.com/cboltz)|3 @pcdummy|[@pcdummy](https://github.com/pcdummy)|3 @@ -46,6 +46,7 @@ Avatar|Contributor|Contributions @1exx|[@1exx](https://github.com/1exx)|1 @aaronm-cloudtek|[@aaronm-cloudtek](https://github.com/aaronm-cloudtek)|1 @Achimh3011|[@Achimh3011](https://github.com/Achimh3011)|1 +@asenci|[@asenci](https://github.com/asenci)|1 @word|[@word](https://github.com/word)|1 @arthurlogilab|[@arthurlogilab](https://github.com/arthurlogilab)|1 @johnklehm|[@johnklehm](https://github.com/johnklehm)|1 @@ -82,4 +83,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-08. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-17. diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c80a5f..949f32a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +# [0.52.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.51.0...v0.52.0) (2019-08-17) + + +### Features + +* **yamllint:** include for this repo and apply rules throughout ([9f739fa](https://github.com/saltstack-formulas/mysql-formula/commit/9f739fa)) + # [0.51.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.50.0...v0.51.0) (2019-08-08) diff --git a/FORMULA b/FORMULA index 6c0f35f..b0ab7d5 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.51.0 +version: 0.52.0 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 06f50d2..68adf8e 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -18,7 +18,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 38 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - - 35 + - 36 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 28 @@ -55,6 +55,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@davidjb` - `@davidjb `_ - 5 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 5 * - :raw-html-m2r:`@xenophonf` - `@xenophonf `_ - 4 @@ -73,9 +76,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@alexhayes` - `@alexhayes `_ - 3 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 3 * - :raw-html-m2r:`@alfonsfoubert` - `@alfonsfoubert `_ - 3 @@ -139,6 +139,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@Achimh3011` - `@Achimh3011 `_ - 1 + * - :raw-html-m2r:`@asenci` + - `@asenci `_ + - 1 * - :raw-html-m2r:`@word` - `@word `_ - 1 @@ -242,4 +245,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-08. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-17. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index a47f02e..4421b09 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.52.0 `_ (2019-08-17) +---------------------------------------------------------------------------------------------------------- + +Features +^^^^^^^^ + + +* **yamllint:** include for this repo and apply rules throughout (\ `9f739fa `_\ ) + `0.51.0 `_ (2019-08-08) ---------------------------------------------------------------------------------------------------------- From 05b1cef68f7d0d19b0ef834f39f6af3ac4c33803 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 7 Sep 2019 03:36:01 +0100 Subject: [PATCH 062/139] ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround * Automated using https://github.com/myii/ssf-formula/pull/22 --- .travis.yml | 2 +- kitchen.yml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17291d5..5b346ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- +dist: bionic stages: - test - lint @@ -10,7 +11,6 @@ stages: sudo: required cache: bundler language: ruby -dist: xenial services: - docker diff --git a/kitchen.yml b/kitchen.yml index 1d201c7..8f48a8d 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -43,6 +43,10 @@ platforms: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: amazonlinux-2-develop-py2 driver: image: netmanagers/salt-develop-py2:amazonlinux-2 @@ -67,6 +71,10 @@ platforms: driver: image: netmanagers/salt-2019.2-py3:opensuse-leap-15 run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: amazonlinux-2-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:amazonlinux-2 @@ -88,6 +96,10 @@ platforms: driver: image: netmanagers/salt-2018.3-py2:opensuse-leap-15 run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: amazonlinux-2-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:amazonlinux-2 @@ -110,6 +122,10 @@ platforms: driver: image: netmanagers/salt-2017.7-py2:opensuse-leap-15 run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 - name: amazonlinux-2-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:amazonlinux-2 From 2322ff67fd8089ab6df8d56d796532f42bbfa06a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 10 Sep 2019 05:53:26 +0100 Subject: [PATCH 063/139] ci(yamllint): add rule `empty-values` & use new `yaml-files` setting * Semi-automated using https://github.com/myii/ssf-formula/pull/27 * Fix (or ignore) errors shown below: ```bash mysql-formula$ yamllint -s . ./mysql/osfamilymap.yaml 46:14 error empty value in block mapping (empty-values) 66:14 error empty value in block mapping (empty-values) 67:14 error empty value in block mapping (empty-values) 68:16 error empty value in block mapping (empty-values) 69:17 error empty value in block mapping (empty-values) 70:16 error empty value in block mapping (empty-values) 87:7 error empty value in block mapping (empty-values) 216:14 error empty value in block mapping (empty-values) 217:17 error empty value in block mapping (empty-values) ./mysql/defaults.yaml 29:10 error empty value in block mapping (empty-values) 30:11 error empty value in block mapping (empty-values) ``` --- .travis.yml | 6 +++--- .yamllint | 16 +++++++++++++++- mysql/defaults.yaml | 5 +++-- mysql/osfamilymap.yaml | 10 +++++++++- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b346ef..2b11670 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,9 +56,9 @@ jobs: before_install: skip script: # Install and run `yamllint` - - pip install --user yamllint - # yamllint disable-line rule:line-length - - yamllint -s . .yamllint pillar.example test/salt/pillar/mysql.sls + # Need at least `v1.17.0` for the `yaml-files` setting + - pip install --user yamllint>=1.17.0 + - yamllint -s . # Install and run `commitlint` - npm install @commitlint/config-conventional -D - npm install @commitlint/travis-cli -D diff --git a/.yamllint b/.yamllint index 8cee7a4..d333099 100644 --- a/.yamllint +++ b/.yamllint @@ -6,12 +6,26 @@ extends: default # Files to ignore completely # 1. All YAML files under directory `node_modules/`, introduced during the Travis run -# 2. Any YAML files using Jinja (result in `yamllint` syntax errors) +# 2. Any SLS files under directory `test/`, which are actually state files +# 3. Any YAML files using Jinja (result in `yamllint` syntax errors) ignore: | node_modules/ + test/**/states/**/*.sls mysql/supported_sections.yaml +yaml-files: + # Default settings + - '*.yaml' + - '*.yml' + - .yamllint + # SaltStack Formulas additional settings + - '*.example' + - test/**/*.sls + rules: + empty-values: + forbid-in-block-mappings: true + forbid-in-flow-mappings: true line-length: # Increase from default of `80` # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml index 0e96037..83f556d 100644 --- a/mysql/defaults.yaml +++ b/mysql/defaults.yaml @@ -26,8 +26,9 @@ mysql: macos: userhomes: /Users - user: - group: + # `user` and `group` are set from `map.jinja` + # user: ~ + # group: ~ dl: tmpdir: /tmp/mysqltmp prefix: /usr/local diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index 9e032db..7730afb 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -43,7 +43,7 @@ RedHat: config: file: /etc/my.cnf sections: - client: + client: {} mysqld_safe: log_error: /var/log/mysql/mysqld.log pid_file: /var/run/mysql/mysqld.pid @@ -63,11 +63,14 @@ Suse: client: socket: /var/run/mysql/mysql.sock mysqld: + # Empty values below to be resolved, disabling the rule in the meantime + # yamllint disable rule:empty-values port: user: socket: datadir: tmpdir: + # yamllint enable rule:empty-values innodb_file_format: Barracuda innodb_file_per_table: 'ON' server-id: 1 @@ -84,6 +87,8 @@ Arch: clientpkg: mariadb-clients service: mysqld pythonpkg: mysql-python + # Empty value below to be resolved, disabling the rule in the meantime + # yamllint disable-line rule:empty-values dev: config: @@ -213,8 +218,11 @@ FreeBSD: client: socket: /tmp/mysql.sock mysqld: + # Empty values below to be resolved, disabling the rule in the meantime + # yamllint disable rule:empty-values user: datadir: + # yamllint enable rule:empty-values socket: /tmp/mysql.sock skip-external-locking: noarg_present key_buffer_size: 16M From 75fd8dc929fe805d787593203f5f928cdd457c6e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 23 Sep 2019 16:59:37 +0100 Subject: [PATCH 064/139] ci(kitchen): change `log_level` to `debug` instead of `info` * Automated using https://github.com/myii/ssf-formula/pull/41 --- kitchen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitchen.yml b/kitchen.yml index 8f48a8d..52b1355 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -132,7 +132,7 @@ platforms: provisioner: name: salt_solo - log_level: info + log_level: debug salt_install: none require_chef: false formula: mysql From e6bc70bf025fe1c9e4bd8afdd703906dfd8cb8c2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 30 Sep 2019 15:57:54 +0100 Subject: [PATCH 065/139] chore(issues): provide `Bug report` & `Feature request` templates [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/48 --- .github/ISSUE_TEMPLATE/bug_report.md | 54 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 42 ++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..04af2ae --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,54 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '[BUG] ' +labels: 'bug' +assignees: '' + +--- + + + +#### Describe the bug + + + + +#### Setup + + + + +#### Steps to reproduce the bug + + + + + + +#### Expected behaviour + + + + +#### Versions report + + + + +#### Additional context + + + + +--- + +#### Optional: How can this template be improved? + + + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..ae0b773 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,42 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '[FEATURE] ' +labels: 'enhancement' +assignees: '' + +--- + + + +#### Is your feature request related to a problem? + + + + +#### Describe the solution you'd like + + + + +#### Describe alternatives you've considered + + + + +#### Additional context + + + + +--- + +#### Optional: How can this template be improved? + + + From 5c20c9b57cd53be7379de212f5fa2a8e031a06d3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 1 Oct 2019 16:20:18 +0100 Subject: [PATCH 066/139] ci(platform): add `arch-base-latest` (commented out for now) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/50 --- .travis.yml | 4 ++++ kitchen.yml | 19 +++++++++++++++++++ test/integration/default/inspec.yml | 1 + 3 files changed, 24 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2b11670..befa689 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,24 +25,28 @@ env: # - INSTANCE: default-fedora-30-develop-py3 # - INSTANCE: default-opensuse-leap-15-develop-py3 # - INSTANCE: default-amazonlinux-2-develop-py2 + # - INSTANCE: default-arch-base-latest-develop-py2 - INSTANCE: default-debian-9-2019-2-py3 - INSTANCE: default-ubuntu-1804-2019-2-py3 # - INSTANCE: default-centos-7-2019-2-py3 # - INSTANCE: default-fedora-30-2019-2-py3 # - INSTANCE: default-opensuse-leap-15-2019-2-py3 # - INSTANCE: default-amazonlinux-2-2019-2-py2 + # - INSTANCE: default-arch-base-latest-2019-2-py2 - INSTANCE: default-debian-9-2018-3-py2 # - INSTANCE: default-ubuntu-1604-2018-3-py2 # - INSTANCE: default-centos-7-2018-3-py2 # - INSTANCE: default-fedora-29-2018-3-py2 # - INSTANCE: default-opensuse-leap-15-2018-3-py2 # - INSTANCE: default-amazonlinux-2-2018-3-py2 + # - INSTANCE: default-arch-base-latest-2018-3-py2 - INSTANCE: default-debian-8-2017-7-py2 # - INSTANCE: default-ubuntu-1604-2017-7-py2 # - INSTANCE: default-centos-6-2017-7-py2 # - INSTANCE: default-fedora-29-2017-7-py2 # - INSTANCE: default-opensuse-leap-15-2017-7-py2 # - INSTANCE: default-amazonlinux-2-2017-7-py2 + # - INSTANCE: default-arch-base-latest-2017-7-py2 script: - bin/kitchen verify ${INSTANCE} diff --git a/kitchen.yml b/kitchen.yml index 52b1355..862b6a9 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -53,6 +53,13 @@ platforms: provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + - name: arch-base-latest-develop-py2 + driver: + image: netmanagers/salt-develop-py2:arch-base-latest + provision_command: + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + run_command: /usr/lib/systemd/systemd ## SALT `2019.2` - name: debian-9-2019-2-py3 @@ -78,6 +85,10 @@ platforms: - name: amazonlinux-2-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:amazonlinux-2 + - name: arch-base-latest-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:arch-base-latest + run_command: /usr/lib/systemd/systemd ## SALT `2018.3` - name: debian-9-2018-3-py2 @@ -103,6 +114,10 @@ platforms: - name: amazonlinux-2-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:amazonlinux-2 + - name: arch-base-latest-2018-3-py2 + driver: + image: netmanagers/salt-2018.3-py2:arch-base-latest + run_command: /usr/lib/systemd/systemd ## SALT `2017.7` - name: debian-8-2017-7-py2 @@ -129,6 +144,10 @@ platforms: - name: amazonlinux-2-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:amazonlinux-2 + - name: arch-base-latest-2017-7-py2 + driver: + image: netmanagers/salt-2017.7-py2:arch-base-latest + run_command: /usr/lib/systemd/systemd provisioner: name: salt_solo diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml index 37a67a2..5865baf 100644 --- a/test/integration/default/inspec.yml +++ b/test/integration/default/inspec.yml @@ -15,3 +15,4 @@ supports: - platform-name: suse - platform-name: freebsd - platform-name: amazon + - platform-name: arch From 4bdaab7f316fa39d0eaecacd92180dd21ad1bfdc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 1 Oct 2019 21:33:40 +0100 Subject: [PATCH 067/139] ci(kitchen): use bootstrapped `opensuse` images until `2019.2.2` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/52 --- kitchen.yml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 862b6a9..d48bc5c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -38,11 +38,13 @@ platforms: - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - name: opensuse-leap-15-develop-py3 driver: - image: netmanagers/salt-develop-py3:opensuse-leap-15 + image: opensuse/leap:15 provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd + provisioner: + salt_bootstrap_options: -XdPfrq -x python3 git develop + salt_install: bootstrap # Workaround to avoid intermittent failures on `opensuse-leap-15`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -76,8 +78,13 @@ platforms: image: netmanagers/salt-2019.2-py3:fedora-30 - name: opensuse-leap-15-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:opensuse-leap-15 + image: opensuse/leap:15 + provision_command: + - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd + provisioner: + salt_bootstrap_options: -XdPfrq -x python3 git 2019.2 + salt_install: bootstrap # Workaround to avoid intermittent failures on `opensuse-leap-15`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -105,8 +112,13 @@ platforms: image: netmanagers/salt-2018.3-py2:fedora-29 - name: opensuse-leap-15-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:opensuse-leap-15 + image: opensuse/leap:15 + provision_command: + - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd + provisioner: + salt_bootstrap_options: -XdPfrq -x python2 git 2018.3 + salt_install: bootstrap # Workaround to avoid intermittent failures on `opensuse-leap-15`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: @@ -135,8 +147,13 @@ platforms: image: netmanagers/salt-2017.7-py2:fedora-29 - name: opensuse-leap-15-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:opensuse-leap-15 + image: opensuse/leap:15 + provision_command: + - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd + provisioner: + salt_bootstrap_options: -XdPfrq -x python2 git 2017.7 + salt_install: bootstrap # Workaround to avoid intermittent failures on `opensuse-leap-15`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: From 8b89ebcee77b22dd238f06f77c1ab9c696c9ec5b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 2 Oct 2019 00:07:21 +0100 Subject: [PATCH 068/139] ci(kitchen): install required packages to bootstrapped `opensuse` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/53 --- kitchen.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index d48bc5c..ada189f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -40,6 +40,8 @@ platforms: driver: image: opensuse/leap:15 provision_command: + # yamllint disable-line rule:line-length + - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd provisioner: @@ -80,6 +82,8 @@ platforms: driver: image: opensuse/leap:15 provision_command: + # yamllint disable-line rule:line-length + - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd provisioner: @@ -114,6 +118,8 @@ platforms: driver: image: opensuse/leap:15 provision_command: + # yamllint disable-line rule:line-length + - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd provisioner: @@ -149,6 +155,8 @@ platforms: driver: image: opensuse/leap:15 provision_command: + # yamllint disable-line rule:line-length + - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - systemctl enable sshd.service run_command: /usr/lib/systemd/systemd provisioner: From 3b34955b31010ae3afefcb3a4b670afb965c94b2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 7 Oct 2019 15:25:53 +0100 Subject: [PATCH 069/139] chore(issues): update `Bug report` & `Feature request` templates [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/58 --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ++++++++++++++++------- .github/ISSUE_TEMPLATE/feature_request.md | 10 +++---- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 04af2ae..1cc8c26 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -14,41 +14,55 @@ Notes: 3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode. --> -#### Describe the bug - +## Your setup +### Formula commit hash / release tag + -#### Setup +### Versions reports (master & minion) + + + + +### Pillar / config used -#### Steps to reproduce the bug +--- + +## Bug details +### Describe the bug + + + + +### Steps to reproduce the bug -#### Expected behaviour +### Expected behaviour -#### Versions report - +### Attempts to fix the bug + -#### Additional context +### Additional context --- -#### Optional: How can this template be improved? +### Meta: How can this template be improved? diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index ae0b773..be8be36 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -14,29 +14,29 @@ Notes: 3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode. --> -#### Is your feature request related to a problem? +### Is your feature request related to a problem? -#### Describe the solution you'd like +### Describe the solution you'd like -#### Describe alternatives you've considered +### Describe alternatives you've considered -#### Additional context +### Additional context --- -#### Optional: How can this template be improved? +### Meta: How can this template be improved? From 80f79c92a510474f0909140c1d6edd319e42f01c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 7 Oct 2019 19:31:50 +0100 Subject: [PATCH 070/139] chore(yamllint): update ignored paths and add `octal-values` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/59 --- .yamllint | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.yamllint b/.yamllint index d333099..896a2e5 100644 --- a/.yamllint +++ b/.yamllint @@ -7,10 +7,12 @@ extends: default # Files to ignore completely # 1. All YAML files under directory `node_modules/`, introduced during the Travis run # 2. Any SLS files under directory `test/`, which are actually state files -# 3. Any YAML files using Jinja (result in `yamllint` syntax errors) +# 3. Any YAML files under directory `.kitchen/`, introduced during local testing +# 4. Any YAML files using Jinja (result in `yamllint` syntax errors) ignore: | node_modules/ test/**/states/**/*.sls + .kitchen/ mysql/supported_sections.yaml yaml-files: @@ -30,3 +32,6 @@ rules: # Increase from default of `80` # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) max: 88 + octal-values: + forbid-implicit-octal: true + forbid-explicit-octal: true From b2b88631c748869f7b73680e416d9fa392ce6495 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 8 Oct 2019 16:37:13 +0100 Subject: [PATCH 071/139] ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job * Automated using https://github.com/myii/ssf-formula/pull/60 --- .yamllint | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamllint b/.yamllint index 896a2e5..1d467f2 100644 --- a/.yamllint +++ b/.yamllint @@ -19,6 +19,7 @@ yaml-files: # Default settings - '*.yaml' - '*.yml' + - .salt-lint - .yamllint # SaltStack Formulas additional settings - '*.example' From 764dd0c4891525acb8415b30092299a2a8fa7470 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 9 Oct 2019 14:34:51 +0100 Subject: [PATCH 072/139] fix(server.sls): fix `salt-lint` errors ```bash Examining mysql/server.sls of type state [206] Jinja variables should have spaces before and after: {{ var_name }} mysql/server.sls:119 - creates: {{ mysql_datadir}}/mysql/ [206] Jinja variables should have spaces before and after: {{ var_name }} mysql/server.sls:141 - creates: {{ mysql_datadir}}/mysql/ ``` --- mysql/server.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index c69c98e..a517b8c 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -116,7 +116,7 @@ mysql_initialize: cmd.run: - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} - runas: root - - creates: {{ mysql_datadir}}/mysql/ + - creates: {{ mysql_datadir }}/mysql/ - require: - pkg: {{ mysql.serverpkg }} {% endif %} @@ -138,7 +138,7 @@ mysql_initialize: cmd.run: - name: emerge --config {{ mysql.serverpkg }} - runas: root - - creates: {{ mysql_datadir}}/mysql/ + - creates: {{ mysql_datadir }}/mysql/ - require: - pkg: {{ mysql.serverpkg }} {% endif %} From a014e5539b92db7ef2f37795db0ee18e17d7d526 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 9 Oct 2019 14:35:44 +0100 Subject: [PATCH 073/139] fix(user.sls): fix `salt-lint` errors ```bash Examining mysql/user.sls of type state [202] Jinja statement should have spaces before and after: {% statement %} mysql/user.sls:35 {% set state_id = 'mysql_user_' ~ name ~ '_' ~ host%} [206] Jinja variables should have spaces before and after: {{ var_name }} mysql/user.sls:100 - grant: {{db['grants']|join(",")}} ``` --- mysql/user.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/user.sls b/mysql/user.sls index fa0b6e4..c31ef0e 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -32,7 +32,7 @@ include: {% for host in user_hosts %} -{% set state_id = 'mysql_user_' ~ name ~ '_' ~ host%} +{% set state_id = 'mysql_user_' ~ name ~ '_' ~ host %} {{ state_id }}: {%- if user.get('present', True) %} mysql_user.present: @@ -97,7 +97,7 @@ include: {{ state_id ~ '_' ~ loop.index0 }}: mysql_grants.present: - name: {{ name ~ '_' ~ db['database'] ~ '_' ~ db['table'] | default('all') }} - - grant: {{db['grants']|join(",")}} + - grant: {{ db['grants']|join(",") }} - database: '{{ db['database'] }}.{{ db['table'] | default('*') }}' - grant_option: {{ db['grant_option'] | default(False) }} {% if 'ssl' in user or 'ssl-X509' in user %} From 00494d5e58477a6744547cddb5148591cf60fc7d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 9 Oct 2019 14:40:12 +0100 Subject: [PATCH 074/139] ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/60 --- .rubocop.yml | 10 +++++ .salt-lint | 16 +++++++ .travis.yml | 117 +++++++++++++++++++++++++++++++-------------------- .yamllint | 1 + Gemfile | 7 +-- bin/kitchen | 21 +++++---- 6 files changed, 114 insertions(+), 58 deletions(-) create mode 100644 .rubocop.yml create mode 100644 .salt-lint diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 0000000..bdae9aa --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +# General overrides used across formulas in the org +Metrics/LineLength: + # Increase from default of `80` + # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) + Max: 88 + +# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` diff --git a/.salt-lint b/.salt-lint new file mode 100644 index 0000000..3f397d1 --- /dev/null +++ b/.salt-lint @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +exclude_paths: [] +skip_list: + # TODO: Formula-specific override to remove eventually + # A lot of attention is going to be needed to resolve the existing long lines + - 204 # Lines should be no longer that 160 chars + # Using `salt-lint` for linting other files as well, such as Jinja macros/templates + - 205 # Use ".sls" as a Salt State file extension + # Skipping `207` and `208` because `210` is sufficient, at least for the time-being + # I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755` + - 207 # File modes should always be encapsulated in quotation marks + - 208 # File modes should always contain a leading zero +tags: [] +verbosity: 1 diff --git a/.travis.yml b/.travis.yml index befa689..b1ff310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,64 +1,43 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- +## Machine config dist: bionic -stages: - - test - - lint - - name: release - if: branch = master AND type != pull_request - sudo: required -cache: bundler -language: ruby - services: - docker -# Make sure the instances listed below match up with -# the `platforms` defined in `kitchen.yml` -env: - matrix: - - INSTANCE: default-debian-10-develop-py3 - - INSTANCE: default-ubuntu-1804-develop-py3 - # - INSTANCE: default-centos-7-develop-py3 - # - INSTANCE: default-fedora-30-develop-py3 - # - INSTANCE: default-opensuse-leap-15-develop-py3 - # - INSTANCE: default-amazonlinux-2-develop-py2 - # - INSTANCE: default-arch-base-latest-develop-py2 - - INSTANCE: default-debian-9-2019-2-py3 - - INSTANCE: default-ubuntu-1804-2019-2-py3 - # - INSTANCE: default-centos-7-2019-2-py3 - # - INSTANCE: default-fedora-30-2019-2-py3 - # - INSTANCE: default-opensuse-leap-15-2019-2-py3 - # - INSTANCE: default-amazonlinux-2-2019-2-py2 - # - INSTANCE: default-arch-base-latest-2019-2-py2 - - INSTANCE: default-debian-9-2018-3-py2 - # - INSTANCE: default-ubuntu-1604-2018-3-py2 - # - INSTANCE: default-centos-7-2018-3-py2 - # - INSTANCE: default-fedora-29-2018-3-py2 - # - INSTANCE: default-opensuse-leap-15-2018-3-py2 - # - INSTANCE: default-amazonlinux-2-2018-3-py2 - # - INSTANCE: default-arch-base-latest-2018-3-py2 - - INSTANCE: default-debian-8-2017-7-py2 - # - INSTANCE: default-ubuntu-1604-2017-7-py2 - # - INSTANCE: default-centos-6-2017-7-py2 - # - INSTANCE: default-fedora-29-2017-7-py2 - # - INSTANCE: default-opensuse-leap-15-2017-7-py2 - # - INSTANCE: default-amazonlinux-2-2017-7-py2 - # - INSTANCE: default-arch-base-latest-2017-7-py2 +## Language and cache config +language: ruby +cache: bundler +## Script to run for the test stage script: - - bin/kitchen verify ${INSTANCE} + - bin/kitchen verify "${INSTANCE}" +## Stages and jobs matrix +stages: + - test + - name: release + if: branch = master AND type != pull_request jobs: + allow_failures: + - env: Lint_rubocop + fast_finish: true include: - # Define the `lint` stage (runs `yamllint` and `commitlint`) - - stage: lint - language: node_js + ## Define the test stage that runs the linters (and testing matrix, if applicable) + + # Run all of the linters in a single job (except `rubocop`) + - language: node_js node_js: lts/* + env: Lint + name: 'Lint: salt-lint, yamllint & commitlint' before_install: skip script: + # Install and run `salt-lint` + - pip install --user salt-lint + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' + | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting - pip install --user yamllint>=1.17.0 @@ -67,10 +46,56 @@ jobs: - npm install @commitlint/config-conventional -D - npm install @commitlint/travis-cli -D - commitlint-travis - # Define the release stage that runs `semantic-release` + # Run the `rubocop` linter in a separate job that is allowed to fail + # Once these lint errors are fixed, this can be merged into a single job + - language: node_js + node_js: lts/* + env: Lint_rubocop + name: 'Lint: rubocop' + before_install: skip + script: + # Install and run `rubocop` + - gem install rubocop + - rubocop -d + + ## Define the rest of the matrix based on Kitchen testing + # Make sure the instances listed below match up with + # the `platforms` defined in `kitchen.yml` + - env: INSTANCE=default-debian-10-develop-py3 + - env: INSTANCE=default-ubuntu-1804-develop-py3 + # - env: INSTANCE=default-centos-7-develop-py3 + # - env: INSTANCE=default-fedora-30-develop-py3 + # - env: INSTANCE=default-opensuse-leap-15-develop-py3 + # - env: INSTANCE=default-amazonlinux-2-develop-py2 + # - env: INSTANCE=default-arch-base-latest-develop-py2 + - env: INSTANCE=default-debian-9-2019-2-py3 + - env: INSTANCE=default-ubuntu-1804-2019-2-py3 + # - env: INSTANCE=default-centos-7-2019-2-py3 + # - env: INSTANCE=default-fedora-30-2019-2-py3 + # - env: INSTANCE=default-opensuse-leap-15-2019-2-py3 + # - env: INSTANCE=default-amazonlinux-2-2019-2-py2 + # - env: INSTANCE=default-arch-base-latest-2019-2-py2 + - env: INSTANCE=default-debian-9-2018-3-py2 + # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 + # - env: INSTANCE=default-centos-7-2018-3-py2 + # - env: INSTANCE=default-fedora-29-2018-3-py2 + # - env: INSTANCE=default-opensuse-leap-15-2018-3-py2 + # - env: INSTANCE=default-amazonlinux-2-2018-3-py2 + # - env: INSTANCE=default-arch-base-latest-2018-3-py2 + - env: INSTANCE=default-debian-8-2017-7-py2 + # - env: INSTANCE=default-ubuntu-1604-2017-7-py2 + # - env: INSTANCE=default-centos-6-2017-7-py2 + # - env: INSTANCE=default-fedora-29-2017-7-py2 + # - env: INSTANCE=default-opensuse-leap-15-2017-7-py2 + # - env: INSTANCE=default-amazonlinux-2-2017-7-py2 + # - env: INSTANCE=default-arch-base-latest-2017-7-py2 + + ## Define the release stage that runs `semantic-release` - stage: release language: node_js node_js: lts/* + env: Release + name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA' before_install: skip script: # Update `AUTHORS.md` diff --git a/.yamllint b/.yamllint index 896a2e5..1d467f2 100644 --- a/.yamllint +++ b/.yamllint @@ -19,6 +19,7 @@ yaml-files: # Default settings - '*.yaml' - '*.yml' + - .salt-lint - .yamllint # SaltStack Formulas additional settings - '*.example' diff --git a/Gemfile b/Gemfile index 3b36de3..5a232b6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ -source "https://rubygems.org" +# frozen_string_literal: true + +source 'https://rubygems.org' gem 'kitchen-docker', '>= 2.9' -gem 'kitchen-salt', '>= 0.6.0' gem 'kitchen-inspec', '>= 1.1' - +gem 'kitchen-salt', '>= 0.6.0' diff --git a/bin/kitchen b/bin/kitchen index 1cd44f3..dcfdb4c 100755 --- a/bin/kitchen +++ b/bin/kitchen @@ -8,22 +8,25 @@ # this file is here to facilitate running it. # -require "pathname" -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", - Pathname.new(__FILE__).realpath) +require 'pathname' +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', + Pathname.new(__FILE__).realpath) -bundle_binstub = File.expand_path("../bundle", __FILE__) +bundle_binstub = File.expand_path('bundle', __dir__) if File.file?(bundle_binstub) if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ load(bundle_binstub) else - abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. -Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + abort( + 'Your `bin/bundle` was not generated by Bundler, '\ + 'so this binstub cannot run. Replace `bin/bundle` by running '\ + '`bundle binstubs bundler --force`, then run this command again.' + ) end end -require "rubygems" -require "bundler/setup" +require 'rubygems' +require 'bundler/setup' -load Gem.bin_path("test-kitchen", "kitchen") +load Gem.bin_path('test-kitchen', 'kitchen') From 3466b9bf2253ba95f3cc6bb6779afead393a23d3 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 10 Oct 2019 02:39:23 +0000 Subject: [PATCH 075/139] chore(release): 0.52.1 [skip ci] ## [0.52.1](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.0...v0.52.1) (2019-10-10) ### Bug Fixes * **server.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/mysql-formula/commit/764dd0c)) * **user.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/mysql-formula/commit/a014e55)) ### Continuous Integration * **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/mysql-formula/commit/75fd8dc)) * **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/mysql-formula/commit/8b89ebc)) * **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/mysql-formula/commit/4bdaab7)) * **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/mysql-formula/commit/5c20c9b)) * **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/mysql-formula/commit/2322ff6)) * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/mysql-formula/commit/00494d5)) * use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/mysql-formula/commit/05b1cef)) --- AUTHORS.md | 8 ++++---- CHANGELOG.md | 19 +++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 14 +++++++------- docs/CHANGELOG.rst | 22 ++++++++++++++++++++++ 5 files changed, 53 insertions(+), 12 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 1cabef8..16498ba 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,9 +5,10 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 -@aboe76|[@aboe76](https://github.com/aboe76)|36 +@aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @whiteinge|[@whiteinge](https://github.com/whiteinge)|27 +@myii|[@myii](https://github.com/myii)|19 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @alxwr|[@alxwr](https://github.com/alxwr)|14 @cheuschober|[@cheuschober](https://github.com/cheuschober)|11 @@ -18,7 +19,6 @@ Avatar|Contributor|Contributions @Routhinator|[@Routhinator](https://github.com/Routhinator)|5 @puneetk|[@puneetk](https://github.com/puneetk)|5 @davidjb|[@davidjb](https://github.com/davidjb)|5 -@myii|[@myii](https://github.com/myii)|5 @xenophonf|[@xenophonf](https://github.com/xenophonf)|4 @thatch45|[@thatch45](https://github.com/thatch45)|4 @toanju|[@toanju](https://github.com/toanju)|4 @@ -37,7 +37,7 @@ Avatar|Contributor|Contributions @stp-ip|[@stp-ip](https://github.com/stp-ip)|2 @RonWilliams|[@RonWilliams](https://github.com/RonWilliams)|2 @ross-p|[@ross-p](https://github.com/ross-p)|2 -@srse|[@srse](https://github.com/srse)|2 +@sray|[@sray](https://github.com/sray)|2 @tomasfejfar|[@tomasfejfar](https://github.com/tomasfejfar)|2 @vschum|[@vschum](https://github.com/vschum)|2 @madflojo|[@madflojo](https://github.com/madflojo)|2 @@ -83,4 +83,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-17. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10. diff --git a/CHANGELOG.md b/CHANGELOG.md index 949f32a..808677c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [0.52.1](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.0...v0.52.1) (2019-10-10) + + +### Bug Fixes + +* **server.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/mysql-formula/commit/764dd0c)) +* **user.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/mysql-formula/commit/a014e55)) + + +### Continuous Integration + +* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/mysql-formula/commit/75fd8dc)) +* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/mysql-formula/commit/8b89ebc)) +* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/mysql-formula/commit/4bdaab7)) +* **platform:** add `arch-base-latest` (commented out for now) [skip ci] ([](https://github.com/saltstack-formulas/mysql-formula/commit/5c20c9b)) +* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/mysql-formula/commit/2322ff6)) +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/mysql-formula/commit/00494d5)) +* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/mysql-formula/commit/05b1cef)) + # [0.52.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.51.0...v0.52.0) (2019-08-17) diff --git a/FORMULA b/FORMULA index b0ab7d5..bf6888d 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.0 +version: 0.52.1 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 68adf8e..095d607 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -18,13 +18,16 @@ This list is sorted by the number of commits per contributor in *descending* ord - 38 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - - 36 + - 37 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 28 * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 27 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 19 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 @@ -55,9 +58,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@davidjb` - `@davidjb `_ - 5 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 5 * - :raw-html-m2r:`@xenophonf` - `@xenophonf `_ - 4 @@ -112,8 +112,8 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@ross-p` - `@ross-p `_ - 2 - * - :raw-html-m2r:`@srse` - - `@srse `_ + * - :raw-html-m2r:`@sray` + - `@sray `_ - 2 * - :raw-html-m2r:`@tomasfejfar` - `@tomasfejfar `_ @@ -245,4 +245,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-17. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-10. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 4421b09..07d2df1 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog ========= +`0.52.1 `_ (2019-10-10) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **server.sls:** fix ``salt-lint`` errors (\ ` `_\ ) +* **user.sls:** fix ``salt-lint`` errors (\ ` `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` `_\ ) +* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` `_\ ) +* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` `_\ ) +* **platform:** add ``arch-base-latest`` (commented out for now) [skip ci] (\ ` `_\ ) +* **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ ` `_\ ) +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) +* use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ ` `_\ ) + `0.52.0 `_ (2019-08-17) ---------------------------------------------------------------------------------------------------------- From fca3b0431fa77b9c1102e367756d3408f40aa6ec Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 20:49:09 +0100 Subject: [PATCH 076/139] fix(rubocop): add fixes using `rubocop --safe-auto-correct` --- test/integration/default/controls/packages_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages_spec.rb index 3be6792..288f3d6 100644 --- a/test/integration/default/controls/packages_spec.rb +++ b/test/integration/default/controls/packages_spec.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + # Override by OS package_name = 'mariadb-server' -if os[:name] == 'suse' or os[:name] == 'opensuse' +if (os[:name] == 'suse') || (os[:name] == 'opensuse') package_name = 'mariadb' -elsif os[:name] == 'debian' and os[:release].start_with?('8') +elsif (os[:name] == 'debian') && os[:release].start_with?('8') package_name = 'mysql-server' end From 26dc56280cb6083ccd4c4a993a2ea531c2e6f2a3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:00:43 +0100 Subject: [PATCH 077/139] ci(travis): merge `rubocop` linter into main `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/65 --- .travis.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1ff310..2735388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,17 +21,14 @@ stages: - name: release if: branch = master AND type != pull_request jobs: - allow_failures: - - env: Lint_rubocop - fast_finish: true include: ## Define the test stage that runs the linters (and testing matrix, if applicable) - # Run all of the linters in a single job (except `rubocop`) + # Run all of the linters in a single job - language: node_js node_js: lts/* env: Lint - name: 'Lint: salt-lint, yamllint & commitlint' + name: 'Lint: salt-lint, yamllint, rubocop & commitlint' before_install: skip script: # Install and run `salt-lint` @@ -42,21 +39,13 @@ jobs: # Need at least `v1.17.0` for the `yaml-files` setting - pip install --user yamllint>=1.17.0 - yamllint -s . + # Install and run `rubocop` + - gem install rubocop + - rubocop -d # Install and run `commitlint` - npm install @commitlint/config-conventional -D - npm install @commitlint/travis-cli -D - commitlint-travis - # Run the `rubocop` linter in a separate job that is allowed to fail - # Once these lint errors are fixed, this can be merged into a single job - - language: node_js - node_js: lts/* - env: Lint_rubocop - name: 'Lint: rubocop' - before_install: skip - script: - # Install and run `rubocop` - - gem install rubocop - - rubocop -d ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with From 12f14e53f348fb7f42d5d9bf8aca3d7944b59c6c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 11 Oct 2019 20:16:02 +0000 Subject: [PATCH 078/139] chore(release): 0.52.2 [skip ci] ## [0.52.2](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.1...v0.52.2) (2019-10-11) ### Bug Fixes * **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/mysql-formula/commit/fca3b04)) ### Continuous Integration * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/mysql-formula/commit/b2b8863)) * **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/mysql-formula/commit/26dc562)) --- AUTHORS.md | 4 ++-- CHANGELOG.md | 13 +++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 4 ++-- docs/CHANGELOG.rst | 16 ++++++++++++++++ 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 16498ba..c780daf 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -8,7 +8,7 @@ Avatar|Contributor|Contributions @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @whiteinge|[@whiteinge](https://github.com/whiteinge)|27 -@myii|[@myii](https://github.com/myii)|19 +@myii|[@myii](https://github.com/myii)|23 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @alxwr|[@alxwr](https://github.com/alxwr)|14 @cheuschober|[@cheuschober](https://github.com/cheuschober)|11 @@ -83,4 +83,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11. diff --git a/CHANGELOG.md b/CHANGELOG.md index 808677c..451326b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.52.2](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.1...v0.52.2) (2019-10-11) + + +### Bug Fixes + +* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/mysql-formula/commit/fca3b04)) + + +### Continuous Integration + +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/mysql-formula/commit/b2b8863)) +* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/mysql-formula/commit/26dc562)) + ## [0.52.1](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.0...v0.52.1) (2019-10-10) diff --git a/FORMULA b/FORMULA index bf6888d..3f375b2 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.1 +version: 0.52.2 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 095d607..4dafc8f 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -27,7 +27,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 27 * - :raw-html-m2r:`@myii` - `@myii `_ - - 19 + - 23 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 @@ -245,4 +245,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-10. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-11. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 07d2df1..61b9348 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`0.52.2 `_ (2019-10-11) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) +* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` `_\ ) + `0.52.1 `_ (2019-10-10) ---------------------------------------------------------------------------------------------------------- From 01f25a3ebfbf59d1db2bec73bc5fef9d8bcafd7e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 11:37:09 +0100 Subject: [PATCH 079/139] docs(readme): update link to `CONTRIBUTING` [skip ci] --- docs/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.rst b/docs/README.rst index e21d996..844ac63 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -37,7 +37,7 @@ Contributing to this repo **Commit message formatting is significant!!** -Please see :ref:`How to contribute ` for more details. +Please see `How to contribute `_ for more details. Available states ---------------- From 6afcc80396dc4ec2044d8611f18a6ed9075c6a52 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 12:29:19 +0100 Subject: [PATCH 080/139] docs(contributing): remove to use org-level file instead [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/70 --- docs/CONTRIBUTING.rst | 159 ------------------------------------------ 1 file changed, 159 deletions(-) delete mode 100644 docs/CONTRIBUTING.rst diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst deleted file mode 100644 index b7da8f4..0000000 --- a/docs/CONTRIBUTING.rst +++ /dev/null @@ -1,159 +0,0 @@ -.. _contributing: - -How to contribute -================= - -This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one. -What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo. -It also covers how to contribute to this *formula's documentation*. - -.. contents:: **Table of Contents** - -Overview --------- - -Submitting a pull request is more than just code! -To achieve a quality product, the *tests* and *documentation* need to be updated as well. -An excellent pull request will include these in the changes, wherever relevant. - -Commit message formatting -------------------------- - -Since every type of change requires making Git commits, -we will start by covering the importance of ensuring that all of your commit -messages are in the correct format. - -Automation of multiple processes -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula uses `semantic-release `_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog. -The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation. - -Full details are available in the upstream docs regarding the `Angular Commit Message Conventions `_. -The key factor is that the first line of the commit message must follow this format: - -.. code-block:: - - type(scope): subject - - -* E.g. ``docs(contributing): add commit message formatting instructions``. - -Besides the version bump, the changelog and release notes are formatted accordingly. -So based on the example above: - -.. - - .. raw:: html - -

Documentation

- - * **contributing:** add commit message formatting instructions - - -* The ``type`` translates into a ``Documentation`` sub-heading. -* The ``(scope):`` will be shown in bold text without the brackets. -* The ``subject`` follows the ``scope`` as standard text. - -Linting commit messages in Travis CI -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula uses `commitlint `_ for checking commit messages during CI testing. -This ensures that they are in accordance with the ``semantic-release`` settings. - -For more details about the default settings, refer back to the ``commitlint`` `reference rules `_. - -Relationship between commit type and version bump -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula applies some customisations to the defaults, as outlined in the table below, -based upon the `type `_ of the commit: - -.. list-table:: - :name: commit-type-vs-version-bump - :header-rows: 1 - :stub-columns: 0 - :widths: 1,2,3,1,1 - - * - Type - - Heading - - Description - - Bump (default) - - Bump (custom) - * - ``build`` - - Build System - - Changes related to the build system - - – - - - * - ``chore`` - - – - - Changes to the build process or auxiliary tools and libraries such as - documentation generation - - – - - - * - ``ci`` - - Continuous Integration - - Changes to the continuous integration configuration - - – - - - * - ``docs`` - - Documentation - - Documentation only changes - - – - - 0.0.1 - * - ``feat`` - - Features - - A new feature - - 0.1.0 - - - * - ``fix`` - - Bug Fixes - - A bug fix - - 0.0.1 - - - * - ``perf`` - - Performance Improvements - - A code change that improves performance - - 0.0.1 - - - * - ``refactor`` - - Code Refactoring - - A code change that neither fixes a bug nor adds a feature - - – - - 0.0.1 - * - ``revert`` - - Reverts - - A commit used to revert a previous commit - - – - - 0.0.1 - * - ``style`` - - Styles - - Changes that do not affect the meaning of the code (white-space, - formatting, missing semi-colons, etc.) - - – - - 0.0.1 - * - ``test`` - - Tests - - Adding missing or correcting existing tests - - – - - 0.0.1 - -Use ``BREAKING CHANGE`` to trigger a ``major`` version change -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used. -This will be appended to the changelog and release notes as well. -To preserve good formatting of these notes, the following format is prescribed: - -* ``BREAKING CHANGE: .`` - -An example of that: - -.. code-block:: git - - ... - - BREAKING CHANGE: With the removal of all of the `.sls` files under - `template package`, this formula no longer supports the installation of - packages. - From 1512279c2eac26638720461cc7e847d93d2c77d6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 23 Oct 2019 17:33:59 +0100 Subject: [PATCH 081/139] ci(travis): update `salt-lint` config for `v0.0.10` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/82 --- .salt-lint | 1 + 1 file changed, 1 insertion(+) diff --git a/.salt-lint b/.salt-lint index 3f397d1..5fc3906 100644 --- a/.salt-lint +++ b/.salt-lint @@ -2,6 +2,7 @@ # vim: ft=yaml --- exclude_paths: [] +rules: {} skip_list: # TODO: Formula-specific override to remove eventually # A lot of attention is going to be needed to resolve the existing long lines From 5efe9387fde63e0c09d99d5771f3b623fb934242 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Oct 2019 18:10:08 +0100 Subject: [PATCH 082/139] ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/84 --- .travis.yml | 2 +- kitchen.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2735388..bb4eacf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ jobs: ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - - env: INSTANCE=default-debian-10-develop-py3 + - env: INSTANCE=default-debian-10-master-py3 - env: INSTANCE=default-ubuntu-1804-develop-py3 # - env: INSTANCE=default-centos-7-develop-py3 # - env: INSTANCE=default-fedora-30-develop-py3 diff --git a/kitchen.yml b/kitchen.yml index ada189f..c9b66c3 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,13 +11,13 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` - - name: debian-10-develop-py3 + ## SALT `develop` => `master` + - name: debian-10-master-py3 driver: - image: netmanagers/salt-develop-py3:debian-10 + image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: ubuntu-1804-develop-py3 driver: image: netmanagers/salt-develop-py3:ubuntu-18.04 From 27ac5a3f684325a8e15736bb85d4774807061534 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Oct 2019 04:48:10 +0000 Subject: [PATCH 083/139] ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/86 --- .travis.yml | 30 ++++++++------- kitchen.yml | 109 ++++++++++++++++++++++------------------------------ 2 files changed, 61 insertions(+), 78 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb4eacf..5945941 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting @@ -51,31 +51,33 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - env: INSTANCE=default-debian-10-master-py3 - - env: INSTANCE=default-ubuntu-1804-develop-py3 - # - env: INSTANCE=default-centos-7-develop-py3 - # - env: INSTANCE=default-fedora-30-develop-py3 - # - env: INSTANCE=default-opensuse-leap-15-develop-py3 - # - env: INSTANCE=default-amazonlinux-2-develop-py2 - # - env: INSTANCE=default-arch-base-latest-develop-py2 + - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=default-centos-8-master-py3 + # - env: INSTANCE=default-fedora-31-master-py3 + # - env: INSTANCE=default-opensuse-leap-151-master-py3 + # - env: INSTANCE=default-amazonlinux-2-master-py2 + # - env: INSTANCE=default-arch-base-latest-master-py2 + # - env: INSTANCE=default-debian-10-2019-2-py3 - env: INSTANCE=default-debian-9-2019-2-py3 - env: INSTANCE=default-ubuntu-1804-2019-2-py3 - # - env: INSTANCE=default-centos-7-2019-2-py3 - # - env: INSTANCE=default-fedora-30-2019-2-py3 - # - env: INSTANCE=default-opensuse-leap-15-2019-2-py3 + # - env: INSTANCE=default-centos-8-2019-2-py3 + # - env: INSTANCE=default-fedora-31-2019-2-py3 + # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 + # - env: INSTANCE=default-centos-7-2019-2-py2 # - env: INSTANCE=default-amazonlinux-2-2019-2-py2 # - env: INSTANCE=default-arch-base-latest-2019-2-py2 + # - env: INSTANCE=default-fedora-30-2018-3-py3 - env: INSTANCE=default-debian-9-2018-3-py2 # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 # - env: INSTANCE=default-centos-7-2018-3-py2 - # - env: INSTANCE=default-fedora-29-2018-3-py2 - # - env: INSTANCE=default-opensuse-leap-15-2018-3-py2 + # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 # - env: INSTANCE=default-amazonlinux-2-2018-3-py2 # - env: INSTANCE=default-arch-base-latest-2018-3-py2 - env: INSTANCE=default-debian-8-2017-7-py2 # - env: INSTANCE=default-ubuntu-1604-2017-7-py2 # - env: INSTANCE=default-centos-6-2017-7-py2 - # - env: INSTANCE=default-fedora-29-2017-7-py2 - # - env: INSTANCE=default-opensuse-leap-15-2017-7-py2 + # - env: INSTANCE=default-fedora-30-2017-7-py2 + # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2 # - env: INSTANCE=default-amazonlinux-2-2017-7-py2 # - env: INSTANCE=default-arch-base-latest-2017-7-py2 diff --git a/kitchen.yml b/kitchen.yml index c9b66c3..1c4e5e8 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,88 +11,83 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` => `master` + ## SALT `master` - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - - name: ubuntu-1804-develop-py3 + - name: ubuntu-1804-master-py3 driver: - image: netmanagers/salt-develop-py3:ubuntu-18.04 + image: netmanagers/salt-master-py3:ubuntu-18.04 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: centos-7-develop-py3 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master + - name: centos-8-master-py3 driver: - image: netmanagers/salt-develop-py3:centos-7 + image: netmanagers/salt-master-py3:centos-8 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: fedora-30-develop-py3 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master + - name: fedora-31-master-py3 driver: - image: netmanagers/salt-develop-py3:fedora-30 + image: netmanagers/salt-master-py3:fedora-31 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: opensuse-leap-15-develop-py3 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master + - name: opensuse-leap-151-master-py3 driver: - image: opensuse/leap:15 + image: netmanagers/salt-master-py3:opensuse-leap-15.1 provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - - systemctl enable sshd.service + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python3 git develop - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-develop-py2 + - name: amazonlinux-2-master-py2 driver: - image: netmanagers/salt-develop-py2:amazonlinux-2 + image: netmanagers/salt-master-py2:amazonlinux-2 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - - name: arch-base-latest-develop-py2 + - sh bootstrap-salt.sh -XdPbfrq -x python2 git master + - name: arch-base-latest-master-py2 driver: - image: netmanagers/salt-develop-py2:arch-base-latest + image: netmanagers/salt-master-py2:arch-base-latest provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + - sh bootstrap-salt.sh -XdPbfrq -x python2 git master run_command: /usr/lib/systemd/systemd ## SALT `2019.2` + - name: debian-10-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:debian-10 - name: debian-9-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:debian-9 - name: ubuntu-1804-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:ubuntu-18.04 - - name: centos-7-2019-2-py3 + - name: centos-8-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:centos-7 - - name: fedora-30-2019-2-py3 + image: netmanagers/salt-2019.2-py3:centos-8 + - name: fedora-31-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:fedora-30 - - name: opensuse-leap-15-2019-2-py3 + image: netmanagers/salt-2019.2-py3:fedora-31 + - name: opensuse-leap-151-2019-2-py3 driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - - systemctl enable sshd.service + image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python3 git 2019.2 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: centos-7-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:centos-7 - name: amazonlinux-2-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:amazonlinux-2 @@ -102,6 +97,9 @@ platforms: run_command: /usr/lib/systemd/systemd ## SALT `2018.3` + - name: fedora-30-2018-3-py3 + driver: + image: netmanagers/salt-2018.3-py3:fedora-30 - name: debian-9-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:debian-9 @@ -111,21 +109,11 @@ platforms: - name: centos-7-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:centos-7 - - name: fedora-29-2018-3-py2 + - name: opensuse-leap-151-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:fedora-29 - - name: opensuse-leap-15-2018-3-py2 - driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - - systemctl enable sshd.service + image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python2 git 2018.3 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -148,21 +136,14 @@ platforms: driver: image: netmanagers/salt-2017.7-py2:centos-6 run_command: /sbin/init - - name: fedora-29-2017-7-py2 + - name: fedora-30-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:fedora-29 - - name: opensuse-leap-15-2017-7-py2 + image: netmanagers/salt-2017.7-py2:fedora-30 + - name: opensuse-leap-151-2017-7-py2 driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - - systemctl enable sshd.service + image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python2 git 2017.7 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 From 3f51b8bbc231a7455e6763b415221abff636d8a2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 10:29:33 +0000 Subject: [PATCH 084/139] fix(release.config.js): use full commit hash in commit link [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/89 --- .travis.yml | 10 +++++----- release.config.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5945941..cf77beb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,8 @@ jobs: - gem install rubocop - rubocop -d # Install and run `commitlint` - - npm install @commitlint/config-conventional -D - - npm install @commitlint/travis-cli -D + - npm i -D @commitlint/config-conventional + @commitlint/travis-cli - commitlint-travis ## Define the rest of the matrix based on Kitchen testing @@ -95,9 +95,9 @@ jobs: - maintainer contributor # Install all dependencies required for `semantic-release` - - npm install @semantic-release/changelog@3 -D - - npm install @semantic-release/exec@3 -D - - npm install @semantic-release/git@7 -D + - npm i -D @semantic-release/changelog@3 + @semantic-release/exec@3 + @semantic-release/git@7 deploy: provider: script skip_cleanup: true diff --git a/release.config.js b/release.config.js index afa0cb1..6af7aa8 100644 --- a/release.config.js +++ b/release.config.js @@ -63,7 +63,7 @@ module.exports = { } if (typeof commit.hash === `string`) { - commit.hash = commit.hash.substring(0, 7) + commit.shortHash = commit.hash.substring(0, 7) } if (typeof commit.subject === `string`) { From 1980c634b9021c7d29be914bd2a63ddf3c31c8ad Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 2 Nov 2019 08:37:25 +0000 Subject: [PATCH 085/139] perf(travis): improve `salt-lint` invocation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/90 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf77beb..c82cb02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ jobs: # Install and run `salt-lint` - pip install --user salt-lint - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' - | xargs -I {} salt-lint {} + | xargs salt-lint # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting - pip install --user yamllint>=1.17.0 From 63bfb4a0f25b62bdc45c1738d438ce5ec64f2183 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 3 Nov 2019 11:35:31 +0000 Subject: [PATCH 086/139] ci(kitchen): use `develop` image until `master` is ready (`amazonlinux`) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/93 --- kitchen.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 1c4e5e8..77ceeb2 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -47,12 +47,14 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + # Use the `develop` image temporarily until the `master` image is available + # Not changing the name to minimise disruption across all of the formulas - name: amazonlinux-2-master-py2 driver: - image: netmanagers/salt-master-py2:amazonlinux-2 + image: netmanagers/salt-develop-py2:amazonlinux-2 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git master + - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - name: arch-base-latest-master-py2 driver: image: netmanagers/salt-master-py2:arch-base-latest From 40d4b9763f252f5811d31b2b2df156260bde2b6d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 13 Nov 2019 16:46:53 +0000 Subject: [PATCH 087/139] ci(travis): use build config validation (beta) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/97 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c82cb02..c4eb733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ --- ## Machine config dist: bionic +version: '~> 1.0' sudo: required services: - docker From d520848c815a9c2815ee3f1943e3e3962a26c7cf Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 16 Nov 2019 20:04:48 +0000 Subject: [PATCH 088/139] ci(travis): apply changes from build config validation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/98 --- .travis.yml | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4eb733..fa65933 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,18 @@ # vim: ft=yaml --- ## Machine config -dist: bionic +os: 'linux' +arch: 'amd64' +dist: 'bionic' version: '~> 1.0' -sudo: required -services: - - docker ## Language and cache config -language: ruby -cache: bundler +language: 'ruby' +cache: 'bundler' + +## Services config +services: + - docker ## Script to run for the test stage script: @@ -19,18 +22,18 @@ script: ## Stages and jobs matrix stages: - test - - name: release - if: branch = master AND type != pull_request + - name: 'release' + if: 'branch = master AND type != pull_request' jobs: include: ## Define the test stage that runs the linters (and testing matrix, if applicable) # Run all of the linters in a single job - - language: node_js - node_js: lts/* - env: Lint + - language: 'node_js' + node_js: 'lts/*' + env: 'Lint' name: 'Lint: salt-lint, yamllint, rubocop & commitlint' - before_install: skip + before_install: 'skip' script: # Install and run `salt-lint` - pip install --user salt-lint @@ -83,12 +86,12 @@ jobs: # - env: INSTANCE=default-arch-base-latest-2017-7-py2 ## Define the release stage that runs `semantic-release` - - stage: release - language: node_js - node_js: lts/* - env: Release + - stage: 'release' + language: 'node_js' + node_js: 'lts/*' + env: 'Release' name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA' - before_install: skip + before_install: 'skip' script: # Update `AUTHORS.md` - export MAINTAINER_TOKEN=${GH_TOKEN} @@ -100,8 +103,9 @@ jobs: @semantic-release/exec@3 @semantic-release/git@7 deploy: - provider: script + provider: 'script' + # Using deprecated `skip_cleanup` until `cleanup: false` works reliably + # cleanup: false skip_cleanup: true - script: - # Run `semantic-release` - - npx semantic-release@15 + # Run `semantic-release` + script: 'npx semantic-release@15' From 1a8d914fbd5e43f78ee2334b9c5ccd51ee65ad57 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 20 Nov 2019 16:31:58 +0000 Subject: [PATCH 089/139] ci(travis): opt-in to `dpl v2` to complete build config validation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/100 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa65933..a7370a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,8 +104,9 @@ jobs: @semantic-release/git@7 deploy: provider: 'script' - # Using deprecated `skip_cleanup` until `cleanup: false` works reliably - # cleanup: false - skip_cleanup: true + # Opt-in to `dpl v2` to complete the Travis build config validation (beta) + # * https://docs.travis-ci.com/user/build-config-validation + # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default + edge: true # Run `semantic-release` script: 'npx semantic-release@15' From 0931835f1cfc77022a43242bd3ab04cbed2a3a02 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 27 Nov 2019 20:53:47 +0000 Subject: [PATCH 090/139] ci(travis): run `shellcheck` during lint job [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/106 --- .travis.yml | 10 +++++++--- pre-commit_semantic-release.sh | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7370a3..6d9589c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,13 +32,13 @@ jobs: - language: 'node_js' node_js: 'lts/*' env: 'Lint' - name: 'Lint: salt-lint, yamllint, rubocop & commitlint' + name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint' before_install: 'skip' script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' - | xargs salt-lint + - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst + | xargs salt-lint # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting - pip install --user yamllint>=1.17.0 @@ -46,6 +46,10 @@ jobs: # Install and run `rubocop` - gem install rubocop - rubocop -d + # Run `shellcheck` (already pre-installed in Travis) + - shellcheck --version + - git ls-files -- *.sh *.bash *.ksh + | xargs shellcheck # Install and run `commitlint` - npm i -D @commitlint/config-conventional @commitlint/travis-cli diff --git a/pre-commit_semantic-release.sh b/pre-commit_semantic-release.sh index 9d34d74..ba80535 100755 --- a/pre-commit_semantic-release.sh +++ b/pre-commit_semantic-release.sh @@ -14,9 +14,9 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA sudo -H pip install m2r # Copy and then convert the `.md` docs -cp *.md docs/ -cd docs/ -m2r --overwrite *.md +cp ./*.md docs/ +cd docs/ || exit +m2r --overwrite ./*.md # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst` sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst From 3fb5a82de66dda9a05decc5ee7263729ef913533 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 27 Nov 2019 21:54:14 +0000 Subject: [PATCH 091/139] ci(travis): quote pathspecs used with `git ls-files` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/107 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d9589c..edee8f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files -- *.sls *.jinja *.j2 *.tmpl *.tst + - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst' | xargs salt-lint # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting @@ -48,7 +48,7 @@ jobs: - rubocop -d # Run `shellcheck` (already pre-installed in Travis) - shellcheck --version - - git ls-files -- *.sh *.bash *.ksh + - git ls-files -- '*.sh' '*.bash' '*.ksh' | xargs shellcheck # Install and run `commitlint` - npm i -D @commitlint/config-conventional From 7b309f8da272ebdcb36dbfa7619a0fc9872a79a7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 2 Dec 2019 18:49:57 +0000 Subject: [PATCH 092/139] fix(mac_shortcut.sh): fix `shellcheck` errors ```bash In mysql/files/mac_shortcut.sh line 5: if [[ -e "{{ home }}/{{ user }}/Desktop/{{ app }}" ]] && [[ "${1}" -eq "remove" ]] ^------^ SC2154: remove is referenced but not assigned. In mysql/files/mac_shortcut.sh line 8: elif [[ -e "{{ dir }}/{{ app ~ '.app' if suffix else app }}" ]] && [[ "${1}" -eq "add" ]] ^---^ SC2154: add is referenced but not assigned. ``` --- mysql/files/mac_shortcut.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/files/mac_shortcut.sh b/mysql/files/mac_shortcut.sh index 96e1163..b65712c 100755 --- a/mysql/files/mac_shortcut.sh +++ b/mysql/files/mac_shortcut.sh @@ -2,10 +2,10 @@ CMD='/usr/bin/osascript -e' -if [[ -e "{{ home }}/{{ user }}/Desktop/{{ app }}" ]] && [[ "${1}" -eq "remove" ]] +if [[ -e "{{ home }}/{{ user }}/Desktop/{{ app }}" ]] && [[ "${1}" == "remove" ]] then $CMD "tell application \"Finder\" to delete POSIX file \"{{home}}/{{user}}/Desktop/{{ app }}\"" -elif [[ -e "{{ dir }}/{{ app ~ '.app' if suffix else app }}" ]] && [[ "${1}" -eq "add" ]] +elif [[ -e "{{ dir }}/{{ app ~ '.app' if suffix else app }}" ]] && [[ "${1}" == "add" ]] then $CMD "tell application \"Finder\" to delete POSIX file \"{{home}}/{{user}}/Desktop/{{ app }}\"" >/dev/null 2>&1 $CMD "tell application \"Finder\" to make new Alias at (path to desktop folder) to POSIX file \"{{ dir }}/{{ app }}{{ suffix or '' }}\"" From ec0e2a765a587d0df94b0afb9f7a4ef78a5319ab Mon Sep 17 00:00:00 2001 From: Eric Veiras Galisson Date: Mon, 2 Dec 2019 14:55:41 +0100 Subject: [PATCH 093/139] style: remove previous line from jinja directives --- mysql/apparmor.sls | 2 +- mysql/client.sls | 2 +- mysql/config.sls | 54 ++++++++--------- mysql/database.sls | 60 +++++++++---------- mysql/dev.sls | 2 +- mysql/disabled.sls | 2 +- mysql/init.sls | 24 ++++---- mysql/macos/install.sls | 6 +- mysql/python.sls | 2 +- mysql/remove_test_database.sls | 14 ++--- mysql/repo.sls | 32 +++++----- mysql/salt-user.sls | 60 +++++++++---------- mysql/server.sls | 80 ++++++++++++------------- mysql/user.sls | 106 ++++++++++++++++----------------- 14 files changed, 223 insertions(+), 223 deletions(-) diff --git a/mysql/apparmor.sls b/mysql/apparmor.sls index 41f3748..1cc542d 100644 --- a/mysql/apparmor.sls +++ b/mysql/apparmor.sls @@ -1,4 +1,4 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} {%- if "apparmor" in mysql.config %} diff --git a/mysql/client.sls b/mysql/client.sls index 92f9ee3..927f170 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,7 +1,7 @@ include: - .config -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} mysql: pkg.installed: diff --git a/mysql/config.sls b/mysql/config.sls index 1d3d343..440120e 100644 --- a/mysql/config.sls +++ b/mysql/config.sls @@ -1,100 +1,100 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} -{% set os_family = salt['grains.get']('os_family', None) %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} +{%- set os_family = salt['grains.get']('os_family', None) %} -{% if "config_directory" in mysql %} +{%- if "config_directory" in mysql %} mysql_config_directory: file.directory: - name: {{ mysql.config_directory }} - {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + {%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root - mode: 755 - {% endif %} + {%- endif %} - makedirs: True -{% if "server_config" in mysql %} +{%- if "server_config" in mysql %} mysql_server_config: file.managed: - name: {{ mysql.config_directory + mysql.server_config.file }} - template: jinja - source: salt://{{ tpldir }}/files/server.cnf - {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + {%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - context: tpldir: {{ tpldir }} - user: root - group: root - mode: 644 - {% endif %} + {%- endif %} - require: - file: mysql_config_directory -{% endif %} +{%- endif %} -{% if "galera_config" in mysql %} +{%- if "galera_config" in mysql %} mysql_galera_config: file.managed: - name: {{ mysql.config_directory + mysql.galera_config.file }} - template: jinja - source: salt://{{ tpldir }}/files/galera.cnf - {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + {%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - context: tpldir: {{ tpldir }} - user: root - group: root - mode: 644 - {% endif %} + {%- endif %} - require: - file: mysql_config_directory -{% endif %} +{%- endif %} -{% if "library_config" in mysql %} +{%- if "library_config" in mysql %} mysql_library_config: file.managed: - name: {{ mysql.config_directory + mysql.library_config.file }} - template: jinja - source: salt://{{ tpldir }}/files/client.cnf - {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + {%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - context: tpldir: {{ tpldir }} - user: root - group: root - mode: 644 - {% endif %} + {%- endif %} - require: - file: mysql_config_directory -{% endif %} +{%- endif %} -{% if "clients_config" in mysql %} +{%- if "clients_config" in mysql %} mysql_clients_config: file.managed: - name: {{ mysql.config_directory + mysql.clients_config.file }} - template: jinja - source: salt://{{ tpldir }}/files/mysql-clients.cnf - {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + {%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - context: tpldir: {{ tpldir }} - user: root - group: root - mode: 644 - {% endif %} + {%- endif %} - require: - file: mysql_config_directory -{% endif %} +{%- endif %} -{% endif %} +{%- endif %} mysql_config: file.managed: - name: {{ mysql.config.file }} - template: jinja -{% if "config_directory" in mysql %} +{%- if "config_directory" in mysql %} - source: salt://{{ tpldir }}/files/my-include.cnf -{% else %} +{%- else %} - source: salt://{{ tpldir }}/files/my.cnf -{% endif %} +{%- endif %} - context: tpldir: {{ tpldir }} - {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} + {%- if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - user: root - group: root - mode: 644 - {% endif %} + {%- endif %} diff --git a/mysql/database.sls b/mysql/database.sls index 9a517ef..5d9cce0 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -1,46 +1,46 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} -{% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} -{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} -{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} -{% set db_states = [] %} +{%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} +{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} +{%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} +{%- set db_states = [] %} -{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} -{% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} +{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} +{%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} include: - .python -{% for database_obj in salt['pillar.get']('mysql:database', []) %} -{% set state_id = 'mysql_db_' ~ loop.index0 %} -{% if not database_obj %}{# in case database_obj == [] #} -{% continue %} -{% elif database_obj is mapping %} -{% set database = database_obj.get('name') %} -{% set present = database_obj.get('present', True) %} -{% else %} -{% set database = database_obj %} -{% set present = True %} -{% endif %} +{%- for database_obj in salt['pillar.get']('mysql:database', []) %} +{%- set state_id = 'mysql_db_' ~ loop.index0 %} +{%- if not database_obj %}{# in case database_obj == [] #} +{%- continue %} +{%- elif database_obj is mapping %} +{%- set database = database_obj.get('name') %} +{%- set present = database_obj.get('present', True) %} +{%- else %} +{%- set database = database_obj %} +{%- set present = True %} +{%- endif %} {{ state_id }}: {%- if present %} mysql_database.present: - {% if database_obj is mapping %} + {%- if database_obj is mapping %} - character_set: {{ database_obj.get('character_set', '') }} - collate: {{ database_obj.get('collate', '') }} - {% endif %} - {% else %} + {%- endif %} + {%- else %} mysql_database.absent: - {% endif %} + {%- endif %} - name: {{ database }} - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' - {% if mysql_salt_pass %} + {%- if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' - {% endif %} + {%- endif %} - connection_charset: utf8 -{% if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %} +{%- if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %} {{ state_id }}_schema: file.managed: - name: /etc/mysql/{{ database }}.schema @@ -50,17 +50,17 @@ include: {%- if template_type %} - template: {{ template_type }} - context: {{ template_context|yaml }} -{% endif %} +{%- endif %} - user: {{ salt['pillar.get']('mysql:server:user', 'mysql') }} - makedirs: True {{ state_id }}_load: cmd.wait: - - name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {% if mysql_salt_pass %}-p{% endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema + - name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {%- if mysql_salt_pass %}-p{%- endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema - watch: - file: {{ state_id }}_schema - mysql_database: {{ state_id }} -{% endif %} +{%- endif %} -{% do db_states.append(state_id) %} -{% endfor %} +{%- do db_states.append(state_id) %} +{%- endfor %} diff --git a/mysql/dev.sls b/mysql/dev.sls index e1dd90b..4f7e19f 100644 --- a/mysql/dev.sls +++ b/mysql/dev.sls @@ -1,4 +1,4 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} mysql_dev: pkg: diff --git a/mysql/disabled.sls b/mysql/disabled.sls index fde0478..7466d47 100644 --- a/mysql/disabled.sls +++ b/mysql/disabled.sls @@ -1,4 +1,4 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} mysql: service.dead: diff --git a/mysql/init.sls b/mysql/init.sls index a84c016..3c3ee92 100644 --- a/mysql/init.sls +++ b/mysql/init.sls @@ -1,32 +1,32 @@ -{% from tpldir ~ '/database.sls' import db_states with context %} -{% from tpldir ~ '/user.sls' import user_states with context %} +{%- from tpldir ~ '/database.sls' import db_states with context %} +{%- from tpldir ~ '/user.sls' import user_states with context %} -{% macro requisites(type, states) %} +{%- macro requisites(type, states) %} {%- for state in states %} - {{ type }}: {{ state }} {%- endfor -%} -{% endmacro %} +{%- endmacro %} -{% set mysql_dev = salt['pillar.get']('mysql:dev:install', False) %} -{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %} +{%- set mysql_dev = salt['pillar.get']('mysql:dev:install', False) %} +{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', False) %} include: - .server -{% if mysql_salt_user %} +{%- if mysql_salt_user %} - .salt-user -{% endif %} +{%- endif %} - .database - .user -{% if mysql_dev %} +{%- if mysql_dev %} - .dev -{% endif %} +{%- endif %} -{% if (db_states|length() + user_states|length()) > 0 %} +{%- if (db_states|length() + user_states|length()) > 0 %} extend: mysqld-service-running: service: - require_in: {{ requisites('mysql_database', db_states) }} {{ requisites('mysql_user', user_states) }} -{% endif %} +{%- endif %} diff --git a/mysql/macos/install.sls b/mysql/macos/install.sls index f57cd71..be74678 100644 --- a/mysql/macos/install.sls +++ b/mysql/macos/install.sls @@ -21,13 +21,13 @@ mysql-macos-download-{{ product }}-archive: cmd.run: - name: curl {{ dl.opts }} -o {{ dl.tmpdir }}/{{ archivefile }} {{ data.url }} - unless: test -f {{ dl.tmpdir }}/{{ archivefile }} - {% if grains['saltversioninfo'] >= [2017, 7, 0] %} + {%- if grains['saltversioninfo'] >= [2017, 7, 0] %} - retry: attempts: {{ dl.retries }} interval: {{ dl.interval }} until: True splay: 10 - {% endif %} + {%- endif %} - require: - mysql-macos-extract-dirs @@ -93,4 +93,4 @@ mysql-macos-{{ product }}-desktop-shortcut-add: - file: mysql-macos-{{ product }}-desktop-shortcut-add {%- endif %} - {% endfor %} + {%- endfor %} diff --git a/mysql/python.sls b/mysql/python.sls index cecc83f..c7aec15 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -1,4 +1,4 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} mysql_python: pkg.installed: diff --git a/mysql/remove_test_database.sls b/mysql/remove_test_database.sls index bb3204f..1286558 100644 --- a/mysql/remove_test_database.sls +++ b/mysql/remove_test_database.sls @@ -1,8 +1,8 @@ -{% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} -{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} -{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} -{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} -{% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} +{%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} +{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} +{%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} +{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} +{%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} include: - .python @@ -13,7 +13,7 @@ mysql remove test database: - host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' - connection_host: '{{ mysql_host }}' - {% if mysql_salt_pass %} + {%- if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' - {% endif %} + {%- endif %} - connection_charset: utf8 diff --git a/mysql/repo.sls b/mysql/repo.sls index 63d01ec..dde0099 100644 --- a/mysql/repo.sls +++ b/mysql/repo.sls @@ -1,24 +1,24 @@ include: - .config -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} # Completely ignore non-RHEL based systems # TODO: Add Debian and Suse systems. # TODO: Allow user to specify MySQL version and alter yum repo file accordingly. -{% if grains['os_family'] == 'RedHat' and 'osmajorrelease' in grains %} - {% if grains['osmajorrelease']|int == 5 %} - {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %} - {% elif grains['osmajorrelease']|int == 6 %} - {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el6.rpm" %} - {% elif grains['osmajorrelease']|int == 7 %} - {% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el7.rpm" %} - {% endif %} -{% endif %} +{%- if grains['os_family'] == 'RedHat' and 'osmajorrelease' in grains %} + {%- if grains['osmajorrelease']|int == 5 %} + {%- set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %} + {%- elif grains['osmajorrelease']|int == 6 %} + {%- set rpm_source = "http://repo.mysql.com/mysql57-community-release-el6.rpm" %} + {%- elif grains['osmajorrelease']|int == 7 %} + {%- set rpm_source = "http://repo.mysql.com/mysql57-community-release-el7.rpm" %} + {%- endif %} +{%- endif %} -{% set mysql57_community_release = salt['pillar.get']('mysql:release', false) %} +{%- set mysql57_community_release = salt['pillar.get']('mysql:release', false) %} # A lookup table for MySQL Repo GPG keys & RPM URLs for various RedHat releases - {% set pkg = { + {%- set pkg = { 'key': 'http://repo.mysql.com/RPM-GPG-KEY-mysql', 'key_hash': 'md5=162ec8cb41add661b357e926a083b0cc', 'rpm': rpm_source @@ -38,12 +38,12 @@ mysql57_community_release: - require: - file: install_pubkey_mysql - require_in: - {% if "server_config" in mysql %} + {%- if "server_config" in mysql %} - pkg: {{ mysql.serverpkg }} - {% endif %} - {% if "clients_config" in mysql %} + {%- endif %} + {%- if "clients_config" in mysql %} - pkg: {{ mysql.clientpkg }} - {% endif %} + {%- endif %} set_pubkey_mysql: file.replace: diff --git a/mysql/salt-user.sls b/mysql/salt-user.sls index ed569df..8e88618 100644 --- a/mysql/salt-user.sls +++ b/mysql/salt-user.sls @@ -1,20 +1,20 @@ include: - .server -{% set os_family = salt['grains.get']('os_family', None) %} -{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', 'salt') %} -{% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', salt['grains.get']('server_id')) %} -{% set mysql_salt_grants = salt['pillar.get']('mysql:salt_user:grants', []) %} -{% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} -{% set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} -{% set mysql_root_hash = salt['pillar.get']('mysql:server:root_password_hash', None) %} +{%- set os_family = salt['grains.get']('os_family', None) %} +{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', 'salt') %} +{%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', salt['grains.get']('server_id')) %} +{%- set mysql_salt_grants = salt['pillar.get']('mysql:salt_user:grants', []) %} +{%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} +{%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} +{%- set mysql_root_hash = salt['pillar.get']('mysql:server:root_password_hash', None) %} -{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} -{% if mysql_host == 'localhost' %} -{% set host = 'localhost' %} -{% else %} -{% set host = grains['fqdn'] %} -{% endif %} +{%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} +{%- if mysql_host == 'localhost' %} +{%- set host = 'localhost' %} +{%- else %} +{%- set host = grains['fqdn'] %} +{%- endif %} mysql_salt_user_with_salt_user: mysql_user.present: @@ -28,10 +28,10 @@ mysql_salt_user_with_salt_user: # - onlyif: # - mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;" # - VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password -{% endif %} +{%- endif %} {%- if mysql_salt_grants != [] %} mysql_salt_user_with_salt_user_grants: @@ -51,11 +51,11 @@ mysql_salt_user_with_salt_user_grants: - VALUE=$(mysql --user {{ mysql_salt_user }} --password='{{ mysql_salt_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'Y' ]; then /bin/true; else /bin/false; fi - require: - mysql_user: mysql_salt_user_with_salt_user -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password -{% endif %} -{% endif %} +{%- endif %} +{%- endif %} mysql_salt_user_with_root_user: mysql_user.present: @@ -69,10 +69,10 @@ mysql_salt_user_with_root_user: - onlyif: - mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -h {{ mysql_host }} --execute="SELECT 1;" - VALUE=$(mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password -{% endif %} +{%- endif %} {%- if mysql_salt_grants != [] %} mysql_salt_user_with_root_user_grants: @@ -92,11 +92,11 @@ mysql_salt_user_with_root_user_grants: - VALUE=$(mysql --user {{ mysql_root_user }} --password='{{ mysql_root_pass|replace("'", "'\"'\"'") }}' -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi - require: - mysql_user: mysql_salt_user_with_root_user -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password -{% endif %} -{% endif %} +{%- endif %} +{%- endif %} mysql_salt_user_with_passwordless_root_user: mysql_user.present: @@ -109,10 +109,10 @@ mysql_salt_user_with_passwordless_root_user: - onlyif: - mysql --user {{ mysql_root_user }} -h {{ mysql_host }} --execute="SELECT 1;" - VALUE=$(mysql --user {{ mysql_root_user }} -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password -{% endif %} +{%- endif %} {%- if mysql_salt_grants != [] %} mysql_salt_user_with_passwordless_root_user_grants: @@ -131,13 +131,13 @@ mysql_salt_user_with_passwordless_root_user_grants: - VALUE=$(mysql --user {{ mysql_root_user }} -ss -e "SELECT Grant_priv FROM mysql.user WHERE user = '{{ mysql_salt_user }}' AND host = '{{ host }}';"); if [ "$VALUE" = 'N' -o -z "$VALUE" ]; then /bin/true; else /bin/false; fi - require: - mysql_user: mysql_salt_user_with_passwordless_root_user -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} - require_in: - mysql_user: mysql_root_password -{% endif %} -{% endif %} +{%- endif %} +{%- endif %} -{% if os_family in ['RedHat', 'Suse'] %} +{%- if os_family in ['RedHat', 'Suse'] %} extend: mysql_root_password: cmd.run: @@ -157,4 +157,4 @@ extend: - connection_user: '{{ mysql_salt_user }}' - connection_pass: '{{ mysql_salt_pass }}' - connection_charset: utf8 -{% endif %} +{%- endif %} diff --git a/mysql/server.sls b/mysql/server.sls index a517b8c..564555e 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -2,19 +2,19 @@ include: - .config - .python -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} -{% set os = salt['grains.get']('os', None) %} -{% set os_family = salt['grains.get']('os_family', None) %} -{% set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} -{% set mysql_root_password = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} -{% set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} -{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} -{% set mysql_salt_password = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_password) %} -{% set mysql_datadir = salt['pillar.get']('mysql:server:mysqld:datadir', '/var/lib/mysql') %} +{%- set os = salt['grains.get']('os', None) %} +{%- set os_family = salt['grains.get']('os_family', None) %} +{%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} +{%- set mysql_root_password = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} +{%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} +{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} +{%- set mysql_salt_password = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_password) %} +{%- set mysql_datadir = salt['pillar.get']('mysql:server:mysqld:datadir', '/var/lib/mysql') %} -{% if mysql_root_password %} -{% if os_family == 'Debian' %} +{%- if mysql_root_password %} +{%- if os_family == 'Debian' %} mysql_debconf_utils: pkg.installed: - name: {{ mysql.debconf_utils }} @@ -29,7 +29,7 @@ mysql_debconf: - require: - pkg: mysql_debconf_utils - {% if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} + {%- if 'osmajorrelease' in grains and salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %} mysql_password_debconf: debconf.set: @@ -42,9 +42,9 @@ mysql_password_debconf: - require: - pkg: mysql_debconf_utils - {% endif %} + {%- endif %} -{% elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} +{%- elif os_family in ['RedHat', 'Suse', 'FreeBSD'] %} mysql_root_password: cmd.run: - name: mysqladmin --host "{{ mysql_host }}" --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' @@ -52,7 +52,7 @@ mysql_root_password: - require: - service: mysqld-service-running -{% for host in {'localhost': '', 'localhost.localdomain': '', salt['grains.get']('fqdn'): ''}.keys() %} +{%- for host in {'localhost': '', 'localhost.localdomain': '', salt['grains.get']('fqdn'): ''}.keys() %} mysql_delete_anonymous_user_{{ host }}: mysql_user: - absent @@ -60,9 +60,9 @@ mysql_delete_anonymous_user_{{ host }}: - name: '' - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' - {% if mysql_salt_password %} + {%- if mysql_salt_password %} - connection_pass: '{{ mysql_salt_password }}' - {% endif %} + {%- endif %} - connection_charset: utf8 - require: - service: mysqld-service-running @@ -73,19 +73,19 @@ mysql_delete_anonymous_user_{{ host }}: {%- if (mysql_salt_user != mysql_root_user) %} - sls: mysql.salt-user {%- endif %} -{% endfor %} -{% endif %} -{% endif %} +{%- endfor %} +{%- endif %} +{%- endif %} -{% if os_family == 'Arch' %} +{%- if os_family == 'Arch' %} # on arch linux: inital mysql datadirectory is not created mysql_install_datadir: cmd.run: -{% if mysql.version is defined and mysql.version >= 5.7 %} +{%- if mysql.version is defined and mysql.version >= 5.7 %} - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} -{% else %} +{%- else %} - name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} -{% endif %} +{%- endif %} - runas: root - creates: {{ mysql_datadir }}/mysql/user.frm - env: @@ -95,22 +95,22 @@ mysql_install_datadir: - file: mysql_config - require_in: - service: mysqld-service-running -{% endif %} +{%- endif %} mysqld-packages: pkg.installed: - name: {{ mysql.serverpkg }} -{% if os_family == 'Debian' and mysql_root_password %} +{%- if os_family == 'Debian' and mysql_root_password %} - require: - debconf: mysql_debconf -{% endif %} +{%- endif %} - require_in: - file: mysql_config -{% if "config_directory" in mysql %} +{%- if "config_directory" in mysql %} - file: mysql_config_directory -{% endif %} +{%- endif %} -{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %} +{%- if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %} # Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out. mysql_initialize: cmd.run: @@ -119,9 +119,9 @@ mysql_initialize: - creates: {{ mysql_datadir }}/mysql/ - require: - pkg: {{ mysql.serverpkg }} -{% endif %} +{%- endif %} -{% if os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} +{%- if os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} # For MariaDB it's enough to only create the datadir mysql_initialize: file.directory: @@ -131,9 +131,9 @@ mysql_initialize: - makedirs: True - require: - pkg: {{ mysql.serverpkg }} -{% endif %} +{%- endif %} -{% if os_family in ['Gentoo'] %} +{%- if os_family in ['Gentoo'] %} mysql_initialize: cmd.run: - name: emerge --config {{ mysql.serverpkg }} @@ -141,7 +141,7 @@ mysql_initialize: - creates: {{ mysql_datadir }}/mysql/ - require: - pkg: {{ mysql.serverpkg }} -{% endif %} +{%- endif %} mysqld-service-running: service.running: @@ -149,17 +149,17 @@ mysqld-service-running: - enable: True - require: - pkg: {{ mysql.serverpkg }} -{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo']) %} +{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo']) %} - cmd: mysql_initialize -{% elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} +{%- elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} - file: {{ mysql_datadir }} -{% endif %} +{%- endif %} - watch: - pkg: {{ mysql.serverpkg }} - file: mysql_config -{% if "config_directory" in mysql and "server_config" in mysql %} +{%- if "config_directory" in mysql and "server_config" in mysql %} - file: mysql_server_config -{% endif %} +{%- endif %} mysql_what_is_status_of_{{ mysql.service }}: cmd.run: diff --git a/mysql/user.sls b/mysql/user.sls index c31ef0e..5c7e98b 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -1,38 +1,38 @@ -{% from tpldir ~ "/map.jinja" import mysql with context %} +{%- from tpldir ~ "/map.jinja" import mysql with context %} {%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %} {%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %} {%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %} -{% set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} -{% set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} +{%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %} +{%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %} -{% set user_states = [] %} -{% set user_hosts = [] %} +{%- set user_states = [] %} +{%- set user_hosts = [] %} include: - .python -{% for name, user in salt['pillar.get']('mysql:user', {}).items() %} +{%- for name, user in salt['pillar.get']('mysql:user', {}).items() %} -{% set user_host = salt['pillar.get']('mysql:user:%s:host'|format(name)) %} -{% if user_host != '' %} - {% set user_hosts = [user_host] %} -{% else %} - {% set user_hosts = salt['pillar.get']('mysql:user:%s:hosts'|format(name)) %} -{% endif %} +{%- set user_host = salt['pillar.get']('mysql:user:%s:host'|format(name)) %} +{%- if user_host != '' %} + {%- set user_hosts = [user_host] %} +{%- else %} + {%- set user_hosts = salt['pillar.get']('mysql:user:%s:hosts'|format(name)) %} +{%- endif %} -{% if not user_hosts %} - {% set mine_target = salt['pillar.get']('mysql:user:%s:mine_hosts:target'|format(name)) %} - {% set mine_function = salt['pillar.get']('mysql:user:%s:mine_hosts:function'|format(name)) %} - {% set mine_expression_form = salt['pillar.get']('mysql:user:%s:mine_hosts:expr_form'|format(name)) %} +{%- if not user_hosts %} + {%- set mine_target = salt['pillar.get']('mysql:user:%s:mine_hosts:target'|format(name)) %} + {%- set mine_function = salt['pillar.get']('mysql:user:%s:mine_hosts:function'|format(name)) %} + {%- set mine_expression_form = salt['pillar.get']('mysql:user:%s:mine_hosts:expr_form'|format(name)) %} - {% if mine_target and mine_function and mine_expression_form %} - {% set user_hosts = salt['mine.get'](mine_target, mine_function, mine_expression_form).values() %} - {% endif %} -{% endif %} + {%- if mine_target and mine_function and mine_expression_form %} + {%- set user_hosts = salt['mine.get'](mine_target, mine_function, mine_expression_form).values() %} + {%- endif %} +{%- endif %} -{% for host in user_hosts %} +{%- for host in user_hosts %} -{% set state_id = 'mysql_user_' ~ name ~ '_' ~ host %} +{%- set state_id = 'mysql_user_' ~ name ~ '_' ~ host %} {{ state_id }}: {%- if user.get('present', True) %} mysql_user.present: @@ -64,72 +64,72 @@ include: - grant: {{ user['grants']|join(",") }} - database: '*.*' - grant_option: {{ user['grant_option'] | default(False) }} - {% if 'ssl' in user or 'ssl-X509' in user %} + {%- if 'ssl' in user or 'ssl-X509' in user %} - ssl_option: - SSL: {{ user['ssl'] | default(False) }} - {% if user['ssl-X509'] is defined %} + {%- if user['ssl-X509'] is defined %} - X509: {{ user['ssl-X509'] }} - {% endif %} - {% if user['ssl-SUBJECT'] is defined %} + {%- endif %} + {%- if user['ssl-SUBJECT'] is defined %} - SUBJECT: {{ user['ssl-SUBJECT'] }} - {% endif %} - {% if user['ssl-ISSUER'] is defined %} + {%- endif %} + {%- if user['ssl-ISSUER'] is defined %} - ISSUER: {{ user['ssl-ISSUER'] }} - {% endif %} - {% if user['ssl-CIPHER'] is defined %} + {%- endif %} + {%- if user['ssl-CIPHER'] is defined %} - CIPHER: {{ user['ssl-CIPHER'] }} - {% endif %} - {% endif %} + {%- endif %} + {%- endif %} - user: {{ name }} - host: '{{ host }}' - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' - {% if mysql_salt_pass -%} + {%- if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' - {% endif %} + {%- endif %} - connection_charset: utf8 - require: - mysql_user: {{ state_id }} -{% endif %} +{%- endif %} {%- if 'databases' in user %} -{% for db in user['databases'] %} +{%- for db in user['databases'] %} {{ state_id ~ '_' ~ loop.index0 }}: mysql_grants.present: - name: {{ name ~ '_' ~ db['database'] ~ '_' ~ db['table'] | default('all') }} - grant: {{ db['grants']|join(",") }} - database: '{{ db['database'] }}.{{ db['table'] | default('*') }}' - grant_option: {{ db['grant_option'] | default(False) }} - {% if 'ssl' in user or 'ssl-X509' in user %} + {%- if 'ssl' in user or 'ssl-X509' in user %} - ssl_option: - SSL: {{ user['ssl'] | default(False) }} - {% if user['ssl-X509'] is defined %} + {%- if user['ssl-X509'] is defined %} - X509: {{ user['ssl-X509'] }} - {% endif %} - {% if user['ssl-SUBJECT'] is defined %} + {%- endif %} + {%- if user['ssl-SUBJECT'] is defined %} - SUBJECT: {{ user['ssl-SUBJECT'] }} - {% endif %} - {% if user['ssl-ISSUER'] is defined %} + {%- endif %} + {%- if user['ssl-ISSUER'] is defined %} - ISSUER: {{ user['ssl-ISSUER'] }} - {% endif %} - {% if user['ssl-CIPHER'] is defined %} + {%- endif %} + {%- if user['ssl-CIPHER'] is defined %} - CIPHER: {{ user['ssl-CIPHER'] }} - {% endif %} - {% endif %} + {%- endif %} + {%- endif %} - user: {{ name }} - host: '{{ host }}' - escape: {{ db['escape'] | default(True) }} - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' - {% if mysql_salt_pass -%} + {%- if mysql_salt_pass %} - connection_pass: '{{ mysql_salt_pass }}' - {% endif %} + {%- endif %} - connection_charset: utf8 - require: - mysql_user: {{ state_id }} -{% endfor %} -{% endif %} +{%- endfor %} +{%- endif %} -{% do user_states.append(state_id) %} -{% endfor %} -{% endfor %} +{%- do user_states.append(state_id) %} +{%- endfor %} +{%- endfor %} From 32ac499995c865378a2e21f9377dda3407600b6a Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 3 Dec 2019 21:22:04 +0000 Subject: [PATCH 094/139] chore(release): 0.52.3 [skip ci] ## [0.52.3](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.2...v0.52.3) (2019-12-03) ### Bug Fixes * **mac_shortcut.sh:** fix `shellcheck` errors ([7b309f8](https://github.com/saltstack-formulas/mysql-formula/commit/7b309f8da272ebdcb36dbfa7619a0fc9872a79a7)) * **release.config.js:** use full commit hash in commit link [skip ci] ([3f51b8b](https://github.com/saltstack-formulas/mysql-formula/commit/3f51b8bbc231a7455e6763b415221abff636d8a2)) ### Continuous Integration * **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([5efe938](https://github.com/saltstack-formulas/mysql-formula/commit/5efe9387fde63e0c09d99d5771f3b623fb934242)) * **kitchen:** use `develop` image until `master` is ready (`amazonlinux`) [skip ci] ([63bfb4a](https://github.com/saltstack-formulas/mysql-formula/commit/63bfb4a0f25b62bdc45c1738d438ce5ec64f2183)) * **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([27ac5a3](https://github.com/saltstack-formulas/mysql-formula/commit/27ac5a3f684325a8e15736bb85d4774807061534)) * **travis:** apply changes from build config validation [skip ci] ([d520848](https://github.com/saltstack-formulas/mysql-formula/commit/d520848c815a9c2815ee3f1943e3e3962a26c7cf)) * **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([1a8d914](https://github.com/saltstack-formulas/mysql-formula/commit/1a8d914fbd5e43f78ee2334b9c5ccd51ee65ad57)) * **travis:** quote pathspecs used with `git ls-files` [skip ci] ([3fb5a82](https://github.com/saltstack-formulas/mysql-formula/commit/3fb5a82de66dda9a05decc5ee7263729ef913533)) * **travis:** run `shellcheck` during lint job [skip ci] ([0931835](https://github.com/saltstack-formulas/mysql-formula/commit/0931835f1cfc77022a43242bd3ab04cbed2a3a02)) * **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([1512279](https://github.com/saltstack-formulas/mysql-formula/commit/1512279c2eac26638720461cc7e847d93d2c77d6)) * **travis:** use build config validation (beta) [skip ci] ([40d4b97](https://github.com/saltstack-formulas/mysql-formula/commit/40d4b9763f252f5811d31b2b2df156260bde2b6d)) ### Documentation * **contributing:** remove to use org-level file instead [skip ci] ([6afcc80](https://github.com/saltstack-formulas/mysql-formula/commit/6afcc80396dc4ec2044d8611f18a6ed9075c6a52)) * **readme:** update link to `CONTRIBUTING` [skip ci] ([01f25a3](https://github.com/saltstack-formulas/mysql-formula/commit/01f25a3ebfbf59d1db2bec73bc5fef9d8bcafd7e)) ### Performance Improvements * **travis:** improve `salt-lint` invocation [skip ci] ([1980c63](https://github.com/saltstack-formulas/mysql-formula/commit/1980c634b9021c7d29be914bd2a63ddf3c31c8ad)) --- AUTHORS.md | 5 ++--- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 11 ++++------- docs/CHANGELOG.rst | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 11 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index c780daf..9d9523d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -5,10 +5,10 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 +@myii|[@myii](https://github.com/myii)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @whiteinge|[@whiteinge](https://github.com/whiteinge)|27 -@myii|[@myii](https://github.com/myii)|23 @noelmcloughlin|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 @alxwr|[@alxwr](https://github.com/alxwr)|14 @cheuschober|[@cheuschober](https://github.com/cheuschober)|11 @@ -52,7 +52,6 @@ Avatar|Contributor|Contributions @johnklehm|[@johnklehm](https://github.com/johnklehm)|1 @tardypad|[@tardypad](https://github.com/tardypad)|1 @dosercz|[@dosercz](https://github.com/dosercz)|1 -@edusperoni|[@edusperoni](https://github.com/edusperoni)|1 @sivir|[@sivir](https://github.com/sivir)|1 @terminalmage|[@terminalmage](https://github.com/terminalmage)|1 @replicant0wnz|[@replicant0wnz](https://github.com/replicant0wnz)|1 @@ -83,4 +82,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-03. diff --git a/CHANGELOG.md b/CHANGELOG.md index 451326b..84986f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## [0.52.3](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.2...v0.52.3) (2019-12-03) + + +### Bug Fixes + +* **mac_shortcut.sh:** fix `shellcheck` errors ([7b309f8](https://github.com/saltstack-formulas/mysql-formula/commit/7b309f8da272ebdcb36dbfa7619a0fc9872a79a7)) +* **release.config.js:** use full commit hash in commit link [skip ci] ([3f51b8b](https://github.com/saltstack-formulas/mysql-formula/commit/3f51b8bbc231a7455e6763b415221abff636d8a2)) + + +### Continuous Integration + +* **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([5efe938](https://github.com/saltstack-formulas/mysql-formula/commit/5efe9387fde63e0c09d99d5771f3b623fb934242)) +* **kitchen:** use `develop` image until `master` is ready (`amazonlinux`) [skip ci] ([63bfb4a](https://github.com/saltstack-formulas/mysql-formula/commit/63bfb4a0f25b62bdc45c1738d438ce5ec64f2183)) +* **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([27ac5a3](https://github.com/saltstack-formulas/mysql-formula/commit/27ac5a3f684325a8e15736bb85d4774807061534)) +* **travis:** apply changes from build config validation [skip ci] ([d520848](https://github.com/saltstack-formulas/mysql-formula/commit/d520848c815a9c2815ee3f1943e3e3962a26c7cf)) +* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([1a8d914](https://github.com/saltstack-formulas/mysql-formula/commit/1a8d914fbd5e43f78ee2334b9c5ccd51ee65ad57)) +* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([3fb5a82](https://github.com/saltstack-formulas/mysql-formula/commit/3fb5a82de66dda9a05decc5ee7263729ef913533)) +* **travis:** run `shellcheck` during lint job [skip ci] ([0931835](https://github.com/saltstack-formulas/mysql-formula/commit/0931835f1cfc77022a43242bd3ab04cbed2a3a02)) +* **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([1512279](https://github.com/saltstack-formulas/mysql-formula/commit/1512279c2eac26638720461cc7e847d93d2c77d6)) +* **travis:** use build config validation (beta) [skip ci] ([40d4b97](https://github.com/saltstack-formulas/mysql-formula/commit/40d4b9763f252f5811d31b2b2df156260bde2b6d)) + + +### Documentation + +* **contributing:** remove to use org-level file instead [skip ci] ([6afcc80](https://github.com/saltstack-formulas/mysql-formula/commit/6afcc80396dc4ec2044d8611f18a6ed9075c6a52)) +* **readme:** update link to `CONTRIBUTING` [skip ci] ([01f25a3](https://github.com/saltstack-formulas/mysql-formula/commit/01f25a3ebfbf59d1db2bec73bc5fef9d8bcafd7e)) + + +### Performance Improvements + +* **travis:** improve `salt-lint` invocation [skip ci] ([1980c63](https://github.com/saltstack-formulas/mysql-formula/commit/1980c634b9021c7d29be914bd2a63ddf3c31c8ad)) + ## [0.52.2](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.1...v0.52.2) (2019-10-11) diff --git a/FORMULA b/FORMULA index 3f375b2..7f6761a 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.2 +version: 0.52.3 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4dafc8f..01b882a 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -16,6 +16,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 38 + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 38 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 37 @@ -25,9 +28,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@whiteinge` - `@whiteinge `_ - 27 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 23 * - :raw-html-m2r:`@noelmcloughlin` - `@noelmcloughlin `_ - 18 @@ -157,9 +157,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@dosercz` - `@dosercz `_ - 1 - * - :raw-html-m2r:`@edusperoni` - - `@edusperoni `_ - - 1 * - :raw-html-m2r:`@sivir` - `@sivir `_ - 1 @@ -245,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-11. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-12-03. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 61b9348..f4505dc 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,43 @@ Changelog ========= +`0.52.3 `_ (2019-12-03) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **mac_shortcut.sh:** fix ``shellcheck`` errors (\ `7b309f8 `_\ ) +* **release.config.js:** use full commit hash in commit link [skip ci] (\ `3f51b8b `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen:** use ``debian-10-master-py3`` instead of ``develop`` [skip ci] (\ `5efe938 `_\ ) +* **kitchen:** use ``develop`` image until ``master`` is ready (\ ``amazonlinux``\ ) [skip ci] (\ `63bfb4a `_\ ) +* **kitchen+travis:** upgrade matrix after ``2019.2.2`` release [skip ci] (\ `27ac5a3 `_\ ) +* **travis:** apply changes from build config validation [skip ci] (\ `d520848 `_\ ) +* **travis:** opt-in to ``dpl v2`` to complete build config validation [skip ci] (\ `1a8d914 `_\ ) +* **travis:** quote pathspecs used with ``git ls-files`` [skip ci] (\ `3fb5a82 `_\ ) +* **travis:** run ``shellcheck`` during lint job [skip ci] (\ `0931835 `_\ ) +* **travis:** update ``salt-lint`` config for ``v0.0.10`` [skip ci] (\ `1512279 `_\ ) +* **travis:** use build config validation (beta) [skip ci] (\ `40d4b97 `_\ ) + +Documentation +^^^^^^^^^^^^^ + + +* **contributing:** remove to use org-level file instead [skip ci] (\ `6afcc80 `_\ ) +* **readme:** update link to ``CONTRIBUTING`` [skip ci] (\ `01f25a3 `_\ ) + +Performance Improvements +^^^^^^^^^^^^^^^^^^^^^^^^ + + +* **travis:** improve ``salt-lint`` invocation [skip ci] (\ `1980c63 `_\ ) + `0.52.2 `_ (2019-10-11) ---------------------------------------------------------------------------------------------------------- From 58fd821bdabf8caa5b96d6ad305b6ef1bedd3191 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 3 Dec 2019 21:33:52 +0000 Subject: [PATCH 095/139] chore(release): 0.52.4 [skip ci] ## [0.52.4](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.3...v0.52.4) (2019-12-03) ### Styles * remove previous line from jinja directives ([ec0e2a7](https://github.com/saltstack-formulas/mysql-formula/commit/ec0e2a765a587d0df94b0afb9f7a4ef78a5319ab)) --- AUTHORS.md | 4 ++-- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 12 ++++++------ docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 9d9523d..3938a75 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: +@myii|[@myii](https://github.com/myii)|39 @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 -@myii|[@myii](https://github.com/myii)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @whiteinge|[@whiteinge](https://github.com/whiteinge)|27 @@ -42,6 +42,7 @@ Avatar|Contributor|Contributions @vschum|[@vschum](https://github.com/vschum)|2 @madflojo|[@madflojo](https://github.com/madflojo)|2 @UtahDave|[@UtahDave](https://github.com/UtahDave)|2 +@daks|[@daks](https://github.com/daks)|2 @nesteves|[@nesteves](https://github.com/nesteves)|2 @1exx|[@1exx](https://github.com/1exx)|1 @aaronm-cloudtek|[@aaronm-cloudtek](https://github.com/aaronm-cloudtek)|1 @@ -78,7 +79,6 @@ Avatar|Contributor|Contributions @slawekp|[@slawekp](https://github.com/slawekp)|1 @tsia|[@tsia](https://github.com/tsia)|1 @zhujinhe|[@zhujinhe](https://github.com/zhujinhe)|1 -@daks|[@daks](https://github.com/daks)|1 --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 84986f4..b788343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.52.4](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.3...v0.52.4) (2019-12-03) + + +### Styles + +* remove previous line from jinja directives ([ec0e2a7](https://github.com/saltstack-formulas/mysql-formula/commit/ec0e2a765a587d0df94b0afb9f7a4ef78a5319ab)) + ## [0.52.3](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.2...v0.52.3) (2019-12-03) diff --git a/FORMULA b/FORMULA index 7f6761a..8d56fbd 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.3 +version: 0.52.4 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 01b882a..32f36e2 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -13,11 +13,11 @@ This list is sorted by the number of commits per contributor in *descending* ord * - Avatar - Contributor - Contributions - * - :raw-html-m2r:`@gravyboat` - - `@gravyboat `_ - - 38 * - :raw-html-m2r:`@myii` - `@myii `_ + - 39 + * - :raw-html-m2r:`@gravyboat` + - `@gravyboat `_ - 38 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ @@ -127,6 +127,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@UtahDave` - `@UtahDave `_ - 2 + * - :raw-html-m2r:`@daks` + - `@daks `_ + - 2 * - :raw-html-m2r:`@nesteves` - `@nesteves `_ - 2 @@ -235,9 +238,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@zhujinhe` - `@zhujinhe `_ - 1 - * - :raw-html-m2r:`@daks` - - `@daks `_ - - 1 ---- diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index f4505dc..41afc08 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.52.4 `_ (2019-12-03) +---------------------------------------------------------------------------------------------------------- + +Styles +^^^^^^ + + +* remove previous line from jinja directives (\ `ec0e2a7 `_\ ) + `0.52.3 `_ (2019-12-03) ---------------------------------------------------------------------------------------------------------- From a05f263f4b9eac52a5854fd57a6a24f997ccb291 Mon Sep 17 00:00:00 2001 From: smasa90 Date: Tue, 10 Dec 2019 11:37:56 +1100 Subject: [PATCH 096/139] fix(db_load): preserve space between -h and -p on the db load `cmd.wait` --- mysql/database.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/database.sls b/mysql/database.sls index 5d9cce0..0f9796e 100644 --- a/mysql/database.sls +++ b/mysql/database.sls @@ -56,7 +56,7 @@ include: {{ state_id }}_load: cmd.wait: - - name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {%- if mysql_salt_pass %}-p{%- endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema + - name: mysql -u {{ mysql_salt_user }} -h{{ mysql_host }} {% if mysql_salt_pass %}-p{%- endif %}{{ mysql_salt_pass }} {{ database }} < /etc/mysql/{{ database }}.schema - watch: - file: {{ state_id }}_schema - mysql_database: {{ state_id }} From 4008cf21ecdb86ebd2a4839f56c71da4dc4ee214 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 10 Dec 2019 01:49:57 +0000 Subject: [PATCH 097/139] chore(release): 0.52.5 [skip ci] ## [0.52.5](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.4...v0.52.5) (2019-12-10) ### Bug Fixes * **db_load:** preserve space between -h and -p on the db load `cmd.wait` ([a05f263](https://github.com/saltstack-formulas/mysql-formula/commit/a05f263f4b9eac52a5854fd57a6a24f997ccb291)) --- AUTHORS.md | 2 +- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 2 +- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 3938a75..b9903db 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -82,4 +82,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-03. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-10. diff --git a/CHANGELOG.md b/CHANGELOG.md index b788343..7bed428 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.52.5](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.4...v0.52.5) (2019-12-10) + + +### Bug Fixes + +* **db_load:** preserve space between -h and -p on the db load `cmd.wait` ([a05f263](https://github.com/saltstack-formulas/mysql-formula/commit/a05f263f4b9eac52a5854fd57a6a24f997ccb291)) + ## [0.52.4](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.3...v0.52.4) (2019-12-03) diff --git a/FORMULA b/FORMULA index 8d56fbd..a57351d 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.4 +version: 0.52.5 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 32f36e2..0c30827 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -242,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-12-03. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-12-10. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 41afc08..07a0b1e 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.52.5 `_ (2019-12-10) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **db_load:** preserve space between -h and -p on the db load ``cmd.wait`` (\ `a05f263 `_\ ) + `0.52.4 `_ (2019-12-03) ---------------------------------------------------------------------------------------------------------- From 04f75a7a3b43de9425a8f36dc202b7ecf0c4f856 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 16 Dec 2019 13:42:30 +0000 Subject: [PATCH 098/139] ci(gemfile): restrict `train` gem version until upstream fix [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/110 --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 5a232b6..8da7a69 100644 --- a/Gemfile +++ b/Gemfile @@ -5,3 +5,7 @@ source 'https://rubygems.org' gem 'kitchen-docker', '>= 2.9' gem 'kitchen-inspec', '>= 1.1' gem 'kitchen-salt', '>= 0.6.0' +# Latest versions of `train` cause failure when running `kitchen verify` +# Downgrading to `3.2.0` until this is fixed upstream +# https://github.com/inspec/train/pull/544#issuecomment-566055052 +gem 'train', '3.2.0' From b4f5f79781631d7d31061b880df3066ac5bc5860 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 22 Dec 2019 00:59:28 +0000 Subject: [PATCH 099/139] ci(travis): use `major.minor` for `semantic-release` version [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/112 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index edee8f1..e93eb5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,4 +113,4 @@ jobs: # Deprecated `skip_cleanup` can now be avoided, `cleanup: false` is by default edge: true # Run `semantic-release` - script: 'npx semantic-release@15' + script: 'npx semantic-release@15.14' From ef7a2ce2d857dd271ec0704ab951c8337cb6b64e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 5 Feb 2020 14:06:12 +0000 Subject: [PATCH 100/139] ci(kitchen): avoid using bootstrap for `master` instances [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/124 --- .travis.yml | 8 ++++---- kitchen.yml | 41 ++++++++++------------------------------- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index e93eb5b..a24b4f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ jobs: # - env: INSTANCE=default-centos-8-master-py3 # - env: INSTANCE=default-fedora-31-master-py3 # - env: INSTANCE=default-opensuse-leap-151-master-py3 - # - env: INSTANCE=default-amazonlinux-2-master-py2 + # - env: INSTANCE=default-amazonlinux-2-master-py3 # - env: INSTANCE=default-arch-base-latest-master-py2 # - env: INSTANCE=default-debian-10-2019-2-py3 - env: INSTANCE=default-debian-9-2019-2-py3 @@ -72,21 +72,21 @@ jobs: # - env: INSTANCE=default-fedora-31-2019-2-py3 # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 # - env: INSTANCE=default-centos-7-2019-2-py2 - # - env: INSTANCE=default-amazonlinux-2-2019-2-py2 + # - env: INSTANCE=default-amazonlinux-2-2019-2-py3 # - env: INSTANCE=default-arch-base-latest-2019-2-py2 # - env: INSTANCE=default-fedora-30-2018-3-py3 - env: INSTANCE=default-debian-9-2018-3-py2 # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 # - env: INSTANCE=default-centos-7-2018-3-py2 # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 - # - env: INSTANCE=default-amazonlinux-2-2018-3-py2 + # - env: INSTANCE=default-amazonlinux-1-2018-3-py2 # - env: INSTANCE=default-arch-base-latest-2018-3-py2 - env: INSTANCE=default-debian-8-2017-7-py2 # - env: INSTANCE=default-ubuntu-1604-2017-7-py2 # - env: INSTANCE=default-centos-6-2017-7-py2 # - env: INSTANCE=default-fedora-30-2017-7-py2 # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2 - # - env: INSTANCE=default-amazonlinux-2-2017-7-py2 + # - env: INSTANCE=default-amazonlinux-1-2017-7-py2 # - env: INSTANCE=default-arch-base-latest-2017-7-py2 ## Define the release stage that runs `semantic-release` diff --git a/kitchen.yml b/kitchen.yml index 77ceeb2..9f715af 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,52 +15,29 @@ platforms: - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: ubuntu-1804-master-py3 driver: image: netmanagers/salt-master-py3:ubuntu-18.04 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: centos-8-master-py3 driver: image: netmanagers/salt-master-py3:centos-8 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: fedora-31-master-py3 driver: image: netmanagers/salt-master-py3:fedora-31 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: opensuse-leap-151-master-py3 driver: image: netmanagers/salt-master-py3:opensuse-leap-15.1 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git master run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - # Use the `develop` image temporarily until the `master` image is available - # Not changing the name to minimise disruption across all of the formulas - - name: amazonlinux-2-master-py2 + - name: amazonlinux-2-master-py3 driver: - image: netmanagers/salt-develop-py2:amazonlinux-2 - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + image: netmanagers/salt-master-py3:amazonlinux-2 - name: arch-base-latest-master-py2 driver: image: netmanagers/salt-master-py2:arch-base-latest - provision_command: - - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git master run_command: /usr/lib/systemd/systemd ## SALT `2019.2` @@ -90,9 +67,9 @@ platforms: - name: centos-7-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:centos-7 - - name: amazonlinux-2-2019-2-py2 + - name: amazonlinux-2-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py2:amazonlinux-2 + image: netmanagers/salt-2019.2-py3:amazonlinux-2 - name: arch-base-latest-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:arch-base-latest @@ -119,9 +96,10 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-2018-3-py2 + - name: amazonlinux-1-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:amazonlinux-2 + image: netmanagers/salt-2018.3-py2:amazonlinux-1 + run_command: /sbin/init - name: arch-base-latest-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:arch-base-latest @@ -149,9 +127,10 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-2017-7-py2 + - name: amazonlinux-1-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:amazonlinux-2 + image: netmanagers/salt-2017.7-py2:amazonlinux-1 + run_command: /sbin/init - name: arch-base-latest-2017-7-py2 driver: image: netmanagers/salt-2017.7-py2:arch-base-latest From 525423e51d194aa54a3720e13b70069bb5e49e19 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 14 Feb 2020 12:51:26 +0000 Subject: [PATCH 101/139] chore(rubocop): move `LineLength` cop from `Metrics` to `Layout` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/129 --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index bdae9aa..96fd6e5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,7 +2,7 @@ # vim: ft=yaml --- # General overrides used across formulas in the org -Metrics/LineLength: +Layout/LineLength: # Increase from default of `80` # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) Max: 88 From 8dffbaf19e93b968761b450b7a83b81750dfb425 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 14 Feb 2020 22:29:40 +0000 Subject: [PATCH 102/139] chore(gitignore): update from the `template-formula` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/132 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0bbb03c..9436b36 100644 --- a/.gitignore +++ b/.gitignore @@ -105,6 +105,7 @@ ENV/ .mypy_cache/ # Bundler +.bundle/ Gemfile.lock # copied `.md` files used for conversion to `.rst` using `m2r` From f6dc2baacecc7377f10727c15cc37c735b76895c Mon Sep 17 00:00:00 2001 From: sticky-note Date: Wed, 15 Apr 2020 23:05:01 +1100 Subject: [PATCH 103/139] fix(reload-modules): do `reload_modules` on `python-mysql` py module installation --- mysql/python.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql/python.sls b/mysql/python.sls index c7aec15..736ecca 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -3,3 +3,4 @@ mysql_python: pkg.installed: - name: {{ mysql.pythonpkg }} + - reload_modules: True From 2b6e704c96d0373aadb56f90d758c960f538abdb Mon Sep 17 00:00:00 2001 From: sticky-note Date: Thu, 16 Apr 2020 00:06:53 +1100 Subject: [PATCH 104/139] fix(reload-modules): do `reload_modules` on py module installation --- mysql/python.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql/python.sls b/mysql/python.sls index c7aec15..736ecca 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -3,3 +3,4 @@ mysql_python: pkg.installed: - name: {{ mysql.pythonpkg }} + - reload_modules: True From 5e6e24a66423632ff06ebf6dc109f1c706f335d3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 15 Apr 2020 14:24:57 +0100 Subject: [PATCH 105/139] Revert "fix(reload-modules): do `reload_modules` on `python-mysql` py module installation" This reverts commit f6dc2baacecc7377f10727c15cc37c735b76895c. --- mysql/python.sls | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql/python.sls b/mysql/python.sls index 736ecca..c7aec15 100644 --- a/mysql/python.sls +++ b/mysql/python.sls @@ -3,4 +3,3 @@ mysql_python: pkg.installed: - name: {{ mysql.pythonpkg }} - - reload_modules: True From 8ffa3c4a26a6e186e8f56752e3b7492edb7e796d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 17 Apr 2020 14:26:25 +0000 Subject: [PATCH 106/139] chore(release): 0.52.6 [skip ci] ## [0.52.6](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.5...v0.52.6) (2020-04-17) ### Bug Fixes * **reload-modules:** do `reload_modules` on py module installation ([2b6e704](https://github.com/saltstack-formulas/mysql-formula/commit/2b6e704c96d0373aadb56f90d758c960f538abdb)) ### Continuous Integration * **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([04f75a7](https://github.com/saltstack-formulas/mysql-formula/commit/04f75a7a3b43de9425a8f36dc202b7ecf0c4f856)) * **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([ef7a2ce](https://github.com/saltstack-formulas/mysql-formula/commit/ef7a2ce2d857dd271ec0704ab951c8337cb6b64e)) * **travis:** use `major.minor` for `semantic-release` version [skip ci] ([b4f5f79](https://github.com/saltstack-formulas/mysql-formula/commit/b4f5f79781631d7d31061b880df3066ac5bc5860)) --- AUTHORS.md | 5 +++-- CHANGELOG.md | 14 ++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 7 +++++-- docs/CHANGELOG.rst | 17 +++++++++++++++++ 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index b9903db..cc3250c 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|39 +@myii|[@myii](https://github.com/myii)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @@ -77,9 +77,10 @@ Avatar|Contributor|Contributions @jam13|[@jam13](https://github.com/jam13)|1 @getSurreal|[@getSurreal](https://github.com/getSurreal)|1 @slawekp|[@slawekp](https://github.com/slawekp)|1 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|1 @tsia|[@tsia](https://github.com/tsia)|1 @zhujinhe|[@zhujinhe](https://github.com/zhujinhe)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-12-10. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-04-17. diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bed428..a34b9dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.52.6](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.5...v0.52.6) (2020-04-17) + + +### Bug Fixes + +* **reload-modules:** do `reload_modules` on py module installation ([2b6e704](https://github.com/saltstack-formulas/mysql-formula/commit/2b6e704c96d0373aadb56f90d758c960f538abdb)) + + +### Continuous Integration + +* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([04f75a7](https://github.com/saltstack-formulas/mysql-formula/commit/04f75a7a3b43de9425a8f36dc202b7ecf0c4f856)) +* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([ef7a2ce](https://github.com/saltstack-formulas/mysql-formula/commit/ef7a2ce2d857dd271ec0704ab951c8337cb6b64e)) +* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([b4f5f79](https://github.com/saltstack-formulas/mysql-formula/commit/b4f5f79781631d7d31061b880df3066ac5bc5860)) + ## [0.52.5](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.4...v0.52.5) (2019-12-10) diff --git a/FORMULA b/FORMULA index a57351d..0750f5a 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.5 +version: 0.52.6 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 0c30827..e593868 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 39 + - 46 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 38 @@ -232,6 +232,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@slawekp` - `@slawekp `_ - 1 + * - :raw-html-m2r:`@sticky-note` + - `@sticky-note `_ + - 1 * - :raw-html-m2r:`@tsia` - `@tsia `_ - 1 @@ -242,4 +245,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-12-10. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-04-17. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 07a0b1e..c27b1eb 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,23 @@ Changelog ========= +`0.52.6 `_ (2020-04-17) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **reload-modules:** do ``reload_modules`` on py module installation (\ `2b6e704 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile:** restrict ``train`` gem version until upstream fix [skip ci] (\ `04f75a7 `_\ ) +* **kitchen:** avoid using bootstrap for ``master`` instances [skip ci] (\ `ef7a2ce `_\ ) +* **travis:** use ``major.minor`` for ``semantic-release`` version [skip ci] (\ `b4f5f79 `_\ ) + `0.52.5 `_ (2019-12-10) ---------------------------------------------------------------------------------------------------------- From 2695bc6f355ef60fa93d1d078e41af95570ac160 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 18 Apr 2020 13:44:23 +0100 Subject: [PATCH 107/139] chore(rubocop): use org-wide standard settings for `Metrics/BlockLength` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/158 --- .rubocop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 96fd6e5..7fd75ac 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,5 +6,11 @@ Layout/LineLength: # Increase from default of `80` # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`) Max: 88 +Metrics/BlockLength: + ExcludedMethods: + - control + - describe + # Increase from default of `25` + Max: 30 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config` From 9e9fa3e3d15e25ad22f75eae61af4883c79b7c0f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 21 Apr 2020 22:08:19 +0100 Subject: [PATCH 108/139] ci(gemfile.lock): add to repo with updated `Gemfile` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/163 --- .gitignore | 1 - Gemfile | 4 - Gemfile.lock | 531 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 531 insertions(+), 5 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 9436b36..6995110 100644 --- a/.gitignore +++ b/.gitignore @@ -106,7 +106,6 @@ ENV/ # Bundler .bundle/ -Gemfile.lock # copied `.md` files used for conversion to `.rst` using `m2r` docs/*.md diff --git a/Gemfile b/Gemfile index 8da7a69..5a232b6 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,3 @@ source 'https://rubygems.org' gem 'kitchen-docker', '>= 2.9' gem 'kitchen-inspec', '>= 1.1' gem 'kitchen-salt', '>= 0.6.0' -# Latest versions of `train` cause failure when running `kitchen verify` -# Downgrading to `3.2.0` until this is fixed upstream -# https://github.com/inspec/train/pull/544#issuecomment-566055052 -gem 'train', '3.2.0' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..81169cb --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,531 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.4.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + aws-eventstream (1.1.0) + aws-partitions (1.299.0) + aws-sdk-apigateway (1.38.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigatewayv2 (1.19.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-athena (1.24.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-autoscaling (1.22.0) + aws-sdk-core (~> 3, >= 3.52.1) + aws-sigv4 (~> 1.1) + aws-sdk-budgets (1.28.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudformation (1.33.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudhsm (1.20.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudhsmv2 (1.21.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudtrail (1.21.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudwatch (1.36.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudwatchlogs (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-codecommit (1.31.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-codedeploy (1.28.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.29.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.43.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.94.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-costandusagereportservice (1.19.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-dynamodb (1.45.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.154.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecr (1.26.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecs (1.60.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-eks (1.35.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticache (1.31.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticbeanstalk (1.28.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticloadbalancing (1.20.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticloadbalancingv2 (1.41.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticsearchservice (1.32.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-firehose (1.25.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-iam (1.36.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-kafka (1.19.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.21.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-lambda (1.39.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-organizations (1.17.0) + aws-sdk-core (~> 3, >= 3.39.0) + aws-sigv4 (~> 1.0) + aws-sdk-rds (1.82.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-redshift (1.40.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53 (1.32.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53domains (1.19.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53resolver (1.12.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.62.0) + aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sdk-securityhub (1.23.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-ses (1.28.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-sms (1.18.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-sns (1.22.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.24.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-ssm (1.73.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.1.2) + aws-eventstream (~> 1.0, >= 1.0.2) + azure_graph_rbac (0.17.1) + ms_rest_azure (~> 0.11.0) + azure_mgmt_key_vault (0.17.5) + ms_rest_azure (~> 0.11.1) + azure_mgmt_resources (0.17.8) + ms_rest_azure (~> 0.11.1) + azure_mgmt_security (0.18.0) + ms_rest_azure (~> 0.11.1) + azure_mgmt_storage (0.20.0) + ms_rest_azure (~> 0.11.1) + bcrypt_pbkdf (1.0.1) + builder (3.2.4) + chef-config (15.9.17) + addressable + chef-utils (= 15.9.17) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-telemetry (1.0.3) + chef-config + concurrent-ruby (~> 1.0) + ffi-yajl (~> 2.2) + http (~> 2.2) + chef-utils (15.9.17) + coderay (1.1.2) + concurrent-ruby (1.1.6) + declarative (0.0.10) + declarative-option (0.1.0) + diff-lcs (1.3) + docker-api (1.34.2) + excon (>= 0.47.0) + multi_json + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + ecma-re-validator (0.2.1) + regexp_parser (~> 1.2) + ed25519 (1.2.4) + equatable (0.6.1) + erubi (1.9.0) + excon (0.73.0) + faraday (0.17.3) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) + ffi (1.12.2) + ffi-yajl (2.3.3) + libyajl2 (~> 1.2) + fuzzyurl (0.9.0) + google-api-client (0.34.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + googleauth (0.10.0) + faraday (~> 0.12) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.12) + gssapi (1.3.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hana (1.3.5) + hashie (3.6.0) + htmlentities (4.3.4) + http (2.2.2) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) + http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (1.0.3) + http_parser.rb (0.6.0) + httpclient (2.8.3) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + inifile (3.0.0) + inspec (4.18.104) + faraday_middleware (~> 0.12.2) + inspec-core (= 4.18.104) + train (~> 3.0) + train-aws (~> 0.1) + train-habitat (~> 0.1) + train-winrm (~> 0.2) + inspec-core (4.18.104) + addressable (~> 2.4) + chef-telemetry (~> 1.0) + faraday (>= 0.9.0) + hashie (~> 3.4) + htmlentities (~> 4.3) + json_schemer (~> 0.2.1) + license-acceptance (>= 0.2.13, < 2.0) + method_source (~> 0.8) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (~> 1.5) + pry (~> 0) + rspec (~> 3.9) + rspec-its (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) + semverse (~> 3.0) + sslshake (~> 1.2) + term-ansicolor (~> 1.7) + thor (>= 0.20, < 2.0) + tomlrb (~> 1.2) + train-core (~> 3.0) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + jmespath (1.4.0) + json (2.3.0) + json_schemer (0.2.11) + ecma-re-validator (~> 0.2) + hana (~> 1.3) + regexp_parser (~> 1.5) + uri_template (~> 0.7) + jwt (2.2.1) + kitchen-docker (2.10.0) + test-kitchen (>= 1.0.0) + kitchen-inspec (1.3.2) + hashie (~> 3.4) + inspec (>= 1.47, < 5.0) + test-kitchen (>= 1.6, < 3) + kitchen-salt (0.6.3) + hashie (>= 3.5) + test-kitchen (>= 1.4) + libyajl2 (1.2.0) + license-acceptance (1.0.19) + pastel (~> 0.7) + tomlrb (~> 1.2) + tty-box (~> 0.3) + tty-prompt (~> 0.18) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + memoist (0.16.2) + method_source (0.9.2) + mini_mime (1.0.2) + minitest (5.14.0) + mixlib-config (3.0.6) + tomlrb + mixlib-install (3.12.1) + mixlib-shellout + mixlib-versioning + thor + mixlib-log (3.0.8) + mixlib-shellout (3.0.9) + mixlib-versioning (1.2.12) + ms_rest (0.7.6) + concurrent-ruby (~> 1.0) + faraday (>= 0.9, < 2.0.0) + timeliness (~> 0.3.10) + ms_rest_azure (0.11.2) + concurrent-ruby (~> 1.0) + faraday (>= 0.9, < 2.0.0) + faraday-cookie_jar (~> 0.0.6) + ms_rest (~> 0.7.6) + unf_ext (= 0.0.7.2) + multi_json (1.14.1) + multipart-post (2.1.1) + necromancer (0.5.1) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) + nori (2.6.0) + os (1.1.0) + parallel (1.19.1) + parslet (1.8.2) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (4.0.4) + regexp_parser (1.7.0) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) + rubyntlm (0.6.2) + rubyzip (1.3.0) + semverse (3.0.0) + signet (0.14.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + sslshake (1.3.0) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + test-kitchen (2.4.0) + bcrypt_pbkdf (~> 1.0) + ed25519 (~> 1.2) + license-acceptance (~> 1.0, >= 1.0.11) + mixlib-install (~> 3.6) + mixlib-shellout (>= 1.2, < 4.0) + net-scp (>= 1.1, < 3.0) + net-ssh (>= 2.9, < 6.0) + net-ssh-gateway (>= 1.2, < 3.0) + thor (~> 0.19) + winrm (~> 2.0) + winrm-elevated (~> 1.0) + winrm-fs (~> 1.1) + thor (0.20.3) + thread_safe (0.3.6) + timeliness (0.3.10) + tins (1.24.1) + sync + tomlrb (1.3.0) + train (3.2.28) + activesupport (~> 5.2.3) + azure_graph_rbac (~> 0.16) + azure_mgmt_key_vault (~> 0.17) + azure_mgmt_resources (~> 0.15) + azure_mgmt_security (~> 0.18) + azure_mgmt_storage (~> 0.18) + docker-api (~> 1.26) + google-api-client (>= 0.23.9, < 0.35.0) + googleauth (>= 0.6.6, < 0.11.0) + inifile (~> 3.0) + train-core (= 3.2.28) + train-winrm (~> 0.2) + train-aws (0.1.15) + aws-sdk-apigateway (~> 1.0) + aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-athena (~> 1.0) + aws-sdk-autoscaling (~> 1.22.0) + aws-sdk-budgets (~> 1.0) + aws-sdk-cloudformation (~> 1.0) + aws-sdk-cloudhsm (~> 1.0) + aws-sdk-cloudhsmv2 (~> 1.0) + aws-sdk-cloudtrail (~> 1.8) + aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchlogs (~> 1.13) + aws-sdk-codecommit (~> 1.0) + aws-sdk-codedeploy (~> 1.0) + aws-sdk-codepipeline (~> 1.0) + aws-sdk-configservice (~> 1.21) + aws-sdk-core (~> 3.0) + aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-dynamodb (~> 1.31) + aws-sdk-ec2 (~> 1.70) + aws-sdk-ecr (~> 1.18) + aws-sdk-ecs (~> 1.30) + aws-sdk-eks (~> 1.9) + aws-sdk-elasticache (~> 1.0) + aws-sdk-elasticbeanstalk (~> 1.0) + aws-sdk-elasticloadbalancing (~> 1.8) + aws-sdk-elasticloadbalancingv2 (~> 1.0) + aws-sdk-elasticsearchservice (~> 1.0) + aws-sdk-firehose (~> 1.0) + aws-sdk-iam (~> 1.13) + aws-sdk-kafka (~> 1.0) + aws-sdk-kinesis (~> 1.0) + aws-sdk-kms (~> 1.13) + aws-sdk-lambda (~> 1.0) + aws-sdk-organizations (~> 1.17.0) + aws-sdk-rds (~> 1.43) + aws-sdk-redshift (~> 1.0) + aws-sdk-route53 (~> 1.0) + aws-sdk-route53domains (~> 1.0) + aws-sdk-route53resolver (~> 1.0) + aws-sdk-s3 (~> 1.30) + aws-sdk-securityhub (~> 1.0) + aws-sdk-ses (~> 1.0) + aws-sdk-sms (~> 1.0) + aws-sdk-sns (~> 1.9) + aws-sdk-sqs (~> 1.10) + aws-sdk-ssm (~> 1.0) + train-core (3.2.28) + addressable (~> 2.5) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 3.0) + net-ssh (>= 2.9, < 6.0) + train-habitat (0.2.13) + train-winrm (0.2.6) + winrm (~> 2.0) + winrm-fs (~> 1.0) + tty-box (0.5.0) + pastel (~> 0.7.2) + strings (~> 0.1.6) + tty-cursor (~> 0.7) + tty-color (0.5.1) + tty-cursor (0.7.1) + tty-prompt (0.21.0) + necromancer (~> 0.5.0) + pastel (~> 0.7.0) + tty-reader (~> 0.7.0) + tty-reader (0.7.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.7) + wisper (~> 2.0.0) + tty-screen (0.7.1) + tty-table (0.11.0) + equatable (~> 0.6) + necromancer (~> 0.5) + pastel (~> 0.7.2) + strings (~> 0.1.5) + tty-screen (~> 0.7) + tzinfo (1.2.7) + thread_safe (~> 0.1) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + unicode-display_width (1.7.0) + unicode_utils (1.4.0) + uri_template (0.7.0) + winrm (2.3.4) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.1) + winrm-elevated (1.2.1) + erubi (~> 1.8) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.3.3) + erubi (~> 1.8) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 2.0) + wisper (2.0.1) + +PLATFORMS + ruby + +DEPENDENCIES + kitchen-docker (>= 2.9) + kitchen-inspec (>= 1.1) + kitchen-salt (>= 0.6.0) + +BUNDLED WITH + 2.1.2 From c1dddc3a8d561847094bbe23fe2c764c8fdf79de Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 2 May 2020 04:28:29 +0100 Subject: [PATCH 109/139] ci(kitchen+travis): remove `master-py2-arch-base-latest` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/167 --- .travis.yml | 1 - kitchen.yml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a24b4f4..cb096f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,6 @@ jobs: # - env: INSTANCE=default-fedora-31-master-py3 # - env: INSTANCE=default-opensuse-leap-151-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 - # - env: INSTANCE=default-arch-base-latest-master-py2 # - env: INSTANCE=default-debian-10-2019-2-py3 - env: INSTANCE=default-debian-9-2019-2-py3 - env: INSTANCE=default-ubuntu-1804-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index 9f715af..0c0158e 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -35,10 +35,6 @@ platforms: - name: amazonlinux-2-master-py3 driver: image: netmanagers/salt-master-py3:amazonlinux-2 - - name: arch-base-latest-master-py2 - driver: - image: netmanagers/salt-master-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd ## SALT `2019.2` - name: debian-10-2019-2-py3 From b4c65702b91e8813741bf72008e41d1d8dfc735d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 4 May 2020 09:29:57 +0100 Subject: [PATCH 110/139] ci(workflows/commitlint): add to repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/172 --- .github/workflows/commitlint.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/commitlint.yml diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml new file mode 100644 index 0000000..42a5375 --- /dev/null +++ b/.github/workflows/commitlint.yml @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +name: Commitlint +'on': [pull_request] + +jobs: + lint: + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: wagoid/commitlint-github-action@v1 From 362b85ea381b6da6ff5ff81b7413cfec13790626 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 4 May 2020 22:44:24 +0100 Subject: [PATCH 111/139] chore(codeowners): add to repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/173 --- CODEOWNERS | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..e263b75 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,39 @@ +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners + +# SECTION: Owner(s) for everything in the repo, unless a later match takes precedence +# ************************************************************************** +# *** NO GLOBAL OWNER(S) SPECIFIED *** +# *** Ideally this will be defined for a healthy, well-maintained repo *** +# ************************************************************************** +# FILE PATTERN OWNER(S) +* @NONE + +# SECTION: Owner(s) for specific directories +# FILE PATTERN OWNER(S) + +# SECTION: Owner(s) for files/directories related to `semantic-release` +# FILE PATTERN OWNER(S) +/.github/workflows/ @saltstack-formulas/ssf +/bin/kitchen @saltstack-formulas/ssf +/docs/TOFS_pattern.rst @saltstack-formulas/ssf +/mysql/libsaltcli.jinja @saltstack-formulas/ssf +/mysql/libtofs.jinja @saltstack-formulas/ssf +/test/integration/**/inspec.yml @saltstack-formulas/ssf +/test/integration/**/README.md @saltstack-formulas/ssf +/.gitignore @saltstack-formulas/ssf +/.cirrus.yml @saltstack-formulas/ssf +/.rubocop.yml @saltstack-formulas/ssf +/.salt-lint @saltstack-formulas/ssf +/.travis.yml @saltstack-formulas/ssf +/.yamllint @saltstack-formulas/ssf +/commitlint.config.js @saltstack-formulas/ssf +/CODEOWNERS @saltstack-formulas/ssf +/Gemfile @saltstack-formulas/ssf +/Gemfile.lock @saltstack-formulas/ssf +/kitchen.yml @saltstack-formulas/ssf +/pre-commit_semantic-release.sh @saltstack-formulas/ssf +/release-rules.js @saltstack-formulas/ssf +/release.config.js @saltstack-formulas/ssf + +# SECTION: Owner(s) for specific files +# FILE PATTERN OWNER(S) From 52384ffab2e00ee0c50f84fde110fa2344ac4e0b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 4 May 2020 23:16:07 +0100 Subject: [PATCH 112/139] chore(codeowners): update `semantic-release` related files [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/174 --- CODEOWNERS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index e263b75..256a898 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -15,6 +15,8 @@ # FILE PATTERN OWNER(S) /.github/workflows/ @saltstack-formulas/ssf /bin/kitchen @saltstack-formulas/ssf +/docs/AUTHORS.rst @saltstack-formulas/ssf +/docs/CHANGELOG.rst @saltstack-formulas/ssf /docs/TOFS_pattern.rst @saltstack-formulas/ssf /mysql/libsaltcli.jinja @saltstack-formulas/ssf /mysql/libtofs.jinja @saltstack-formulas/ssf @@ -26,8 +28,11 @@ /.salt-lint @saltstack-formulas/ssf /.travis.yml @saltstack-formulas/ssf /.yamllint @saltstack-formulas/ssf -/commitlint.config.js @saltstack-formulas/ssf +/AUTHORS.md @saltstack-formulas/ssf +/CHANGELOG.md @saltstack-formulas/ssf /CODEOWNERS @saltstack-formulas/ssf +/commitlint.config.js @saltstack-formulas/ssf +/FORMULA @saltstack-formulas/ssf /Gemfile @saltstack-formulas/ssf /Gemfile.lock @saltstack-formulas/ssf /kitchen.yml @saltstack-formulas/ssf From 8ee79a7bb03488e4c3632a1dcfe143696a11aad5 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Mon, 18 May 2020 15:14:55 +0200 Subject: [PATCH 113/139] fix(osfamilymap.yaml): update SUSE defaults * there is no python2 in last stable releases and socket was moved as well --- mysql/osfamilymap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index 7730afb..d582dcc 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -55,13 +55,13 @@ RedHat: Suse: serverpkg: mariadb clientpkg: mariadb-client - pythonpkg: python2-pymysql + pythonpkg: python3-PyMySQL config: file: /etc/my.cnf sections: client: - socket: /var/run/mysql/mysql.sock + socket: /run/mysql/mysql.sock mysqld: # Empty values below to be resolved, disabling the rule in the meantime # yamllint disable rule:empty-values From 8ffa1d701693ebf40309c547ad7b8441dda16007 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 19 May 2020 14:03:46 +0000 Subject: [PATCH 114/139] chore(release): 0.52.7 [skip ci] ## [0.52.7](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.6...v0.52.7) (2020-05-19) ### Bug Fixes * **osfamilymap.yaml:** update SUSE defaults ([8ee79a7](https://github.com/saltstack-formulas/mysql-formula/commit/8ee79a7bb03488e4c3632a1dcfe143696a11aad5)) ### Continuous Integration * **gemfile.lock:** add to repo with updated `Gemfile` [skip ci] ([9e9fa3e](https://github.com/saltstack-formulas/mysql-formula/commit/9e9fa3e3d15e25ad22f75eae61af4883c79b7c0f)) * **kitchen+travis:** remove `master-py2-arch-base-latest` [skip ci] ([c1dddc3](https://github.com/saltstack-formulas/mysql-formula/commit/c1dddc3a8d561847094bbe23fe2c764c8fdf79de)) * **workflows/commitlint:** add to repo [skip ci] ([b4c6570](https://github.com/saltstack-formulas/mysql-formula/commit/b4c65702b91e8813741bf72008e41d1d8dfc735d)) --- AUTHORS.md | 7 +++---- CHANGELOG.md | 14 ++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 13 +++++-------- docs/CHANGELOG.rst | 17 +++++++++++++++++ 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index cc3250c..64ba71f 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|46 +@myii|[@myii](https://github.com/myii)|53 @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @@ -41,6 +41,7 @@ Avatar|Contributor|Contributions @tomasfejfar|[@tomasfejfar](https://github.com/tomasfejfar)|2 @vschum|[@vschum](https://github.com/vschum)|2 @madflojo|[@madflojo](https://github.com/madflojo)|2 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @UtahDave|[@UtahDave](https://github.com/UtahDave)|2 @daks|[@daks](https://github.com/daks)|2 @nesteves|[@nesteves](https://github.com/nesteves)|2 @@ -70,17 +71,15 @@ Avatar|Contributor|Contributions @S-Wilhelm|[@S-Wilhelm](https://github.com/S-Wilhelm)|1 @Cottser|[@Cottser](https://github.com/Cottser)|1 @soniah|[@soniah](https://github.com/soniah)|1 -@tapetersen|[@tapetersen](https://github.com/tapetersen)|1 @tony|[@tony](https://github.com/tony)|1 @wido|[@wido](https://github.com/wido)|1 @abednarik|[@abednarik](https://github.com/abednarik)|1 @jam13|[@jam13](https://github.com/jam13)|1 @getSurreal|[@getSurreal](https://github.com/getSurreal)|1 @slawekp|[@slawekp](https://github.com/slawekp)|1 -@sticky-note|[@sticky-note](https://github.com/sticky-note)|1 @tsia|[@tsia](https://github.com/tsia)|1 @zhujinhe|[@zhujinhe](https://github.com/zhujinhe)|1 --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-04-17. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-05-19. diff --git a/CHANGELOG.md b/CHANGELOG.md index a34b9dd..95f7bb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.52.7](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.6...v0.52.7) (2020-05-19) + + +### Bug Fixes + +* **osfamilymap.yaml:** update SUSE defaults ([8ee79a7](https://github.com/saltstack-formulas/mysql-formula/commit/8ee79a7bb03488e4c3632a1dcfe143696a11aad5)) + + +### Continuous Integration + +* **gemfile.lock:** add to repo with updated `Gemfile` [skip ci] ([9e9fa3e](https://github.com/saltstack-formulas/mysql-formula/commit/9e9fa3e3d15e25ad22f75eae61af4883c79b7c0f)) +* **kitchen+travis:** remove `master-py2-arch-base-latest` [skip ci] ([c1dddc3](https://github.com/saltstack-formulas/mysql-formula/commit/c1dddc3a8d561847094bbe23fe2c764c8fdf79de)) +* **workflows/commitlint:** add to repo [skip ci] ([b4c6570](https://github.com/saltstack-formulas/mysql-formula/commit/b4c65702b91e8813741bf72008e41d1d8dfc735d)) + ## [0.52.6](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.5...v0.52.6) (2020-04-17) diff --git a/FORMULA b/FORMULA index 0750f5a..bf6260a 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.6 +version: 0.52.7 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index e593868..f8eb365 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 46 + - 53 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 38 @@ -124,6 +124,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@madflojo` - `@madflojo `_ - 2 + * - :raw-html-m2r:`@sticky-note` + - `@sticky-note `_ + - 2 * - :raw-html-m2r:`@UtahDave` - `@UtahDave `_ - 2 @@ -211,9 +214,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@soniah` - `@soniah `_ - 1 - * - :raw-html-m2r:`@tapetersen` - - `@tapetersen `_ - - 1 * - :raw-html-m2r:`@tony` - `@tony `_ - 1 @@ -232,9 +232,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@slawekp` - `@slawekp `_ - 1 - * - :raw-html-m2r:`@sticky-note` - - `@sticky-note `_ - - 1 * - :raw-html-m2r:`@tsia` - `@tsia `_ - 1 @@ -245,4 +242,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-04-17. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-05-19. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index c27b1eb..a012099 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,23 @@ Changelog ========= +`0.52.7 `_ (2020-05-19) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **osfamilymap.yaml:** update SUSE defaults (\ `8ee79a7 `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **gemfile.lock:** add to repo with updated ``Gemfile`` [skip ci] (\ `9e9fa3e `_\ ) +* **kitchen+travis:** remove ``master-py2-arch-base-latest`` [skip ci] (\ `c1dddc3 `_\ ) +* **workflows/commitlint:** add to repo [skip ci] (\ `b4c6570 `_\ ) + `0.52.6 `_ (2020-04-17) ---------------------------------------------------------------------------------------------------------- From 8adfc4bb4fbb49548cf46d277a0403b89c180b1a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 21 May 2020 20:08:23 +0100 Subject: [PATCH 115/139] ci(travis): add notifications => zulip [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/191 --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index cb096f5..1239804 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,3 +113,15 @@ jobs: edge: true # Run `semantic-release` script: 'npx semantic-release@15.14' + +# Notification options: `always`, `never` or `change` +notifications: + webhooks: + if: 'repo = saltstack-formulas/mysql-formula' + urls: + - https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Fmysql-formula&ignore_pull_requests=true + on_success: always # default: always + on_failure: always # default: always + on_start: always # default: never + on_cancel: always # default: always + on_error: always # default: always From e1bd2795d2547ee1ecf6df74a9b9b000520d7dd8 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 28 May 2020 00:20:05 +0100 Subject: [PATCH 116/139] chore(gemfile.lock): update to latest gem versions [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/202 --- Gemfile.lock | 171 +++++++++++++++++++++++++++------------------------ 1 file changed, 90 insertions(+), 81 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 81169cb..452d60e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.2) + activesupport (5.2.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -9,149 +9,152 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.299.0) - aws-sdk-apigateway (1.38.0) + aws-partitions (1.322.0) + aws-sdk-apigateway (1.40.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.19.0) + aws-sdk-apigatewayv2 (1.20.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.24.0) + aws-sdk-athena (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.28.0) + aws-sdk-budgets (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.33.0) + aws-sdk-cloudformation (1.35.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.20.0) + aws-sdk-cloudhsm (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.21.0) + aws-sdk-cloudhsmv2 (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.21.0) + aws-sdk-cloudtrail (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.36.0) + aws-sdk-cloudwatch (1.37.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.29.0) + aws-sdk-cloudwatchlogs (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.31.0) + aws-sdk-codecommit (1.32.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.28.0) + aws-sdk-codedeploy (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.29.0) + aws-sdk-codepipeline (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.43.0) + aws-sdk-configservice (1.44.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.94.0) + aws-sdk-core (3.96.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.19.0) + aws-sdk-costandusagereportservice (1.20.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.45.0) + aws-sdk-dynamodb (1.47.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.154.0) + aws-sdk-ec2 (1.163.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.26.0) + aws-sdk-ecr (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.60.0) + aws-sdk-ecs (1.62.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.35.0) + aws-sdk-efs (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.31.0) + aws-sdk-eks (1.36.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.28.0) + aws-sdk-elasticache (1.34.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.20.0) + aws-sdk-elasticbeanstalk (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.41.0) + aws-sdk-elasticloadbalancing (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.32.0) + aws-sdk-elasticloadbalancingv2 (1.43.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.25.0) + aws-sdk-elasticsearchservice (1.34.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.36.0) + aws-sdk-firehose (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.19.0) + aws-sdk-iam (1.37.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.21.0) + aws-sdk-kafka (1.20.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.30.0) + aws-sdk-kinesis (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.39.0) + aws-sdk-kms (1.31.0) + aws-sdk-core (~> 3, >= 3.71.0) + aws-sigv4 (~> 1.1) + aws-sdk-lambda (1.41.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.82.0) + aws-sdk-rds (1.84.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.40.0) + aws-sdk-redshift (1.42.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.32.0) + aws-sdk-route53 (1.34.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.19.0) + aws-sdk-route53domains (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.12.0) + aws-sdk-route53resolver (1.13.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.62.0) - aws-sdk-core (~> 3, >= 3.83.0) + aws-sdk-s3 (1.66.0) + aws-sdk-core (~> 3, >= 3.96.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.23.0) + aws-sdk-securityhub (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.28.0) + aws-sdk-ses (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.18.0) + aws-sdk-sms (1.19.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.22.0) + aws-sdk-sns (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.24.0) + aws-sdk-sqs (1.25.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.73.0) + aws-sdk-ssm (1.78.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.2) + aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) azure_graph_rbac (0.17.1) ms_rest_azure (~> 0.11.0) @@ -161,23 +164,23 @@ GEM ms_rest_azure (~> 0.11.1) azure_mgmt_security (0.18.0) ms_rest_azure (~> 0.11.1) - azure_mgmt_storage (0.20.0) + azure_mgmt_storage (0.21.0) ms_rest_azure (~> 0.11.1) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (15.9.17) + chef-config (16.1.16) addressable - chef-utils (= 15.9.17) + chef-utils (= 16.1.16) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.3) + chef-telemetry (1.0.5) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - http (~> 2.2) - chef-utils (15.9.17) + http (~> 4) + chef-utils (16.1.16) coderay (1.1.2) concurrent-ruby (1.1.6) declarative (0.0.10) @@ -202,6 +205,9 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) ffi (1.12.2) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake ffi-yajl (2.3.3) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -224,30 +230,31 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hana (1.3.5) + hana (1.3.6) hashie (3.6.0) htmlentities (4.3.4) - http (2.2.2) + http (4.4.1) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 1.0.1) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) - http_parser.rb (0.6.0) + http-form_data (2.3.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) httpclient (2.8.3) i18n (1.8.2) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.18.104) + inspec (4.18.114) faraday_middleware (~> 0.12.2) - inspec-core (= 4.18.104) + inspec-core (= 4.18.114) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.18.104) + inspec-core (4.18.114) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -255,12 +262,12 @@ GEM htmlentities (~> 4.3) json_schemer (~> 0.2.1) license-acceptance (>= 0.2.13, < 2.0) - method_source (~> 0.8) + method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) parallel (~> 1.9) parslet (~> 1.5) - pry (~> 0) + pry (~> 0.13) rspec (~> 3.9) rspec-its (~> 1.2) rubyzip (~> 1.2, >= 1.2.2) @@ -300,9 +307,9 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.10) memoist (0.16.2) - method_source (0.9.2) + method_source (1.0.0) mini_mime (1.0.2) - minitest (5.14.0) + minitest (5.14.1) mixlib-config (3.0.6) tomlrb mixlib-install (3.12.1) @@ -334,13 +341,14 @@ GEM os (1.1.0) parallel (1.19.1) parslet (1.8.2) - pastel (0.7.3) + pastel (0.7.4) equatable (~> 0.6) tty-color (~> 0.5) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (4.0.4) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (4.0.5) + rake (13.0.1) regexp_parser (1.7.0) representable (3.0.4) declarative (< 0.1.0) @@ -351,9 +359,9 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-its (1.3.0) @@ -362,7 +370,7 @@ GEM rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubyntlm (0.6.2) rubyzip (1.3.0) semverse (3.0.0) @@ -380,14 +388,14 @@ GEM sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - test-kitchen (2.4.0) + test-kitchen (2.5.1) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) license-acceptance (~> 1.0, >= 1.0.11) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 4.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 6.0) + net-scp (>= 1.1, < 4.0) + net-ssh (>= 2.9, < 7.0) net-ssh-gateway (>= 1.2, < 3.0) thor (~> 0.19) winrm (~> 2.0) @@ -396,7 +404,7 @@ GEM thor (0.20.3) thread_safe (0.3.6) timeliness (0.3.10) - tins (1.24.1) + tins (1.25.0) sync tomlrb (1.3.0) train (3.2.28) @@ -412,7 +420,7 @@ GEM inifile (~> 3.0) train-core (= 3.2.28) train-winrm (~> 0.2) - train-aws (0.1.15) + train-aws (0.1.16) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-athena (~> 1.0) @@ -434,6 +442,7 @@ GEM aws-sdk-ec2 (~> 1.70) aws-sdk-ecr (~> 1.18) aws-sdk-ecs (~> 1.30) + aws-sdk-efs (~> 1.0) aws-sdk-eks (~> 1.9) aws-sdk-elasticache (~> 1.0) aws-sdk-elasticbeanstalk (~> 1.0) From 0d77164f394909ec371f39cb41a4920c82e75052 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 28 May 2020 00:00:59 +0100 Subject: [PATCH 117/139] feat(focal): add settings for `ubuntu-20.04` --- mysql/osfingermap.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mysql/osfingermap.yaml b/mysql/osfingermap.yaml index 7797a8b..9d98126 100644 --- a/mysql/osfingermap.yaml +++ b/mysql/osfingermap.yaml @@ -21,6 +21,15 @@ Debian-9: !includedir /etc/mysql/conf.d/ # !includedir /etc/mysql/mariadb.conf.d/ # Ubuntu +Ubuntu-20.04: + serverpkg: mariadb-server + service: mariadb + clientpkg: mariadb-client + devpkg: libmariadbclient-dev + config: + append: | + !includedir /etc/mysql/conf.d/ + # !includedir /etc/mysql/mariadb.conf.d/ Ubuntu-18.04: serverpkg: mariadb-server # service: mariadb From 7ea518a3919f1a59bc6ae821bc0df7577629059a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 1 Jun 2020 02:51:20 +0100 Subject: [PATCH 118/139] ci(kitchen+travis): use latest pre-salted images * Automated using https://github.com/myii/ssf-formula/pull/209 --- .travis.yml | 42 ++++++++-------- kitchen.yml | 137 +++++++++++++++++++++++++--------------------------- 2 files changed, 89 insertions(+), 90 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1239804..3f848e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,34 +59,36 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - env: INSTANCE=default-debian-10-master-py3 - - env: INSTANCE=default-ubuntu-1804-master-py3 + - env: INSTANCE=default-ubuntu-2004-master-py3 + # - env: INSTANCE=default-ubuntu-1804-master-py3 # - env: INSTANCE=default-centos-8-master-py3 + # - env: INSTANCE=default-fedora-32-master-py3 # - env: INSTANCE=default-fedora-31-master-py3 - # - env: INSTANCE=default-opensuse-leap-151-master-py3 + # - env: INSTANCE=default-opensuse-leap-152-master-py3 # - env: INSTANCE=default-amazonlinux-2-master-py3 + # - env: INSTANCE=default-debian-10-3000-3-py3 + - env: INSTANCE=default-debian-9-3000-3-py3 + - env: INSTANCE=default-ubuntu-1804-3000-3-py3 + # - env: INSTANCE=default-centos-8-3000-3-py3 + # - env: INSTANCE=default-centos-7-3000-3-py3 + # - env: INSTANCE=default-fedora-31-3000-3-py3 + # - env: INSTANCE=default-opensuse-leap-152-3000-3-py3 + # - env: INSTANCE=default-amazonlinux-2-3000-3-py3 + # - env: INSTANCE=default-ubuntu-1804-3000-3-py2 + # - env: INSTANCE=default-ubuntu-1604-3000-3-py2 + # - env: INSTANCE=default-arch-base-latest-3000-3-py2 # - env: INSTANCE=default-debian-10-2019-2-py3 - - env: INSTANCE=default-debian-9-2019-2-py3 - - env: INSTANCE=default-ubuntu-1804-2019-2-py3 + # - env: INSTANCE=default-debian-9-2019-2-py3 + # - env: INSTANCE=default-ubuntu-1804-2019-2-py3 + - env: INSTANCE=default-ubuntu-1604-2019-2-py3 # - env: INSTANCE=default-centos-8-2019-2-py3 + # - env: INSTANCE=default-centos-7-2019-2-py3 # - env: INSTANCE=default-fedora-31-2019-2-py3 - # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 - # - env: INSTANCE=default-centos-7-2019-2-py2 + # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3 # - env: INSTANCE=default-amazonlinux-2-2019-2-py3 + # - env: INSTANCE=default-centos-6-2019-2-py2 + # - env: INSTANCE=default-amazonlinux-1-2019-2-py2 # - env: INSTANCE=default-arch-base-latest-2019-2-py2 - # - env: INSTANCE=default-fedora-30-2018-3-py3 - - env: INSTANCE=default-debian-9-2018-3-py2 - # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 - # - env: INSTANCE=default-centos-7-2018-3-py2 - # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 - # - env: INSTANCE=default-amazonlinux-1-2018-3-py2 - # - env: INSTANCE=default-arch-base-latest-2018-3-py2 - - env: INSTANCE=default-debian-8-2017-7-py2 - # - env: INSTANCE=default-ubuntu-1604-2017-7-py2 - # - env: INSTANCE=default-centos-6-2017-7-py2 - # - env: INSTANCE=default-fedora-30-2017-7-py2 - # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2 - # - env: INSTANCE=default-amazonlinux-1-2017-7-py2 - # - env: INSTANCE=default-arch-base-latest-2017-7-py2 ## Define the release stage that runs `semantic-release` - stage: 'release' diff --git a/kitchen.yml b/kitchen.yml index 0c0158e..3d683d8 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,20 +15,26 @@ platforms: - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 + - name: ubuntu-2004-master-py3 + driver: + image: netmanagers/salt-master-py3:ubuntu-20.04 - name: ubuntu-1804-master-py3 driver: image: netmanagers/salt-master-py3:ubuntu-18.04 - name: centos-8-master-py3 driver: image: netmanagers/salt-master-py3:centos-8 + - name: fedora-32-master-py3 + driver: + image: netmanagers/salt-master-py3:fedora-32 - name: fedora-31-master-py3 driver: image: netmanagers/salt-master-py3:fedora-31 - - name: opensuse-leap-151-master-py3 + - name: opensuse-leap-152-master-py3 driver: - image: netmanagers/salt-master-py3:opensuse-leap-15.1 + image: netmanagers/salt-master-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -36,6 +42,47 @@ platforms: driver: image: netmanagers/salt-master-py3:amazonlinux-2 + ## SALT `3000.3` + - name: debian-10-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:debian-10 + - name: debian-9-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:debian-9 + - name: ubuntu-1804-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:ubuntu-18.04 + - name: centos-8-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:centos-8 + - name: centos-7-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:centos-7 + - name: fedora-31-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:fedora-31 + - name: opensuse-leap-152-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2 + run_command: /usr/lib/systemd/systemd + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: + # => SCP did not finish successfully (255): (Net::SCP::Error) + transport: + max_ssh_sessions: 1 + - name: amazonlinux-2-3000-3-py3 + driver: + image: netmanagers/salt-3000.3-py3:amazonlinux-2 + - name: ubuntu-1804-3000-3-py2 + driver: + image: netmanagers/salt-3000.3-py2:ubuntu-18.04 + - name: ubuntu-1604-3000-3-py2 + driver: + image: netmanagers/salt-3000.3-py2:ubuntu-16.04 + - name: arch-base-latest-3000-3-py2 + driver: + image: netmanagers/salt-3000.3-py2:arch-base-latest + run_command: /usr/lib/systemd/systemd + ## SALT `2019.2` - name: debian-10-2019-2-py3 driver: @@ -46,92 +93,42 @@ platforms: - name: ubuntu-1804-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:ubuntu-18.04 + - name: ubuntu-1604-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:ubuntu-16.04 - name: centos-8-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:centos-8 + - name: centos-7-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:centos-7 - name: fedora-31-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:fedora-31 - - name: opensuse-leap-151-2019-2-py3 + - name: opensuse-leap-152-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 + image: netmanagers/salt-2019.2-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: centos-7-2019-2-py2 - driver: - image: netmanagers/salt-2019.2-py2:centos-7 - name: amazonlinux-2-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:amazonlinux-2 + - name: centos-6-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:centos-6 + run_command: /sbin/init + - name: amazonlinux-1-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:amazonlinux-1 + run_command: /sbin/init - name: arch-base-latest-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:arch-base-latest run_command: /usr/lib/systemd/systemd - ## SALT `2018.3` - - name: fedora-30-2018-3-py3 - driver: - image: netmanagers/salt-2018.3-py3:fedora-30 - - name: debian-9-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:debian-9 - - name: ubuntu-1604-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:ubuntu-16.04 - - name: centos-7-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:centos-7 - - name: opensuse-leap-151-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1 - run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: amazonlinux-1-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:amazonlinux-1 - run_command: /sbin/init - - name: arch-base-latest-2018-3-py2 - driver: - image: netmanagers/salt-2018.3-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd - - ## SALT `2017.7` - - name: debian-8-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:debian-8 - - name: ubuntu-1604-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:ubuntu-16.04 - - name: centos-6-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:centos-6 - run_command: /sbin/init - - name: fedora-30-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:fedora-30 - - name: opensuse-leap-151-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1 - run_command: /usr/lib/systemd/systemd - # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: - # => SCP did not finish successfully (255): (Net::SCP::Error) - transport: - max_ssh_sessions: 1 - - name: amazonlinux-1-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:amazonlinux-1 - run_command: /sbin/init - - name: arch-base-latest-2017-7-py2 - driver: - image: netmanagers/salt-2017.7-py2:arch-base-latest - run_command: /usr/lib/systemd/systemd - provisioner: name: salt_solo log_level: debug From b1233b60c3bc81dbaf078cbf9bb86e6ebbd0676b Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 1 Jun 2020 02:14:21 +0000 Subject: [PATCH 119/139] chore(release): 0.53.0 [skip ci] # [0.53.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.7...v0.53.0) (2020-06-01) ### Continuous Integration * **kitchen+travis:** use latest pre-salted images ([7ea518a](https://github.com/saltstack-formulas/mysql-formula/commit/7ea518a3919f1a59bc6ae821bc0df7577629059a)) * **travis:** add notifications => zulip [skip ci] ([8adfc4b](https://github.com/saltstack-formulas/mysql-formula/commit/8adfc4bb4fbb49548cf46d277a0403b89c180b1a)) ### Features * **focal:** add settings for `ubuntu-20.04` ([0d77164](https://github.com/saltstack-formulas/mysql-formula/commit/0d77164f394909ec371f39cb41a4920c82e75052)) --- AUTHORS.md | 5 +++-- CHANGELOG.md | 13 +++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 7 +++++-- docs/CHANGELOG.rst | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 64ba71f..e7b99b5 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|53 +@myii|[@myii](https://github.com/myii)|59 @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @@ -66,6 +66,7 @@ Avatar|Contributor|Contributions @thejcannon|[@thejcannon](https://github.com/thejcannon)|1 @TaiSHiNet|[@TaiSHiNet](https://github.com/TaiSHiNet)|1 @mkotsbak|[@mkotsbak](https://github.com/mkotsbak)|1 +@miska|[@miska](https://github.com/miska)|1 @natehouk|[@natehouk](https://github.com/natehouk)|1 @phil-lavin|[@phil-lavin](https://github.com/phil-lavin)|1 @S-Wilhelm|[@S-Wilhelm](https://github.com/S-Wilhelm)|1 @@ -82,4 +83,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-05-19. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-06-01. diff --git a/CHANGELOG.md b/CHANGELOG.md index 95f7bb5..d90419d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +# [0.53.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.7...v0.53.0) (2020-06-01) + + +### Continuous Integration + +* **kitchen+travis:** use latest pre-salted images ([7ea518a](https://github.com/saltstack-formulas/mysql-formula/commit/7ea518a3919f1a59bc6ae821bc0df7577629059a)) +* **travis:** add notifications => zulip [skip ci] ([8adfc4b](https://github.com/saltstack-formulas/mysql-formula/commit/8adfc4bb4fbb49548cf46d277a0403b89c180b1a)) + + +### Features + +* **focal:** add settings for `ubuntu-20.04` ([0d77164](https://github.com/saltstack-formulas/mysql-formula/commit/0d77164f394909ec371f39cb41a4920c82e75052)) + ## [0.52.7](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.6...v0.52.7) (2020-05-19) diff --git a/FORMULA b/FORMULA index bf6260a..e2062e9 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.52.7 +version: 0.53.0 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index f8eb365..4190074 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 53 + - 59 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 38 @@ -199,6 +199,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@mkotsbak` - `@mkotsbak `_ - 1 + * - :raw-html-m2r:`@miska` + - `@miska `_ + - 1 * - :raw-html-m2r:`@natehouk` - `@natehouk `_ - 1 @@ -242,4 +245,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-05-19. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-06-01. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index a012099..2fa9eb3 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`0.53.0 `_ (2020-06-01) +---------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen+travis:** use latest pre-salted images (\ `7ea518a `_\ ) +* **travis:** add notifications => zulip [skip ci] (\ `8adfc4b `_\ ) + +Features +^^^^^^^^ + + +* **focal:** add settings for ``ubuntu-20.04`` (\ `0d77164 `_\ ) + `0.52.7 `_ (2020-05-19) ---------------------------------------------------------------------------------------------------------- From c0d8e0c8e76510d9261cf3c39882bf895d715a1a Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 5 Jun 2020 22:17:00 +0100 Subject: [PATCH 120/139] chore(gemfile.lock): update to latest gem versions [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/221 --- Gemfile.lock | 165 ++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 89 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 452d60e..47fd965 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,163 +9,163 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.322.0) - aws-sdk-apigateway (1.40.0) + aws-partitions (1.326.0) + aws-sdk-apigateway (1.42.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.20.0) + aws-sdk-apigatewayv2 (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.25.0) + aws-sdk-athena (1.27.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.29.0) + aws-sdk-budgets (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.35.0) + aws-sdk-cloudformation (1.36.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.21.0) + aws-sdk-cloudhsm (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.22.0) + aws-sdk-cloudhsmv2 (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.22.0) + aws-sdk-cloudtrail (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.37.0) + aws-sdk-cloudwatch (1.38.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.30.0) + aws-sdk-cloudwatchlogs (1.31.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.32.0) + aws-sdk-codecommit (1.33.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.30.0) + aws-sdk-codedeploy (1.31.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.30.0) + aws-sdk-codepipeline (1.31.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.44.0) + aws-sdk-configservice (1.45.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.96.1) + aws-sdk-core (3.98.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.20.0) + aws-sdk-costandusagereportservice (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.47.0) + aws-sdk-dynamodb (1.48.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.163.0) + aws-sdk-ec2 (1.165.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.29.0) + aws-sdk-ecr (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.62.0) + aws-sdk-ecs (1.63.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.28.0) + aws-sdk-efs (1.29.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.36.0) + aws-sdk-eks (1.37.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.34.0) + aws-sdk-elasticache (1.36.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.29.0) + aws-sdk-elasticbeanstalk (1.31.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.21.0) + aws-sdk-elasticloadbalancing (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.43.0) + aws-sdk-elasticloadbalancingv2 (1.44.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.34.0) + aws-sdk-elasticsearchservice (1.36.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.27.0) + aws-sdk-firehose (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.37.0) + aws-sdk-iam (1.39.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.20.0) + aws-sdk-kafka (1.21.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.22.0) + aws-sdk-kinesis (1.23.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.31.0) + aws-sdk-kms (1.33.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.41.0) + aws-sdk-lambda (1.42.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.84.0) + aws-sdk-rds (1.85.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.42.0) + aws-sdk-redshift (1.43.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.34.0) + aws-sdk-route53 (1.35.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.21.0) + aws-sdk-route53domains (1.22.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.13.0) + aws-sdk-route53resolver (1.14.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.66.0) + aws-sdk-s3 (1.67.1) aws-sdk-core (~> 3, >= 3.96.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.25.0) + aws-sdk-securityhub (1.26.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.29.0) + aws-sdk-ses (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.19.0) + aws-sdk-sms (1.20.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.23.0) + aws-sdk-sns (1.24.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.25.0) + aws-sdk-sqs (1.26.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.78.0) + aws-sdk-ssm (1.80.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.3) + aws-sigv4 (1.1.4) aws-eventstream (~> 1.0, >= 1.0.2) - azure_graph_rbac (0.17.1) - ms_rest_azure (~> 0.11.0) - azure_mgmt_key_vault (0.17.5) - ms_rest_azure (~> 0.11.1) - azure_mgmt_resources (0.17.8) - ms_rest_azure (~> 0.11.1) - azure_mgmt_security (0.18.0) - ms_rest_azure (~> 0.11.1) - azure_mgmt_storage (0.21.0) - ms_rest_azure (~> 0.11.1) + azure_graph_rbac (0.17.2) + ms_rest_azure (~> 0.12.0) + azure_mgmt_key_vault (0.17.6) + ms_rest_azure (~> 0.12.0) + azure_mgmt_resources (0.17.9) + ms_rest_azure (~> 0.12.0) + azure_mgmt_security (0.18.1) + ms_rest_azure (~> 0.12.0) + azure_mgmt_storage (0.21.1) + ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) chef-config (16.1.16) @@ -175,13 +175,12 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.5) + chef-telemetry (1.0.8) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - http (~> 4) chef-utils (16.1.16) - coderay (1.1.2) + coderay (1.1.3) concurrent-ruby (1.1.6) declarative (0.0.10) declarative-option (0.1.0) @@ -205,9 +204,6 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) ffi (1.12.2) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake ffi-yajl (2.3.3) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -233,28 +229,20 @@ GEM hana (1.3.6) hashie (3.6.0) htmlentities (4.3.4) - http (4.4.1) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 2.2) - http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.3.0) - http-parser (1.2.1) - ffi-compiler (>= 1.0, < 2.0) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.18.114) + inspec (4.19.2) faraday_middleware (~> 0.12.2) - inspec-core (= 4.18.114) + inspec-core (= 4.19.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.18.114) + inspec-core (4.19.2) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -289,9 +277,9 @@ GEM jwt (2.2.1) kitchen-docker (2.10.0) test-kitchen (>= 1.0.0) - kitchen-inspec (1.3.2) + kitchen-inspec (2.0.0) hashie (~> 3.4) - inspec (>= 1.47, < 5.0) + inspec (>= 2.2.64, < 5.0) test-kitchen (>= 1.6, < 3) kitchen-salt (0.6.3) hashie (>= 3.5) @@ -323,17 +311,16 @@ GEM concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) timeliness (~> 0.3.10) - ms_rest_azure (0.11.2) + ms_rest_azure (0.12.0) concurrent-ruby (~> 1.0) faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - unf_ext (= 0.0.7.2) multi_json (1.14.1) multipart-post (2.1.1) necromancer (0.5.1) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) + net-scp (3.0.0) + net-ssh (>= 2.6.5, < 7.0.0) net-ssh (5.2.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) @@ -348,7 +335,6 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.5) - rake (13.0.1) regexp_parser (1.7.0) representable (3.0.4) declarative (< 0.1.0) @@ -407,8 +393,8 @@ GEM tins (1.25.0) sync tomlrb (1.3.0) - train (3.2.28) - activesupport (~> 5.2.3) + train (3.2.37) + activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) @@ -418,7 +404,7 @@ GEM google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) inifile (~> 3.0) - train-core (= 3.2.28) + train-core (= 3.2.37) train-winrm (~> 0.2) train-aws (0.1.16) aws-sdk-apigateway (~> 1.0) @@ -468,11 +454,12 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.2.28) + train-core (3.2.37) addressable (~> 2.5) + ffi (< 1.13) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) + net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 6.0) train-habitat (0.2.13) train-winrm (0.2.6) @@ -492,7 +479,7 @@ GEM tty-cursor (~> 0.7) tty-screen (~> 0.7) wisper (~> 2.0.0) - tty-screen (0.7.1) + tty-screen (0.8.0) tty-table (0.11.0) equatable (~> 0.6) necromancer (~> 0.5) @@ -504,7 +491,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.7) unicode-display_width (1.7.0) unicode_utils (1.4.0) uri_template (0.7.0) From 0d77b049e0faa23b8ec94201f3204167439b0f4e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 15 Jun 2020 15:07:23 +0100 Subject: [PATCH 121/139] chore(gemfile.lock): update to latest gem versions [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/222 --- Gemfile.lock | 212 +++++++++++++++++++++++++-------------------------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47fd965..ae8a4d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,150 +9,150 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.326.0) - aws-sdk-apigateway (1.42.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-partitions (1.329.0) + aws-sdk-apigateway (1.45.0) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.21.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-apigatewayv2 (1.22.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.27.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-athena (1.28.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-budgets (1.31.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudformation (1.38.0) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.22.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsm (1.23.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.23.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudhsmv2 (1.24.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.23.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudtrail (1.24.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.38.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatch (1.39.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-cloudwatchlogs (1.32.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.33.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-codecommit (1.34.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-codedeploy (1.32.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-codepipeline (1.32.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.45.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-configservice (1.46.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.98.0) + aws-sdk-core (3.99.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.21.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-costandusagereportservice (1.22.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.48.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-dynamodb (1.49.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.165.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ec2 (1.166.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ecr (1.31.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.63.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ecs (1.65.0) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.29.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-efs (1.30.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.37.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-eks (1.38.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticache (1.37.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticbeanstalk (1.32.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.22.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancing (1.23.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.44.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticloadbalancingv2 (1.45.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-elasticsearchservice (1.37.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.28.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-firehose (1.29.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.39.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-iam (1.40.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.21.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kafka (1.22.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.23.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kinesis (1.24.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.33.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.34.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.42.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-lambda (1.43.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.85.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-rds (1.86.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.43.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-redshift (1.44.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.35.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-route53 (1.36.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.22.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-route53domains (1.23.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.14.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-route53resolver (1.15.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.67.1) - aws-sdk-core (~> 3, >= 3.96.1) + aws-sdk-s3 (1.68.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.26.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-securityhub (1.27.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.30.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ses (1.31.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.20.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-sms (1.21.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.24.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-sns (1.25.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.26.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-sqs (1.27.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.80.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ssm (1.81.1) + aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.4) aws-eventstream (~> 1.0, >= 1.0.2) @@ -195,7 +195,7 @@ GEM ed25519 (1.2.4) equatable (0.6.1) erubi (1.9.0) - excon (0.73.0) + excon (0.74.0) faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -203,7 +203,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - ffi (1.12.2) + ffi (1.13.1) ffi-yajl (2.3.3) libyajl2 (~> 1.2) fuzzyurl (0.9.0) @@ -235,14 +235,14 @@ GEM i18n (1.8.3) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.19.2) + inspec (4.20.2) faraday_middleware (~> 0.12.2) - inspec-core (= 4.19.2) + inspec-core (= 4.20.2) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.19.2) + inspec-core (4.20.2) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -321,7 +321,7 @@ GEM necromancer (0.5.1) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) - net-ssh (5.2.0) + net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) @@ -335,7 +335,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.5) - regexp_parser (1.7.0) + regexp_parser (1.7.1) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -365,7 +365,7 @@ GEM faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - sslshake (1.3.0) + sslshake (1.3.1) strings (0.1.8) strings-ansi (~> 0.1) unicode-display_width (~> 1.5) @@ -374,7 +374,7 @@ GEM sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - test-kitchen (2.5.1) + test-kitchen (2.5.2) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) license-acceptance (~> 1.0, >= 1.0.11) @@ -383,17 +383,17 @@ GEM net-scp (>= 1.1, < 4.0) net-ssh (>= 2.9, < 7.0) net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) + thor (>= 0.19, < 2.0) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) timeliness (0.3.10) tins (1.25.0) sync tomlrb (1.3.0) - train (3.2.37) + train (3.3.1) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -404,7 +404,7 @@ GEM google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) inifile (~> 3.0) - train-core (= 3.2.37) + train-core (= 3.3.1) train-winrm (~> 0.2) train-aws (0.1.16) aws-sdk-apigateway (~> 1.0) @@ -454,13 +454,13 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.2.37) + train-core (3.3.1) addressable (~> 2.5) - ffi (< 1.13) + ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 4.0) - net-ssh (>= 2.9, < 6.0) + net-ssh (>= 2.9, < 7.0) train-habitat (0.2.13) train-winrm (0.2.6) winrm (~> 2.0) From b37a8a7c970cb30ed18f04c4103c5f553557699d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 15 Jun 2020 16:56:24 +0100 Subject: [PATCH 122/139] ci(kitchen): use `saltimages` Docker Hub where available [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/223 --- kitchen.yml | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index 3d683d8..84eff78 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -14,25 +14,25 @@ platforms: ## SALT `master` - name: debian-10-master-py3 driver: - image: netmanagers/salt-master-py3:debian-10 + image: saltimages/salt-master-py3:debian-10 - name: ubuntu-2004-master-py3 driver: - image: netmanagers/salt-master-py3:ubuntu-20.04 + image: saltimages/salt-master-py3:ubuntu-20.04 - name: ubuntu-1804-master-py3 driver: - image: netmanagers/salt-master-py3:ubuntu-18.04 + image: saltimages/salt-master-py3:ubuntu-18.04 - name: centos-8-master-py3 driver: - image: netmanagers/salt-master-py3:centos-8 + image: saltimages/salt-master-py3:centos-8 - name: fedora-32-master-py3 driver: - image: netmanagers/salt-master-py3:fedora-32 + image: saltimages/salt-master-py3:fedora-32 - name: fedora-31-master-py3 driver: - image: netmanagers/salt-master-py3:fedora-31 + image: saltimages/salt-master-py3:fedora-31 - name: opensuse-leap-152-master-py3 driver: - image: netmanagers/salt-master-py3:opensuse-leap-15.2 + image: saltimages/salt-master-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) @@ -40,30 +40,30 @@ platforms: max_ssh_sessions: 1 - name: amazonlinux-2-master-py3 driver: - image: netmanagers/salt-master-py3:amazonlinux-2 + image: saltimages/salt-master-py3:amazonlinux-2 ## SALT `3000.3` - name: debian-10-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:debian-10 + image: saltimages/salt-3000.3-py3:debian-10 - name: debian-9-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:debian-9 + image: saltimages/salt-3000.3-py3:debian-9 - name: ubuntu-1804-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:ubuntu-18.04 + image: saltimages/salt-3000.3-py3:ubuntu-18.04 - name: centos-8-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:centos-8 + image: saltimages/salt-3000.3-py3:centos-8 - name: centos-7-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:centos-7 + image: saltimages/salt-3000.3-py3:centos-7 - name: fedora-31-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:fedora-31 + image: saltimages/salt-3000.3-py3:fedora-31 - name: opensuse-leap-152-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2 + image: saltimages/salt-3000.3-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) @@ -71,43 +71,43 @@ platforms: max_ssh_sessions: 1 - name: amazonlinux-2-3000-3-py3 driver: - image: netmanagers/salt-3000.3-py3:amazonlinux-2 + image: saltimages/salt-3000.3-py3:amazonlinux-2 - name: ubuntu-1804-3000-3-py2 driver: - image: netmanagers/salt-3000.3-py2:ubuntu-18.04 + image: saltimages/salt-3000.3-py2:ubuntu-18.04 - name: ubuntu-1604-3000-3-py2 driver: - image: netmanagers/salt-3000.3-py2:ubuntu-16.04 + image: saltimages/salt-3000.3-py2:ubuntu-16.04 - name: arch-base-latest-3000-3-py2 driver: - image: netmanagers/salt-3000.3-py2:arch-base-latest + image: saltimages/salt-3000.3-py2:arch-base-latest run_command: /usr/lib/systemd/systemd ## SALT `2019.2` - name: debian-10-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:debian-10 + image: saltimages/salt-2019.2-py3:debian-10 - name: debian-9-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:debian-9 + image: saltimages/salt-2019.2-py3:debian-9 - name: ubuntu-1804-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:ubuntu-18.04 + image: saltimages/salt-2019.2-py3:ubuntu-18.04 - name: ubuntu-1604-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:ubuntu-16.04 + image: saltimages/salt-2019.2-py3:ubuntu-16.04 - name: centos-8-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:centos-8 + image: saltimages/salt-2019.2-py3:centos-8 - name: centos-7-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:centos-7 + image: saltimages/salt-2019.2-py3:centos-7 - name: fedora-31-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:fedora-31 + image: saltimages/salt-2019.2-py3:fedora-31 - name: opensuse-leap-152-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:opensuse-leap-15.2 + image: saltimages/salt-2019.2-py3:opensuse-leap-15.2 run_command: /usr/lib/systemd/systemd # Workaround to avoid intermittent failures on `opensuse-leap-15.2`: # => SCP did not finish successfully (255): (Net::SCP::Error) @@ -115,18 +115,18 @@ platforms: max_ssh_sessions: 1 - name: amazonlinux-2-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:amazonlinux-2 + image: saltimages/salt-2019.2-py3:amazonlinux-2 - name: centos-6-2019-2-py2 driver: - image: netmanagers/salt-2019.2-py2:centos-6 + image: saltimages/salt-2019.2-py2:centos-6 run_command: /sbin/init - name: amazonlinux-1-2019-2-py2 driver: - image: netmanagers/salt-2019.2-py2:amazonlinux-1 + image: saltimages/salt-2019.2-py2:amazonlinux-1 run_command: /sbin/init - name: arch-base-latest-2019-2-py2 driver: - image: netmanagers/salt-2019.2-py2:arch-base-latest + image: saltimages/salt-2019.2-py2:arch-base-latest run_command: /usr/lib/systemd/systemd provisioner: From ba91d9841bd0e096466d78f31efb9cdad00f2263 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 21 Jun 2020 12:57:25 +0100 Subject: [PATCH 123/139] chore(gemfile.lock): update to latest gem versions (2020-W25) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/229 --- Gemfile.lock | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ae8a4d1..7f95434 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,8 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.329.0) - aws-sdk-apigateway (1.45.0) + aws-partitions (1.332.0) + aws-sdk-apigateway (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.22.1) @@ -28,6 +28,9 @@ GEM aws-sdk-cloudformation (1.38.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) + aws-sdk-cloudfront (1.31.0) + aws-sdk-core (~> 3, >= 3.99.0) + aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.23.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) @@ -55,7 +58,7 @@ GEM aws-sdk-configservice (1.46.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.99.2) + aws-sdk-core (3.100.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -66,7 +69,7 @@ GEM aws-sdk-dynamodb (1.49.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.166.1) + aws-sdk-ec2 (1.168.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.31.1) @@ -81,7 +84,7 @@ GEM aws-sdk-eks (1.38.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.37.1) + aws-sdk-elasticache (1.38.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.32.1) @@ -111,19 +114,19 @@ GEM aws-sdk-kms (1.34.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.43.1) + aws-sdk-lambda (1.44.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.86.1) + aws-sdk-rds (1.87.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.44.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.36.1) + aws-sdk-route53 (1.38.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-route53domains (1.23.1) @@ -132,7 +135,7 @@ GEM aws-sdk-route53resolver (1.15.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.68.1) + aws-sdk-s3 (1.69.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -151,26 +154,26 @@ GEM aws-sdk-sqs (1.27.1) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.81.1) + aws-sdk-ssm (1.82.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.4) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sigv4 (1.2.0) + aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) azure_mgmt_key_vault (0.17.6) ms_rest_azure (~> 0.12.0) azure_mgmt_resources (0.17.9) ms_rest_azure (~> 0.12.0) - azure_mgmt_security (0.18.1) + azure_mgmt_security (0.18.2) ms_rest_azure (~> 0.12.0) azure_mgmt_storage (0.21.1) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.1.16) + chef-config (16.2.44) addressable - chef-utils (= 16.1.16) + chef-utils (= 16.2.44) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -179,7 +182,7 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.1.16) + chef-utils (16.2.44) coderay (1.1.3) concurrent-ruby (1.1.6) declarative (0.0.10) @@ -195,7 +198,7 @@ GEM ed25519 (1.2.4) equatable (0.6.1) erubi (1.9.0) - excon (0.74.0) + excon (0.75.0) faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -235,14 +238,14 @@ GEM i18n (1.8.3) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.20.2) + inspec (4.20.10) faraday_middleware (~> 0.12.2) - inspec-core (= 4.20.2) + inspec-core (= 4.20.10) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.20.2) + inspec-core (4.20.10) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -263,7 +266,7 @@ GEM sslshake (~> 1.2) term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) - tomlrb (~> 1.2) + tomlrb (~> 1.2.0) train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) @@ -326,7 +329,7 @@ GEM net-ssh (>= 4.0.0) nori (2.6.0) os (1.1.0) - parallel (1.19.1) + parallel (1.19.2) parslet (1.8.2) pastel (0.7.4) equatable (~> 0.6) @@ -392,7 +395,7 @@ GEM timeliness (0.3.10) tins (1.25.0) sync - tomlrb (1.3.0) + tomlrb (1.2.9) train (3.3.1) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) @@ -406,13 +409,14 @@ GEM inifile (~> 3.0) train-core (= 3.3.1) train-winrm (~> 0.2) - train-aws (0.1.16) + train-aws (0.1.17) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-athena (~> 1.0) aws-sdk-autoscaling (~> 1.22.0) aws-sdk-budgets (~> 1.0) aws-sdk-cloudformation (~> 1.0) + aws-sdk-cloudfront (~> 1.0) aws-sdk-cloudhsm (~> 1.0) aws-sdk-cloudhsmv2 (~> 1.0) aws-sdk-cloudtrail (~> 1.8) From 8cfba5ae28ff00d8fa4f3652a4da7c630afd9ec6 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 26 Jun 2020 12:45:07 +0100 Subject: [PATCH 124/139] chore(gemfile.lock): update to latest gem versions (2020-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/233 --- Gemfile.lock | 112 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7f95434..6233285 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,155 +9,155 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.332.0) - aws-sdk-apigateway (1.46.0) + aws-partitions (1.335.0) + aws-sdk-apigateway (1.47.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.22.1) + aws-sdk-apigatewayv2 (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.28.1) + aws-sdk-athena (1.29.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.31.1) + aws-sdk-budgets (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.38.0) + aws-sdk-cloudformation (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.31.0) + aws-sdk-cloudfront (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.23.1) + aws-sdk-cloudhsm (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.24.1) + aws-sdk-cloudhsmv2 (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.24.1) + aws-sdk-cloudtrail (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.39.1) + aws-sdk-cloudwatch (1.40.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.32.1) + aws-sdk-cloudwatchlogs (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.34.1) + aws-sdk-codecommit (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.32.1) + aws-sdk-codedeploy (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.32.1) + aws-sdk-codepipeline (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.46.1) + aws-sdk-configservice (1.47.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.100.0) + aws-sdk-core (3.102.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.22.1) + aws-sdk-costandusagereportservice (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.49.1) + aws-sdk-dynamodb (1.50.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.168.0) + aws-sdk-ec2 (1.171.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.31.1) + aws-sdk-ecr (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.65.0) + aws-sdk-ecs (1.66.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.30.1) + aws-sdk-efs (1.31.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.38.1) + aws-sdk-eks (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.38.0) + aws-sdk-elasticache (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.32.1) + aws-sdk-elasticbeanstalk (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.23.1) + aws-sdk-elasticloadbalancing (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.45.1) + aws-sdk-elasticloadbalancingv2 (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.37.1) + aws-sdk-elasticsearchservice (1.38.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.29.1) + aws-sdk-firehose (1.30.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.40.1) + aws-sdk-iam (1.42.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.22.1) + aws-sdk-kafka (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.24.1) + aws-sdk-kinesis (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.34.1) + aws-sdk-kms (1.35.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.44.0) + aws-sdk-lambda (1.45.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.87.0) + aws-sdk-rds (1.89.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.44.1) + aws-sdk-redshift (1.45.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.38.0) + aws-sdk-route53 (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.23.1) + aws-sdk-route53domains (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.15.1) + aws-sdk-route53resolver (1.16.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.69.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-s3 (1.71.1) + aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.27.1) + aws-sdk-securityhub (1.28.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.31.1) + aws-sdk-ses (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.21.1) + aws-sdk-sms (1.22.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.25.1) + aws-sdk-sns (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.27.1) + aws-sdk-sqs (1.29.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.82.0) + aws-sdk-ssm (1.83.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.0) + aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -171,9 +171,9 @@ GEM ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.2.44) + chef-config (16.2.50) addressable - chef-utils (= 16.2.44) + chef-utils (= 16.2.50) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -182,12 +182,12 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.2.44) + chef-utils (16.2.50) coderay (1.1.3) concurrent-ruby (1.1.6) declarative (0.0.10) declarative-option (0.1.0) - diff-lcs (1.3) + diff-lcs (1.4.2) docker-api (1.34.2) excon (>= 0.47.0) multi_json @@ -396,7 +396,7 @@ GEM tins (1.25.0) sync tomlrb (1.2.9) - train (3.3.1) + train (3.3.4) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -407,7 +407,7 @@ GEM google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) inifile (~> 3.0) - train-core (= 3.3.1) + train-core (= 3.3.4) train-winrm (~> 0.2) train-aws (0.1.17) aws-sdk-apigateway (~> 1.0) @@ -458,7 +458,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.1) + train-core (3.3.4) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From f1084e592506e0857fa2dbacc345755a2cf625e2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 6 Jul 2020 14:28:48 +0100 Subject: [PATCH 125/139] chore(gemfile.lock): update to latest gem versions (2020-W27) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/235 --- Gemfile.lock | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6233285..38dca3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,14 +9,14 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.335.0) - aws-sdk-apigateway (1.47.0) + aws-partitions (1.338.0) + aws-sdk-apigateway (1.48.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.29.0) + aws-sdk-athena (1.30.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) @@ -25,136 +25,136 @@ GEM aws-sdk-budgets (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.39.0) + aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.32.0) + aws-sdk-cloudfront (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.25.0) + aws-sdk-cloudhsmv2 (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.25.0) + aws-sdk-cloudtrail (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.40.0) + aws-sdk-cloudwatch (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.33.0) + aws-sdk-cloudwatchlogs (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.36.0) + aws-sdk-codecommit (1.37.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.33.0) + aws-sdk-codedeploy (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.33.0) + aws-sdk-codepipeline (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.47.0) + aws-sdk-configservice (1.48.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.102.1) + aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.23.0) + aws-sdk-costandusagereportservice (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.50.0) + aws-sdk-dynamodb (1.51.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.171.0) + aws-sdk-ec2 (1.174.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.32.0) + aws-sdk-ecr (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.66.0) + aws-sdk-ecs (1.67.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.31.0) + aws-sdk-efs (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.39.0) + aws-sdk-elasticache (1.40.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.33.0) + aws-sdk-elasticbeanstalk (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.24.0) + aws-sdk-elasticloadbalancing (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.46.0) + aws-sdk-elasticloadbalancingv2 (1.47.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.38.0) + aws-sdk-elasticsearchservice (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.30.0) + aws-sdk-firehose (1.31.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.42.0) + aws-sdk-iam (1.43.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.25.0) + aws-sdk-kinesis (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.35.0) + aws-sdk-kms (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.45.0) + aws-sdk-lambda (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.89.0) + aws-sdk-rds (1.92.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.45.0) + aws-sdk-redshift (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.39.0) + aws-sdk-route53 (1.40.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.24.0) + aws-sdk-route53domains (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.16.0) + aws-sdk-route53resolver (1.17.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.71.1) + aws-sdk-s3 (1.73.0) aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.28.0) + aws-sdk-securityhub (1.29.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.32.0) + aws-sdk-ses (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.22.0) + aws-sdk-sms (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.26.0) + aws-sdk-sns (1.27.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.29.0) + aws-sdk-sqs (1.30.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.83.0) + aws-sdk-ssm (1.84.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) @@ -167,13 +167,13 @@ GEM ms_rest_azure (~> 0.12.0) azure_mgmt_security (0.18.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_storage (0.21.1) + azure_mgmt_storage (0.21.2) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.2.50) + chef-config (16.2.73) addressable - chef-utils (= 16.2.50) + chef-utils (= 16.2.73) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -182,12 +182,12 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.2.50) + chef-utils (16.2.73) coderay (1.1.3) concurrent-ruby (1.1.6) - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) - diff-lcs (1.4.2) + diff-lcs (1.4.4) docker-api (1.34.2) excon (>= 0.47.0) multi_json @@ -238,14 +238,14 @@ GEM i18n (1.8.3) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.20.10) + inspec (4.21.3) faraday_middleware (~> 0.12.2) - inspec-core (= 4.20.10) + inspec-core (= 4.21.3) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.20.10) + inspec-core (4.21.3) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -271,7 +271,7 @@ GEM tty-prompt (~> 0.17) tty-table (~> 0.10) jmespath (1.4.0) - json (2.3.0) + json (2.3.1) json_schemer (0.2.11) ecma-re-validator (~> 0.2) hana (~> 1.3) @@ -294,9 +294,9 @@ GEM tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) mini_mime (1.0.2) @@ -396,7 +396,7 @@ GEM tins (1.25.0) sync tomlrb (1.2.9) - train (3.3.4) + train (3.3.6) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -407,7 +407,7 @@ GEM google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) inifile (~> 3.0) - train-core (= 3.3.4) + train-core (= 3.3.6) train-winrm (~> 0.2) train-aws (0.1.17) aws-sdk-apigateway (~> 1.0) @@ -458,7 +458,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.4) + train-core (3.3.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 8eccd5a68cadde02f54467a7fb9e370d2ee7d574 Mon Sep 17 00:00:00 2001 From: Yoda-BZH Date: Fri, 10 Jul 2020 17:12:24 +0200 Subject: [PATCH 126/139] feat(socket_authentication): allow unix_socket authentication Co-authored-by: Tristan Charbonneau --- mysql/user.sls | 3 +++ pillar.example | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/mysql/user.sls b/mysql/user.sls index 5c7e98b..414633a 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -42,6 +42,9 @@ include: - password_hash: '{{ user['password_hash'] }}' {%- elif user['password'] is defined and user['password'] != None %} - password: '{{ user['password'] }}' + {%- elif user['unix_socket'] is defined and user['unix_socket'] != None %} + - allow_passwordless: True + - unix_socket: True {%- else %} - allow_passwordless: True {%- endif %} diff --git a/pillar.example b/pillar.example index e2944f9..17780b3 100644 --- a/pillar.example +++ b/pillar.example @@ -135,6 +135,13 @@ mysql: - database: bar table: foobar grants: ['select', 'insert', 'update', 'delete'] + + # User 'alice' will be allowed to connect to the server without password + # as long as she has access to the unix socket. + # This option forces allow_passwordless to be set to True + alice: + host: 'localhost' + unix_socket: true nopassuser: password: ~ host: localhost From 5bf7d57f145c43fdd16d522537115b2b92f86574 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 10 Jul 2020 15:20:11 +0000 Subject: [PATCH 127/139] chore(release): 0.54.0 [skip ci] # [0.54.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.53.0...v0.54.0) (2020-07-10) ### Continuous Integration * **kitchen:** use `saltimages` Docker Hub where available [skip ci] ([b37a8a7](https://github.com/saltstack-formulas/mysql-formula/commit/b37a8a7c970cb30ed18f04c4103c5f553557699d)) ### Features * **socket_authentication:** allow unix_socket authentication ([8eccd5a](https://github.com/saltstack-formulas/mysql-formula/commit/8eccd5a68cadde02f54467a7fb9e370d2ee7d574)) --- AUTHORS.md | 5 +++-- CHANGELOG.md | 12 ++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 7 +++++-- docs/CHANGELOG.rst | 15 +++++++++++++++ 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index e7b99b5..cd361a5 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|59 +@myii|[@myii](https://github.com/myii)|65 @gravyboat|[@gravyboat](https://github.com/gravyboat)|38 @aboe76|[@aboe76](https://github.com/aboe76)|37 @nmadhok|[@nmadhok](https://github.com/nmadhok)|28 @@ -74,6 +74,7 @@ Avatar|Contributor|Contributions @soniah|[@soniah](https://github.com/soniah)|1 @tony|[@tony](https://github.com/tony)|1 @wido|[@wido](https://github.com/wido)|1 +@Yoda-BZH|[@Yoda-BZH](https://github.com/Yoda-BZH)|1 @abednarik|[@abednarik](https://github.com/abednarik)|1 @jam13|[@jam13](https://github.com/jam13)|1 @getSurreal|[@getSurreal](https://github.com/getSurreal)|1 @@ -83,4 +84,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-06-01. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-10. diff --git a/CHANGELOG.md b/CHANGELOG.md index d90419d..c0ab75f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +# [0.54.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.53.0...v0.54.0) (2020-07-10) + + +### Continuous Integration + +* **kitchen:** use `saltimages` Docker Hub where available [skip ci] ([b37a8a7](https://github.com/saltstack-formulas/mysql-formula/commit/b37a8a7c970cb30ed18f04c4103c5f553557699d)) + + +### Features + +* **socket_authentication:** allow unix_socket authentication ([8eccd5a](https://github.com/saltstack-formulas/mysql-formula/commit/8eccd5a68cadde02f54467a7fb9e370d2ee7d574)) + # [0.53.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.52.7...v0.53.0) (2020-06-01) diff --git a/FORMULA b/FORMULA index e2062e9..0f418e1 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.53.0 +version: 0.54.0 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 4190074..a3e1849 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 59 + - 65 * - :raw-html-m2r:`@gravyboat` - `@gravyboat `_ - 38 @@ -223,6 +223,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@wido` - `@wido `_ - 1 + * - :raw-html-m2r:`@Yoda-BZH` + - `@Yoda-BZH `_ + - 1 * - :raw-html-m2r:`@abednarik` - `@abednarik `_ - 1 @@ -245,4 +248,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-06-01. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-07-10. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 2fa9eb3..b427ac2 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`0.54.0 `_ (2020-07-10) +---------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen:** use ``saltimages`` Docker Hub where available [skip ci] (\ `b37a8a7 `_\ ) + +Features +^^^^^^^^ + + +* **socket_authentication:** allow unix_socket authentication (\ `8eccd5a `_\ ) + `0.53.0 `_ (2020-06-01) ---------------------------------------------------------------------------------------------------------- From ec681995b4f7e23a8dbec63809d3704f19ec9299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9raud=20CONTINSOUZAS?= Date: Tue, 25 Aug 2020 09:45:37 +1100 Subject: [PATCH 128/139] fix(freebsd): upgrade to mysql57-server Current default version for FreeBSD is MySQL 5.7, also python 2.x is deprecated and should be removed any time soon. FreeBSD uses the `mysql_install_db` which generates a temporary root password upon the first start. To the best of my understanding I haven't seen any code in the formula that handles this method. So I added a FreeBSD-scpecific block for initialization. While here, create `/var/log/mysql` without which the server won't start if it doesn't exist. Co-authored-by: Geraud CONTINSOUZAS --- mysql/osfamilymap.yaml | 12 ++++++------ mysql/server.sls | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mysql/osfamilymap.yaml b/mysql/osfamilymap.yaml index d582dcc..fd71133 100644 --- a/mysql/osfamilymap.yaml +++ b/mysql/osfamilymap.yaml @@ -206,14 +206,14 @@ Gentoo: interactive_timeout: noarg_present FreeBSD: - serverpkg: mysql56-server - clientpkg: mysql56-client + serverpkg: mysql57-server + clientpkg: mysql57-client service: mysql-server - pythonpkg: py27-pymysql - devpkg: mysql56-server + pythonpkg: py37-pymysql + devpkg: mysql57-server config: - file: /usr/local/etc/my.cnf + file: /usr/local/etc/mysql/my.cnf sections: client: socket: /tmp/mysql.sock @@ -221,7 +221,7 @@ FreeBSD: # Empty values below to be resolved, disabling the rule in the meantime # yamllint disable rule:empty-values user: - datadir: + datadir: /var/db/mysql # yamllint enable rule:empty-values socket: /tmp/mysql.sock skip-external-locking: noarg_present diff --git a/mysql/server.sls b/mysql/server.sls index 564555e..53df282 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -143,13 +143,29 @@ mysql_initialize: - pkg: {{ mysql.serverpkg }} {%- endif %} +{%- if os_family in ['FreeBSD'] and mysql.serverpkg.lower() != 'mariadb-server' %} +mysql_initialize: + file.directory: + - name: /var/log/mysql + - user: mysql + - group: mysql + - mode: '0750' + cmd.run: + - name: /usr/local/libexec/mysqld --initialize-insecure --user=mysql --basedir=/usr/local --datadir={{ mysql_datadir }} + - runas: root + - creates: {{ mysql_datadir }}/mysql/ + - require: + - pkg: {{ mysql.serverpkg }} + - file: /var/log/mysql +{%- endif %} + mysqld-service-running: service.running: - name: {{ mysql.service }} - enable: True - require: - pkg: {{ mysql.serverpkg }} -{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo']) %} +{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo', 'FreeBSD']) %} - cmd: mysql_initialize {%- elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %} - file: {{ mysql_datadir }} From 1e5651faac90386e523d8943d3c2f30f4799e97e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 24 Aug 2020 22:53:02 +0000 Subject: [PATCH 129/139] chore(release): 0.54.1 [skip ci] ## [0.54.1](https://github.com/saltstack-formulas/mysql-formula/compare/v0.54.0...v0.54.1) (2020-08-24) ### Bug Fixes * **freebsd:** upgrade to mysql57-server ([ec68199](https://github.com/saltstack-formulas/mysql-formula/commit/ec681995b4f7e23a8dbec63809d3704f19ec9299)) --- AUTHORS.md | 3 ++- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 5 ++++- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index cd361a5..f2ce3db 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -57,6 +57,7 @@ Avatar|Contributor|Contributions @sivir|[@sivir](https://github.com/sivir)|1 @terminalmage|[@terminalmage](https://github.com/terminalmage)|1 @replicant0wnz|[@replicant0wnz](https://github.com/replicant0wnz)|1 +@GeJ|[@GeJ](https://github.com/GeJ)|1 @imran1008|[@imran1008](https://github.com/imran1008)|1 @JubbaSmail|[@JubbaSmail](https://github.com/JubbaSmail)|1 @h4ck3rm1k3|[@h4ck3rm1k3](https://github.com/h4ck3rm1k3)|1 @@ -84,4 +85,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-07-10. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-08-24. diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ab75f..76fc71a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.54.1](https://github.com/saltstack-formulas/mysql-formula/compare/v0.54.0...v0.54.1) (2020-08-24) + + +### Bug Fixes + +* **freebsd:** upgrade to mysql57-server ([ec68199](https://github.com/saltstack-formulas/mysql-formula/commit/ec681995b4f7e23a8dbec63809d3704f19ec9299)) + # [0.54.0](https://github.com/saltstack-formulas/mysql-formula/compare/v0.53.0...v0.54.0) (2020-07-10) diff --git a/FORMULA b/FORMULA index 0f418e1..3a912e1 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.54.0 +version: 0.54.1 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index a3e1849..13cd7f5 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -172,6 +172,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@replicant0wnz` - `@replicant0wnz `_ - 1 + * - :raw-html-m2r:`@GeJ` + - `@GeJ `_ + - 1 * - :raw-html-m2r:`@imran1008` - `@imran1008 `_ - 1 @@ -248,4 +251,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-07-10. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-08-24. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index b427ac2..32db862 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.54.1 `_ (2020-08-24) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **freebsd:** upgrade to mysql57-server (\ `ec68199 `_\ ) + `0.54.0 `_ (2020-07-10) ---------------------------------------------------------------------------------------------------------- From 7791268d133d557d21414365db59dc14c8f97f74 Mon Sep 17 00:00:00 2001 From: Geraud CONTINSOUZAS Date: Thu, 27 Aug 2020 16:00:27 +1100 Subject: [PATCH 130/139] fix(indent): properly indent file.directory block This is a followup on #250. The patch I sent here suffered from a case of bad copy-n-paste and missed half a level of indentation. Sorry. --- mysql/server.sls | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql/server.sls b/mysql/server.sls index 53df282..b9c4142 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -145,11 +145,11 @@ mysql_initialize: {%- if os_family in ['FreeBSD'] and mysql.serverpkg.lower() != 'mariadb-server' %} mysql_initialize: - file.directory: - - name: /var/log/mysql - - user: mysql - - group: mysql - - mode: '0750' + file.directory: + - name: /var/log/mysql + - user: mysql + - group: mysql + - mode: '0750' cmd.run: - name: /usr/local/libexec/mysqld --initialize-insecure --user=mysql --basedir=/usr/local --datadir={{ mysql_datadir }} - runas: root From 45251f8fe0fb53e7deece899d53db1cd2f232851 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 27 Aug 2020 05:33:58 +0000 Subject: [PATCH 131/139] chore(release): 0.54.2 [skip ci] ## [0.54.2](https://github.com/saltstack-formulas/mysql-formula/compare/v0.54.1...v0.54.2) (2020-08-27) ### Bug Fixes * **indent:** properly indent file.directory block ([7791268](https://github.com/saltstack-formulas/mysql-formula/commit/7791268d133d557d21414365db59dc14c8f97f74)), closes [#250](https://github.com/saltstack-formulas/mysql-formula/issues/250) --- AUTHORS.md | 4 ++-- CHANGELOG.md | 7 +++++++ FORMULA | 2 +- docs/AUTHORS.rst | 8 ++++---- docs/CHANGELOG.rst | 9 +++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index f2ce3db..4f86729 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -28,6 +28,7 @@ Avatar|Contributor|Contributions @alfonsfoubert|[@alfonsfoubert](https://github.com/alfonsfoubert)|3 @cboltz|[@cboltz](https://github.com/cboltz)|3 @pcdummy|[@pcdummy](https://github.com/pcdummy)|3 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|3 @amontalban|[@amontalban](https://github.com/amontalban)|2 @iggy|[@iggy](https://github.com/iggy)|2 @ogabrielsantos|[@ogabrielsantos](https://github.com/ogabrielsantos)|2 @@ -41,7 +42,6 @@ Avatar|Contributor|Contributions @tomasfejfar|[@tomasfejfar](https://github.com/tomasfejfar)|2 @vschum|[@vschum](https://github.com/vschum)|2 @madflojo|[@madflojo](https://github.com/madflojo)|2 -@sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @UtahDave|[@UtahDave](https://github.com/UtahDave)|2 @daks|[@daks](https://github.com/daks)|2 @nesteves|[@nesteves](https://github.com/nesteves)|2 @@ -85,4 +85,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-08-24. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-08-27. diff --git a/CHANGELOG.md b/CHANGELOG.md index 76fc71a..e91df14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.54.2](https://github.com/saltstack-formulas/mysql-formula/compare/v0.54.1...v0.54.2) (2020-08-27) + + +### Bug Fixes + +* **indent:** properly indent file.directory block ([7791268](https://github.com/saltstack-formulas/mysql-formula/commit/7791268d133d557d21414365db59dc14c8f97f74)), closes [#250](https://github.com/saltstack-formulas/mysql-formula/issues/250) + ## [0.54.1](https://github.com/saltstack-formulas/mysql-formula/compare/v0.54.0...v0.54.1) (2020-08-24) diff --git a/FORMULA b/FORMULA index 3a912e1..bfb2e55 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: mysql os: RedHat, CentOS, Debian, Ubuntu, Suse, Gentoo, FreeBSD os_family: RedHat, Debian, Suse, Gentoo, FreeBSD -version: 0.54.1 +version: 0.54.2 release: 1 minimum_version: 2015.8 summary: Formula for installing MySQL diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 13cd7f5..66c7b62 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -85,6 +85,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@pcdummy` - `@pcdummy `_ - 3 + * - :raw-html-m2r:`@sticky-note` + - `@sticky-note `_ + - 3 * - :raw-html-m2r:`@amontalban` - `@amontalban `_ - 2 @@ -124,9 +127,6 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@madflojo` - `@madflojo `_ - 2 - * - :raw-html-m2r:`@sticky-note` - - `@sticky-note `_ - - 2 * - :raw-html-m2r:`@UtahDave` - `@UtahDave `_ - 2 @@ -251,4 +251,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-08-24. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-08-27. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 32db862..4cef594 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`0.54.2 `_ (2020-08-27) +---------------------------------------------------------------------------------------------------------- + +Bug Fixes +^^^^^^^^^ + + +* **indent:** properly indent file.directory block (\ `7791268 `_\ ), closes `#250 `_ + `0.54.1 `_ (2020-08-24) ---------------------------------------------------------------------------------------------------------- From 11e646082ec3846045edde20411615c7c0f3479b Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Sat, 3 Oct 2020 11:58:04 +0100 Subject: [PATCH 132/139] ci(pre-commit): add to formula [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/259 --- .pre-commit-config.yaml | 55 +++++++++++++++++++++++++++++++++++++++++ .rstcheck.cfg | 3 +++ .travis.yml | 14 +++++++++++ bin/install-hooks | 16 ++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 .pre-commit-config.yaml create mode 100644 .rstcheck.cfg create mode 100755 bin/install-hooks diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..86cf5fa --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +--- +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +default_stages: [commit] +repos: + - repo: https://github.com/dafyddj/commitlint-pre-commit-hook + rev: v2.3.0 + hooks: + - id: commitlint + name: Check commit message using commitlint + description: Lint commit message against @commitlint/config-conventional rules + stages: [commit-msg] + additional_dependencies: ['@commitlint/config-conventional@8.3.4'] + - id: commitlint-travis + stages: [manual] + additional_dependencies: ['@commitlint/config-conventional@8.3.4'] + always_run: true + - repo: https://github.com/adithyabsk/mirrors-rubocop + rev: v0.91.0 + hooks: + - id: rubocop + name: Check Ruby files with rubocop + args: [--debug] + always_run: true + pass_filenames: false + - repo: https://github.com/jumanjihouse/pre-commit-hooks + rev: 2.1.3 + hooks: + - id: shellcheck + name: Check shell scripts with shellcheck + files: ^.*\.(sh|bash|ksh)$ + types: [] + args: [] + - repo: https://github.com/adrienverge/yamllint.git + rev: v1.23.0 + hooks: + - id: yamllint + name: Check YAML syntax with yamllint + args: [--strict, '.'] + always_run: true + pass_filenames: false + - repo: https://github.com/warpnet/salt-lint + rev: v0.3.0 + hooks: + - id: salt-lint + name: Check Salt files using salt-lint + files: ^.*\.(sls|jinja|j2|tmpl|tst)$ +# - repo: https://github.com/myint/rstcheck +# rev: 3f929574 +# hooks: +# - id: rstcheck +# name: Check reST files using rstcheck +# args: [--report=warning] diff --git a/.rstcheck.cfg b/.rstcheck.cfg new file mode 100644 index 0000000..05856dc --- /dev/null +++ b/.rstcheck.cfg @@ -0,0 +1,3 @@ +[rstcheck] +report=error +ignore_language=rst diff --git a/.travis.yml b/.travis.yml index 3f848e3..64cb372 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,20 @@ jobs: @commitlint/travis-cli - commitlint-travis + # Run `pre-commit` linters in a single job + - language: 'python' + env: 'Lint_pre-commit' + name: 'Lint: pre-commit' + before_install: 'skip' + cache: + directories: + - $HOME/.cache/pre-commit + script: + # Install and run `pre-commit` + - pip install pre-commit==2.7.1 + - pre-commit run --all-files --color always --verbose + - pre-commit run --color always --hook-stage manual --verbose commitlint-travis + ## Define the rest of the matrix based on Kitchen testing # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` diff --git a/bin/install-hooks b/bin/install-hooks new file mode 100755 index 0000000..840bb6c --- /dev/null +++ b/bin/install-hooks @@ -0,0 +1,16 @@ +#!/usr/bin/env sh +set -o nounset # Treat unset variables as an error and immediately exit +set -o errexit # If a command fails exit the whole script + +if [ "${DEBUG:-false}" = "true" ]; then + set -x # Run the entire script in debug mode +fi + +if ! command -v pre-commit >/dev/null 2>&1; then + echo "pre-commit not found: please install or check your PATH" >&2 + echo "See https://pre-commit.com/#installation" >&2 + exit 1 +fi + +pre-commit install --install-hooks +pre-commit install --hook-type commit-msg --install-hooks From 87cb5b7c4f6096902dd97a4eeda2c238de5b0fa9 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 5 Oct 2020 00:22:04 +0100 Subject: [PATCH 133/139] ci(pre-commit): enable/disable `rstcheck` as relevant [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/262 --- .pre-commit-config.yaml | 12 ++++++------ CODEOWNERS | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 86cf5fa..3dc79fa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,9 +47,9 @@ repos: - id: salt-lint name: Check Salt files using salt-lint files: ^.*\.(sls|jinja|j2|tmpl|tst)$ -# - repo: https://github.com/myint/rstcheck -# rev: 3f929574 -# hooks: -# - id: rstcheck -# name: Check reST files using rstcheck -# args: [--report=warning] + - repo: https://github.com/myint/rstcheck + rev: 3f929574 + hooks: + - id: rstcheck + name: Check reST files using rstcheck + args: [--report=warning] diff --git a/CODEOWNERS b/CODEOWNERS index 256a898..f993894 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -14,6 +14,7 @@ # SECTION: Owner(s) for files/directories related to `semantic-release` # FILE PATTERN OWNER(S) /.github/workflows/ @saltstack-formulas/ssf +/bin/install-hooks @saltstack-formulas/ssf /bin/kitchen @saltstack-formulas/ssf /docs/AUTHORS.rst @saltstack-formulas/ssf /docs/CHANGELOG.rst @saltstack-formulas/ssf @@ -24,6 +25,8 @@ /test/integration/**/README.md @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf /.cirrus.yml @saltstack-formulas/ssf +/.pre-commit-config.yaml @saltstack-formulas/ssf +/.rstcheck.cfg @saltstack-formulas/ssf /.rubocop.yml @saltstack-formulas/ssf /.salt-lint @saltstack-formulas/ssf /.travis.yml @saltstack-formulas/ssf From 0f711d3e04be28ea662e5c74eb3bfe83ad82d889 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 7 Oct 2020 00:05:54 +0100 Subject: [PATCH 134/139] chore(gemfile+lock): update to latest gem versions (2020-W41) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/263 --- Gemfile | 6 +- Gemfile.lock | 368 +++++++++++++++++++++++++-------------------------- 2 files changed, 186 insertions(+), 188 deletions(-) diff --git a/Gemfile b/Gemfile index 5a232b6..f18b9e9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source 'https://rubygems.org' -gem 'kitchen-docker', '>= 2.9' -gem 'kitchen-inspec', '>= 1.1' -gem 'kitchen-salt', '>= 0.6.0' +gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' +gem 'kitchen-inspec', '>= 2.2.1' +gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index 38dca3a..5addeb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,15 @@ +GIT + remote: https://github.com/test-kitchen/kitchen-docker.git + revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848 + ref: 41e80fe + specs: + kitchen-docker (2.10.0) + test-kitchen (>= 1.0.0) + GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.3) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -9,186 +17,189 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.338.0) - aws-sdk-apigateway (1.48.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-partitions (1.380.0) + aws-sdk-apigateway (1.55.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.23.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-apigatewayv2 (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.30.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-athena (1.33.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.32.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-budgets (1.35.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.41.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudformation (1.44.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.33.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudfront (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.24.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudhsm (1.27.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.26.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudhsmv2 (1.30.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.26.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudtrail (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.41.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudwatch (1.45.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.34.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-cloudwatchlogs (1.38.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.37.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-codecommit (1.40.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.34.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-codedeploy (1.37.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.34.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-codepipeline (1.37.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.48.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-configservice (1.53.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.103.0) + aws-sdk-core (3.109.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.24.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-costandusagereportservice (1.28.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.51.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-dynamodb (1.55.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.174.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-ec2 (1.198.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.34.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-ecr (1.39.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.67.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-ecs (1.70.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.32.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-efs (1.36.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.39.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-eks (1.44.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.40.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-elasticache (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.34.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-elasticbeanstalk (1.38.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.25.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-elasticloadbalancing (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.47.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-elasticloadbalancingv2 (1.53.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.39.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-elasticsearchservice (1.43.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.31.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-firehose (1.35.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.43.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-guardduty (1.42.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.23.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-iam (1.46.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.26.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-kafka (1.29.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-kinesis (1.30.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.46.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-kms (1.39.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-lambda (1.51.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.92.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-rds (1.102.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.46.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-redshift (1.50.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.40.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-route53 (1.44.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.25.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-route53domains (1.28.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.17.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-route53resolver (1.21.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.73.0) - aws-sdk-core (~> 3, >= 3.102.1) + aws-sdk-s3 (1.83.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.29.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-securityhub (1.35.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.33.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-ses (1.36.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.23.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-sms (1.27.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.27.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-sns (1.32.1) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.30.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-sqs (1.34.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.84.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-ssm (1.93.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.1) + aws-sigv4 (1.2.2) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) azure_mgmt_key_vault (0.17.6) ms_rest_azure (~> 0.12.0) - azure_mgmt_resources (0.17.9) + azure_mgmt_resources (0.18.0) ms_rest_azure (~> 0.12.0) azure_mgmt_security (0.18.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_storage (0.21.2) + azure_mgmt_storage (0.22.0) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.2.73) + chef-config (16.5.77) addressable - chef-utils (= 16.2.73) + chef-utils (= 16.5.77) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.8) + chef-telemetry (1.0.14) chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.2.73) + chef-utils (16.5.77) coderay (1.1.3) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) declarative (0.0.20) declarative-option (0.1.0) diff-lcs (1.4.4) - docker-api (1.34.2) + docker-api (2.0.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) @@ -196,21 +207,20 @@ GEM ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) - equatable (0.6.1) erubi (1.9.0) - excon (0.75.0) - faraday (0.17.3) + excon (0.76.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) + faraday_middleware (1.0.0) + faraday (~> 1.0) ffi (1.13.1) - ffi-yajl (2.3.3) + ffi-yajl (2.3.4) libyajl2 (~> 1.2) fuzzyurl (0.9.0) - google-api-client (0.34.1) + google-api-client (0.44.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) @@ -218,41 +228,39 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.12) - googleauth (0.10.0) - faraday (~> 0.12) + googleauth (0.13.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.12) + signet (~> 0.14) gssapi (1.3.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hana (1.3.6) hashie (3.6.0) - htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.3) + i18n (1.8.5) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.21.3) - faraday_middleware (~> 0.12.2) - inspec-core (= 4.21.3) + inspec (4.23.11) + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 4.23.11) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.21.3) + inspec-core (4.23.11) addressable (~> 2.4) chef-telemetry (~> 1.0) - faraday (>= 0.9.0) + faraday (>= 0.9.0, < 1.1) hashie (~> 3.4) - htmlentities (~> 4.3) - json_schemer (~> 0.2.1) - license-acceptance (>= 0.2.13, < 2.0) + json_schemer (>= 0.2.1, < 0.2.12) + license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) @@ -264,7 +272,6 @@ GEM rubyzip (~> 1.2, >= 1.2.2) semverse (~> 3.0) sslshake (~> 1.2) - term-ansicolor (~> 1.7) thor (>= 0.20, < 2.0) tomlrb (~> 1.2.0) train-core (~> 3.0) @@ -277,22 +284,20 @@ GEM hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) - jwt (2.2.1) - kitchen-docker (2.10.0) - test-kitchen (>= 1.0.0) - kitchen-inspec (2.0.0) + jwt (2.2.2) + kitchen-inspec (2.2.1) hashie (~> 3.4) inspec (>= 2.2.64, < 5.0) - test-kitchen (>= 1.6, < 3) + test-kitchen (>= 2.7, < 3) kitchen-salt (0.6.3) hashie (>= 3.5) test-kitchen (>= 1.4) libyajl2 (1.2.0) - license-acceptance (1.0.19) + license-acceptance (2.1.2) pastel (~> 0.7) tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) + tty-box (~> 0.6) + tty-prompt (~> 0.20) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -300,15 +305,16 @@ GEM memoist (0.16.2) method_source (1.0.0) mini_mime (1.0.2) - minitest (5.14.1) - mixlib-config (3.0.6) + minitest (5.14.2) + mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.1) + mixlib-install (3.12.3) mixlib-shellout mixlib-versioning thor - mixlib-log (3.0.8) - mixlib-shellout (3.0.9) + mixlib-log (3.0.9) + mixlib-shellout (3.1.6) + chef-utils mixlib-versioning (1.2.12) ms_rest (0.7.6) concurrent-ruby (~> 1.0) @@ -319,26 +325,24 @@ GEM faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) - necromancer (0.5.1) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-ssh (6.1.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) - os (1.1.0) + os (1.1.1) parallel (1.19.2) parslet (1.8.2) - pastel (0.7.4) - equatable (~> 0.6) + pastel (0.8.0) tty-color (~> 0.5) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.5) - regexp_parser (1.7.1) + public_suffix (4.0.6) + regexp_parser (1.8.1) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -348,7 +352,7 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) + rspec-core (3.9.3) rspec-support (~> 3.9.3) rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) @@ -369,18 +373,15 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) sslshake (1.3.1) - strings (0.1.8) - strings-ansi (~> 0.1) + strings (0.2.0) + strings-ansi (~> 0.2) unicode-display_width (~> 1.5) unicode_utils (~> 1.4) strings-ansi (0.2.0) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-kitchen (2.5.2) + test-kitchen (2.7.2) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) - license-acceptance (~> 1.0, >= 1.0.11) + license-acceptance (>= 1.0.11, < 3.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 4.0) net-scp (>= 1.1, < 4.0) @@ -393,23 +394,21 @@ GEM thor (1.0.1) thread_safe (0.3.6) timeliness (0.3.10) - tins (1.25.0) - sync tomlrb (1.2.9) - train (3.3.6) + train (3.3.24) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) - docker-api (~> 1.26) - google-api-client (>= 0.23.9, < 0.35.0) - googleauth (>= 0.6.6, < 0.11.0) + docker-api (>= 1.26, < 3.0) + google-api-client (>= 0.23.9, < 0.44.1) + googleauth (>= 0.6.6, < 0.13.1) inifile (~> 3.0) - train-core (= 3.3.6) + train-core (= 3.3.24) train-winrm (~> 0.2) - train-aws (0.1.17) + train-aws (0.1.18) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) aws-sdk-athena (~> 1.0) @@ -440,6 +439,7 @@ GEM aws-sdk-elasticloadbalancingv2 (~> 1.0) aws-sdk-elasticsearchservice (~> 1.0) aws-sdk-firehose (~> 1.0) + aws-sdk-guardduty (~> 1.31) aws-sdk-iam (~> 1.13) aws-sdk-kafka (~> 1.0) aws-sdk-kinesis (~> 1.0) @@ -458,7 +458,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.6) + train-core (3.3.24) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -466,30 +466,28 @@ GEM net-scp (>= 1.2, < 4.0) net-ssh (>= 2.9, < 7.0) train-habitat (0.2.13) - train-winrm (0.2.6) + train-winrm (0.2.11) winrm (~> 2.0) + winrm-elevated (~> 1.2.2) winrm-fs (~> 1.0) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) + tty-box (0.6.0) + pastel (~> 0.8) + strings (~> 0.2.0) tty-cursor (~> 0.7) - tty-color (0.5.1) + tty-color (0.5.2) tty-cursor (0.7.1) - tty-prompt (0.21.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.7.0) - tty-reader (0.7.0) + tty-prompt (0.22.0) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.8.0) tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.8.0) - tty-table (0.11.0) - equatable (~> 0.6) - necromancer (~> 0.5) - pastel (~> 0.7.2) - strings (~> 0.1.5) - tty-screen (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) tzinfo (1.2.7) thread_safe (~> 0.1) uber (0.1.0) @@ -508,7 +506,7 @@ GEM logging (>= 1.6.1, < 3.0) nori (~> 2.0) rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.2.1) + winrm-elevated (1.2.2) erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) @@ -523,9 +521,9 @@ PLATFORMS ruby DEPENDENCIES - kitchen-docker (>= 2.9) - kitchen-inspec (>= 1.1) - kitchen-salt (>= 0.6.0) + kitchen-docker! + kitchen-inspec (>= 2.2.1) + kitchen-salt (>= 0.6.3) BUNDLED WITH 2.1.2 From d95f08dade758f155a31a538ec01c85637c67f95 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Wed, 7 Oct 2020 09:07:35 +0100 Subject: [PATCH 135/139] chore(commitlint): add `{body,footer,header}-max(-line)-length` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/265 --- commitlint.config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/commitlint.config.js b/commitlint.config.js index 2f9d1aa..4eb37f4 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1,3 +1,8 @@ module.exports = { extends: ['@commitlint/config-conventional'], + rules: { + 'body-max-line-length': [2, 'always', 120], + 'footer-max-line-length': [2, 'always', 120], + 'header-max-length': [2, 'always', 72], + }, }; From 92bf43a3b79fa3b1cee0f43de98dd9aac1ea2a6c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 10 Oct 2020 06:49:31 +0100 Subject: [PATCH 136/139] ci(pre-commit): finalise `rstcheck` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/267 --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3dc79fa..0efdb51 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -52,4 +52,5 @@ repos: hooks: - id: rstcheck name: Check reST files using rstcheck + exclude: 'docs/CHANGELOG.rst' args: [--report=warning] From fb3300bc071b882725cda2b2708f079998e763fc Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 20 Oct 2020 10:19:24 +0100 Subject: [PATCH 137/139] chore(gemfile+lock): update to latest gem versions (2020-W43) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/273 --- Gemfile.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5addeb7..f83e4c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.380.0) + aws-partitions (1.383.0) aws-sdk-apigateway (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) @@ -30,13 +30,13 @@ GEM aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.35.0) + aws-sdk-budgets (1.36.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-cloudformation (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.43.0) + aws-sdk-cloudfront (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.27.0) @@ -77,7 +77,7 @@ GEM aws-sdk-dynamodb (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.198.0) + aws-sdk-ec2 (1.200.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.39.0) @@ -89,10 +89,10 @@ GEM aws-sdk-efs (1.36.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.44.0) + aws-sdk-eks (1.45.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.43.0) + aws-sdk-elasticache (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-elasticbeanstalk (1.38.0) @@ -131,7 +131,7 @@ GEM aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.102.0) + aws-sdk-rds (1.104.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-redshift (1.50.0) @@ -146,7 +146,7 @@ GEM aws-sdk-route53resolver (1.21.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.0) + aws-sdk-s3 (1.83.1) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -159,13 +159,13 @@ GEM aws-sdk-sms (1.27.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.32.1) + aws-sdk-sns (1.33.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-sqs (1.34.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.93.0) + aws-sdk-ssm (1.95.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -182,9 +182,9 @@ GEM ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.5.77) + chef-config (16.6.14) addressable - chef-utils (= 16.5.77) + chef-utils (= 16.6.14) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -193,7 +193,7 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.5.77) + chef-utils (16.6.14) coderay (1.1.3) concurrent-ruby (1.1.7) declarative (0.0.20) @@ -208,7 +208,7 @@ GEM regexp_parser (~> 1.2) ed25519 (1.2.4) erubi (1.9.0) - excon (0.76.0) + excon (0.78.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) @@ -342,7 +342,7 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) - regexp_parser (1.8.1) + regexp_parser (1.8.2) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -395,7 +395,7 @@ GEM thread_safe (0.3.6) timeliness (0.3.10) tomlrb (1.2.9) - train (3.3.24) + train (3.3.27) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -406,7 +406,7 @@ GEM google-api-client (>= 0.23.9, < 0.44.1) googleauth (>= 0.6.6, < 0.13.1) inifile (~> 3.0) - train-core (= 3.3.24) + train-core (= 3.3.27) train-winrm (~> 0.2) train-aws (0.1.18) aws-sdk-apigateway (~> 1.0) @@ -458,7 +458,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.24) + train-core (3.3.27) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -497,7 +497,7 @@ GEM unicode-display_width (1.7.0) unicode_utils (1.4.0) uri_template (0.7.0) - winrm (2.3.4) + winrm (2.3.5) builder (>= 2.1.2) erubi (~> 1.8) gssapi (~> 1.2) From 9b8a21f1074698d99650e6463825308b75b92c0e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 26 Oct 2020 22:51:14 +0000 Subject: [PATCH 138/139] chore(gemfile+lock): update to latest gem versions (2020-W44) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/274 --- Gemfile | 5 +++++ Gemfile.lock | 39 ++++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index f18b9e9..82c4a31 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,11 @@ source 'https://rubygems.org' +# Use the latest version of `inspec` prior to `4.23.4`, which introduces a +# regression where the diff isn't displayed when comparing using `eq`. +gem 'inspec', '~> 4.22.22' +# Install the `kitchen-docker` gem from GitHub because the latest version +# currently available (`2.10.0`) doesn't include a recent fix for Gentoo. gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe' gem 'kitchen-inspec', '>= 2.2.1' gem 'kitchen-salt', '>= 0.6.3' diff --git a/Gemfile.lock b/Gemfile.lock index f83e4c9..19bf26d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.383.0) + aws-partitions (1.386.0) aws-sdk-apigateway (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) @@ -36,7 +36,7 @@ GEM aws-sdk-cloudformation (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.44.0) + aws-sdk-cloudfront (1.46.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.27.0) @@ -77,7 +77,7 @@ GEM aws-sdk-dynamodb (1.55.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.200.0) + aws-sdk-ec2 (1.202.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-ecr (1.39.0) @@ -95,7 +95,7 @@ GEM aws-sdk-elasticache (1.44.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.38.0) + aws-sdk-elasticbeanstalk (1.39.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-elasticloadbalancing (1.29.0) @@ -159,7 +159,7 @@ GEM aws-sdk-sms (1.27.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.33.0) + aws-sdk-sns (1.34.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) aws-sdk-sqs (1.34.0) @@ -209,13 +209,13 @@ GEM ed25519 (1.2.4) erubi (1.9.0) excon (0.78.0) - faraday (1.0.1) + faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday_middleware (1.0.0) - faraday (~> 1.0) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) ffi (1.13.1) ffi-yajl (2.3.4) libyajl2 (~> 1.2) @@ -247,20 +247,20 @@ GEM i18n (1.8.5) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.23.11) - faraday_middleware (>= 0.12.2, < 1.1) - inspec-core (= 4.23.11) + inspec (4.22.22) + faraday_middleware (~> 0.12.2) + inspec-core (= 4.22.22) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.23.11) + inspec-core (4.22.22) addressable (~> 2.4) chef-telemetry (~> 1.0) - faraday (>= 0.9.0, < 1.1) + faraday (>= 0.9.0) hashie (~> 3.4) json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 3.0) + license-acceptance (>= 0.2.13, < 2.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) @@ -293,11 +293,11 @@ GEM hashie (>= 3.5) test-kitchen (>= 1.4) libyajl2 (1.2.0) - license-acceptance (2.1.2) + license-acceptance (1.0.19) pastel (~> 0.7) tomlrb (~> 1.2) - tty-box (~> 0.6) - tty-prompt (~> 0.20) + tty-box (~> 0.3) + tty-prompt (~> 0.18) little-plugger (1.1.4) logging (2.3.0) little-plugger (~> 1.1) @@ -354,7 +354,7 @@ GEM rspec-mocks (~> 3.9.0) rspec-core (3.9.3) rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec-expectations (3.9.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-its (1.3.0) @@ -363,7 +363,7 @@ GEM rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.3) + rspec-support (3.9.4) rubyntlm (0.6.2) rubyzip (1.3.0) semverse (3.0.0) @@ -521,6 +521,7 @@ PLATFORMS ruby DEPENDENCIES + inspec (~> 4.22.22) kitchen-docker! kitchen-inspec (>= 2.2.1) kitchen-salt (>= 0.6.3) From d57fd8318614e4a7ac29ffffeabd81eb6115685e Mon Sep 17 00:00:00 2001 From: N Date: Thu, 3 Dec 2020 23:28:38 +0000 Subject: [PATCH 139/139] Update server.sls --- mysql/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/server.sls b/mysql/server.sls index d1375ed..d1d451e 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -59,7 +59,7 @@ mysql_password_debconf: {% else %} mysql_password_debconf: debconf.set: - - name: {{ mysql.serverpkg }} + - name: mysql-server - data: '{{ mysql.serverpkg }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} '{{ mysql.serverpkg }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'}