From 094a5e78ac9d0be0d3f9ede4629c4878a550d36f Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Thu, 17 Aug 2023 17:05:18 +0200 Subject: [PATCH 01/12] modulesync 7.0.0 --- .github/CONTRIBUTING.md | 11 +++++++---- .msync.yml | 2 +- Gemfile | 2 +- spec/spec_helper.rb | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8b466cfb..6aaa603f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this with: ```sh -BEAKER_setfile=debian11-64 bundle exec rake beaker +BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker ``` -You can replace the string `debian10` with any common operating system. +You can replace the string `debian11` with any common operating system. The following strings are known to work: -* ubuntu1804 * ubuntu2004 -* debian10 +* ubuntu2204 * debian11 * centos7 * centos8 +* centos9 +* almalinux8 +* almalinux9 +* fedora36 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests). diff --git a/.msync.yml b/.msync.yml index b929160c..dd3e9572 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '6.0.0' +modulesync_config_version: '7.0.0' diff --git a/Gemfile b/Gemfile index 488e1f83..89f86dc1 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 6.0', :require => false + gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 3.0', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6515b7bf..9efb4ae6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,3 +17,4 @@ add_custom_fact name.to_sym, value end end +Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f } From c7a95ce6440b1219b2a615e24765b4283682b873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Thu, 17 Aug 2023 15:50:53 -1000 Subject: [PATCH 02/12] Auto-correct rubocop offenses --- lib/puppet/provider/proxy_cluster/proxysql.rb | 18 ++++++------ .../proxy_mysql_galera_hostgroup/proxysql.rb | 2 +- .../proxysql.rb | 28 +++++++++---------- .../proxy_mysql_query_rule/proxysql.rb | 12 ++++---- .../proxysql.rb | 12 ++++---- .../provider/proxy_mysql_server/proxysql.rb | 24 ++++++++-------- .../proxysql.rb | 20 ++++++------- .../provider/proxy_mysql_user/proxysql.rb | 8 +++--- lib/puppet/provider/proxysql.rb | 2 +- 9 files changed, 63 insertions(+), 63 deletions(-) diff --git a/lib/puppet/provider/proxy_cluster/proxysql.rb b/lib/puppet/provider/proxy_cluster/proxysql.rb index 5b2fa667..fc3e15e0 100644 --- a/lib/puppet/provider/proxy_cluster/proxysql.rb +++ b/lib/puppet/provider/proxy_cluster/proxysql.rb @@ -21,9 +21,9 @@ def self.instances # one big swoop. servers.each do |line| hostname, port = line.split(%r{\t}) - query = 'SELECT `hostname`, `port`, `weight`, `comment`' \ - ' FROM `proxysql_servers`' \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port}" + query = 'SELECT `hostname`, `port`, `weight`, `comment` ' \ + 'FROM `proxysql_servers` ' \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port}" @hostname, @port, @weight, @comment = mysql([defaults_file, '-NBe', query].compact).chomp.split(%r{\t}) name = "#{hostname}:#{port}" @@ -58,8 +58,8 @@ def create weight = @resource.value(:weight) || 0 comment = @resource.value(:comment) || '' - query = 'INSERT INTO proxysql_servers (`hostname`, `port`, `weight`, `comment`)' \ - " VALUES ('#{hostname}', #{port}, #{weight}, '#{comment}')" + query = 'INSERT INTO proxysql_servers (`hostname`, `port`, `weight`, `comment`) ' \ + "VALUES ('#{hostname}', #{port}, #{weight}, '#{comment}')" mysql([defaults_file, '-e', query].compact) @property_hash[:ensure] = :present @@ -69,8 +69,8 @@ def create def destroy hostname = @property_hash[:hostname] port = @property_hash[:port] - query = 'DELETE FROM `proxysql_servers`' \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port}" + query = 'DELETE FROM `proxysql_servers` ' \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -108,8 +108,8 @@ def update_server(properties) values.push("`#{field}` = '#{value}'") end - query = "UPDATE proxysql_servers SET #{values.join(', ')}" \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port}" + query = "UPDATE proxysql_servers SET #{values.join(', ')} " \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port}" mysql([defaults_file, '-e', query].compact) @property_hash.clear diff --git a/lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb b/lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb index 0c9954d8..2a273adb 100644 --- a/lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb @@ -54,7 +54,7 @@ def self.prefetch(resources) end def create - query_parameters = self.class.db_fields.map { |param| [param, resource[param]] }.to_h.compact + query_parameters = self.class.db_fields.to_h { |param| [param, resource[param]] }.compact columns = query_parameters.keys.map { |k| "`#{k}`" }.join(',') values = query_parameters.values.map { |value| make_sql_value(value) }.join(',') diff --git a/lib/puppet/provider/proxy_mysql_group_replication_hostgroup/proxysql.rb b/lib/puppet/provider/proxy_mysql_group_replication_hostgroup/proxysql.rb index 643a99fc..c18f6a33 100644 --- a/lib/puppet/provider/proxy_mysql_group_replication_hostgroup/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_group_replication_hostgroup/proxysql.rb @@ -57,8 +57,8 @@ def create max_transactions_behind = @resource.value(:max_transactions_behind) || 0 comment = @resource.value(:comment) || '' - query = 'INSERT INTO `mysql_group_replication_hostgroups` (`writer_hostgroup`, `backup_writer_hostgroup`, `reader_hostgroup`, `offline_hostgroup`, `active`, `max_writers`, `writer_is_also_reader`, `max_transactions_behind`, `comment`)' \ - " VALUES (#{writer_hostgroup}, #{backup_writer_hostgroup}, #{reader_hostgroup}, #{offline_hostgroup}, #{active}, #{max_writers}, #{writer_is_also_reader}, #{max_transactions_behind}, '#{comment}')" + query = 'INSERT INTO `mysql_group_replication_hostgroups` (`writer_hostgroup`, `backup_writer_hostgroup`, `reader_hostgroup`, `offline_hostgroup`, `active`, `max_writers`, `writer_is_also_reader`, `max_transactions_behind`, `comment`) ' \ + "VALUES (#{writer_hostgroup}, #{backup_writer_hostgroup}, #{reader_hostgroup}, #{offline_hostgroup}, #{active}, #{max_writers}, #{writer_is_also_reader}, #{max_transactions_behind}, '#{comment}')" mysql([defaults_file, '-e', query].compact) @property_hash[:ensure] = :present @@ -70,8 +70,8 @@ def destroy backup_writer_hostgroup = @resource.value(:backup_writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) offline_hostgroup = @resource.value(:offline_hostgroup) - query = 'DELETE FROM `mysql_group_replication_hostgroups`' \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" + query = 'DELETE FROM `mysql_group_replication_hostgroups` ' \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -99,8 +99,8 @@ def active=(value) backup_writer_hostgroup = @resource.value(:backup_writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) offline_hostgroup = @resource.value(:offline_hostgroup) - query = "UPDATE mysql_group_replication_hostgroups SET `active` = #{value}" \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" + query = "UPDATE mysql_group_replication_hostgroups SET `active` = #{value} " \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -111,8 +111,8 @@ def max_writers=(value) backup_writer_hostgroup = @resource.value(:backup_writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) offline_hostgroup = @resource.value(:offline_hostgroup) - query = "UPDATE mysql_group_replication_hostgroups SET `max_writers=` = #{value}" \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" + query = "UPDATE mysql_group_replication_hostgroups SET `max_writers=` = #{value} " \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -123,8 +123,8 @@ def writer_is_also_reader=(value) backup_writer_hostgroup = @resource.value(:backup_writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) offline_hostgroup = @resource.value(:offline_hostgroup) - query = "UPDATE mysql_group_replication_hostgroups SET `writer_is_also_reader` = #{value}" \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" + query = "UPDATE mysql_group_replication_hostgroups SET `writer_is_also_reader` = #{value} " \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -135,8 +135,8 @@ def max_transactions_behind=(value) backup_writer_hostgroup = @resource.value(:backup_writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) offline_hostgroup = @resource.value(:offline_hostgroup) - query = "UPDATE mysql_group_replication_hostgroups SET `max_transactions_behind=` = #{value}" \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" + query = "UPDATE mysql_group_replication_hostgroups SET `max_transactions_behind=` = #{value} " \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -147,8 +147,8 @@ def comment=(value) backup_writer_hostgroup = @resource.value(:backup_writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) offline_hostgroup = @resource.value(:offline_hostgroup) - query = "UPDATE mysql_group_replication_hostgroups SET `comment` = '#{value}'" \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" + query = "UPDATE mysql_group_replication_hostgroups SET `comment` = '#{value}' " \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `backup_writer_hostgroup` = #{backup_writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup} AND `offline_hostgroup` = #{offline_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear diff --git a/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb b/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb index 93d67b38..650fdfac 100644 --- a/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb @@ -22,12 +22,12 @@ def self.instances # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. rules.map do |rule_id| - query = 'SELECT `active`, `username`, `schemaname`, `flagIN`, `flagOUT`, `apply`, ' \ - ' `client_addr`, `proxy_addr`, `proxy_port`, `destination_hostgroup`, ' \ - ' `digest`, `match_digest`, `match_pattern`, `negate_match_pattern`, `replace_pattern`, ' \ - ' `cache_ttl`, `reconnect`, `timeout`, `retries`, `delay`, `error_msg`, `log`, `comment`, ' \ - ' `mirror_flagOUT`, `mirror_hostgroup`' \ - " FROM `mysql_query_rules` WHERE rule_id = '#{rule_id}'" + query = 'SELECT `active`, `username`, `schemaname`, `flagIN`, `flagOUT`, `apply`, ' \ + '`client_addr`, `proxy_addr`, `proxy_port`, `destination_hostgroup`, ' \ + '`digest`, `match_digest`, `match_pattern`, `negate_match_pattern`, `replace_pattern`, ' \ + '`cache_ttl`, `reconnect`, `timeout`, `retries`, `delay`, `error_msg`, `log`, `comment`, ' \ + '`mirror_flagOUT`, `mirror_hostgroup` ' \ + "FROM `mysql_query_rules` WHERE rule_id = '#{rule_id}'" @active, @username, @schemaname, @flag_in, @flag_out, @apply, @client_addr, @proxy_addr, @proxy_port, @destination_hostgroup, diff --git a/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb b/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb index fbeed3a6..a74b93b5 100644 --- a/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb @@ -45,8 +45,8 @@ def create reader_hostgroup = @resource.value(:reader_hostgroup) comment = @resource.value(:comment) || '' - query = 'INSERT INTO `mysql_replication_hostgroups` (`writer_hostgroup`, `reader_hostgroup`, `comment`)' \ - " VALUES (#{writer_hostgroup}, #{reader_hostgroup}, '#{comment}')" + query = 'INSERT INTO `mysql_replication_hostgroups` (`writer_hostgroup`, `reader_hostgroup`, `comment`) ' \ + "VALUES (#{writer_hostgroup}, #{reader_hostgroup}, '#{comment}')" mysql([defaults_file, '-e', query].compact) @property_hash[:ensure] = :present @@ -56,8 +56,8 @@ def create def destroy writer_hostgroup = @resource.value(:writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) - query = 'DELETE FROM `mysql_replication_hostgroups`' \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup}" + query = 'DELETE FROM `mysql_replication_hostgroups` ' \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -83,8 +83,8 @@ def flush def comment=(value) writer_hostgroup = @resource.value(:writer_hostgroup) reader_hostgroup = @resource.value(:reader_hostgroup) - query = "UPDATE mysql_replication_hostgroups SET `comment` = '#{value}'" \ - " WHERE `writer_hostgroup` = #{writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup}" + query = "UPDATE mysql_replication_hostgroups SET `comment` = '#{value}' " \ + "WHERE `writer_hostgroup` = #{writer_hostgroup} AND `reader_hostgroup` = #{reader_hostgroup}" mysql([defaults_file, '-e', query].compact) @property_hash.clear diff --git a/lib/puppet/provider/proxy_mysql_server/proxysql.rb b/lib/puppet/provider/proxy_mysql_server/proxysql.rb index a8669a4e..4010664f 100644 --- a/lib/puppet/provider/proxy_mysql_server/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_server/proxysql.rb @@ -16,10 +16,10 @@ def self.instances # one big swoop. servers.each do |line| hostname, port, hostgroup_id = line.split(%r{\t}) - query = 'SELECT `hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ - ' `max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment` ' \ - ' FROM `mysql_servers`' \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port} AND `hostgroup_id` = '#{hostgroup_id}'" + query = 'SELECT `hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ + '`max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment` ' \ + 'FROM `mysql_servers` ' \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port} AND `hostgroup_id` = '#{hostgroup_id}'" @hostname, @port, @hostgroup_id, @status, @weight, @compression, @max_connections, @max_replication_lag, @use_ssl, @max_latency_ms, @@ -69,10 +69,10 @@ def create max_latency_ms = @resource.value(:max_latency_ms) || 0 comment = @resource.value(:comment) || '' - query = 'INSERT INTO mysql_servers (`hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ - ' `max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment`)' \ - " VALUES ('#{hostname}', #{port}, #{hostgroup_id}, '#{status}', #{weight}, #{compression}, " \ - " #{max_connections}, #{max_replication_lag}, #{use_ssl}, #{max_latency_ms}, '#{comment}')" + query = 'INSERT INTO mysql_servers (`hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ + '`max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment`) ' \ + "VALUES ('#{hostname}', #{port}, #{hostgroup_id}, '#{status}', #{weight}, #{compression}, " \ + "#{max_connections}, #{max_replication_lag}, #{use_ssl}, #{max_latency_ms}, '#{comment}')" mysql([defaults_file, '-e', query].compact) @property_hash[:ensure] = :present @@ -83,8 +83,8 @@ def destroy hostname = @resource.value(:hostname) port = @resource.value(:port) hostgroup_id = @resource.value(:hostgroup_id) - query = 'DELETE FROM `mysql_servers`' \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port} AND `hostgroup_id` = '#{hostgroup_id}'" + query = 'DELETE FROM `mysql_servers` ' \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port} AND `hostgroup_id` = '#{hostgroup_id}'" mysql([defaults_file, '-e', query].compact) @property_hash.clear @@ -123,8 +123,8 @@ def update_server(properties) values.push("`#{field}` = '#{value}'") end - query = "UPDATE mysql_servers SET #{values.join(', ')}" \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port} AND `hostgroup_id` = '#{hostgroup_id}'" + query = "UPDATE mysql_servers SET #{values.join(', ')} " \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port} AND `hostgroup_id` = '#{hostgroup_id}'" mysql([defaults_file, '-e', query].compact) @property_hash.clear diff --git a/lib/puppet/provider/proxy_mysql_server_no_hostgroup/proxysql.rb b/lib/puppet/provider/proxy_mysql_server_no_hostgroup/proxysql.rb index 0631ec22..905e8829 100644 --- a/lib/puppet/provider/proxy_mysql_server_no_hostgroup/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_server_no_hostgroup/proxysql.rb @@ -16,10 +16,10 @@ def self.instances # one big swoop. servers.each do |line| hostname, port = line.split(%r{\t}) - query = 'SELECT `hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ - ' `max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment` ' \ - ' FROM `mysql_servers`' \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port}" + query = 'SELECT `hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ + '`max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment` ' \ + 'FROM `mysql_servers` ' \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port}" @hostname, @port, @hostgroup_id, @status, @weight, @compression, @max_connections, @max_replication_lag, @use_ssl, @max_latency_ms, @@ -69,10 +69,10 @@ def create max_latency_ms = @resource.value(:max_latency_ms) || 0 comment = @resource.value(:comment) || '' - query = 'INSERT INTO mysql_servers (`hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ - ' `max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment`)' \ - " VALUES ('#{hostname}', #{port}, #{hostgroup_id}, '#{status}', #{weight}, #{compression}, " \ - " #{max_connections}, #{max_replication_lag}, #{use_ssl}, #{max_latency_ms}, '#{comment}')" + query = 'INSERT INTO mysql_servers (`hostname`, `port`, `hostgroup_id`, `status`, `weight`, `compression`, ' \ + '`max_connections`, `max_replication_lag`, `use_ssl`, `max_latency_ms`, `comment`) ' \ + "VALUES ('#{hostname}', #{port}, #{hostgroup_id}, '#{status}', #{weight}, #{compression}, " \ + "#{max_connections}, #{max_replication_lag}, #{use_ssl}, #{max_latency_ms}, '#{comment}')" mysql([defaults_file, '-e', query].compact) @property_hash[:ensure] = :present @@ -121,8 +121,8 @@ def update_server(properties) values.push("`#{field}` = '#{value}'") end - query = "UPDATE mysql_servers SET #{values.join(', ')}" \ - " WHERE `hostname` = '#{hostname}' AND `port` = #{port}" + query = "UPDATE mysql_servers SET #{values.join(', ')} " \ + "WHERE `hostname` = '#{hostname}' AND `port` = #{port}" mysql([defaults_file, '-e', query].compact) @property_hash.clear diff --git a/lib/puppet/provider/proxy_mysql_user/proxysql.rb b/lib/puppet/provider/proxy_mysql_user/proxysql.rb index ac55ba8b..97554b42 100644 --- a/lib/puppet/provider/proxy_mysql_user/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_user/proxysql.rb @@ -61,10 +61,10 @@ def create frontend = @resource.value(:frontend) || 1 max_connections = @resource.value(:max_connections) || 10_000 - query = 'INSERT INTO mysql_users (`username`, `password`, `active`, `use_ssl`, `default_hostgroup`, `default_schema`, ' \ - ' `schema_locked`, `transaction_persistent`, `fast_forward`, `backend`, `frontend`, `max_connections`) ' \ - " VALUES ('#{name}', '#{password}', #{active}, #{use_ssl}, #{default_hostgroup}, '#{default_schema}', " \ - " #{schema_locked}, #{transaction_persistent}, #{fast_forward}, #{backend}, #{frontend}, #{max_connections})" + query = 'INSERT INTO mysql_users (`username`, `password`, `active`, `use_ssl`, `default_hostgroup`, `default_schema`, ' \ + '`schema_locked`, `transaction_persistent`, `fast_forward`, `backend`, `frontend`, `max_connections`) ' \ + "VALUES ('#{name}', '#{password}', #{active}, #{use_ssl}, #{default_hostgroup}, '#{default_schema}', " \ + "#{schema_locked}, #{transaction_persistent}, #{fast_forward}, #{backend}, #{frontend}, #{max_connections})" mysql([defaults_file, '-e', query].compact) @property_hash[:ensure] = :present diff --git a/lib/puppet/provider/proxysql.rb b/lib/puppet/provider/proxysql.rb index d2d8d1a5..20bdbbcc 100644 --- a/lib/puppet/provider/proxysql.rb +++ b/lib/puppet/provider/proxysql.rb @@ -5,7 +5,7 @@ class Puppet::Provider::Proxysql < Puppet::Provider initvars # Make sure we find mysql commands on CentOS and FreeBSD - ENV['PATH'] = "#{ENV['PATH']}:/usr/libexec:/usr/local/libexec:/usr/local/bin" + ENV['PATH'] = "#{ENV.fetch('PATH', nil)}:/usr/libexec:/usr/local/libexec:/usr/local/bin" commands mysql: 'mysql' From 66e38ca1819ef450f54cae9acf1f7c1d57eb4e9d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 18 Aug 2023 08:35:16 +0200 Subject: [PATCH 03/12] rubocop: autofix --- .rubocop.yml | 2 ++ .rubocop_todo.yml | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 .rubocop_todo.yml diff --git a/.rubocop.yml b/.rubocop.yml index 53ac1898..ea22bff8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,6 @@ --- +inherit_from: .rubocop_todo.yml + # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 00000000..5fe1d341 --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,13 @@ +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2023-08-17 21:37:00 UTC using RuboCop version 1.50.2. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 1 +# This cop supports unsafe autocorrection (--autocorrect-all). +Style/MapToHash: + Exclude: + - 'lib/puppet/provider/proxy_mysql_galera_hostgroup/proxysql.rb' From 2b803278186c1326deccf47dccf239400224409a Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 15 Dec 2023 13:29:33 +0100 Subject: [PATCH 04/12] modulesync 7.2.0 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .msync.yml | 2 +- .pmtignore | 1 + .rubocop.yml | 3 +-- Gemfile | 8 +++----- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48fcfeae..be95f1df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,6 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: pidfile_workaround: 'CentOS' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15f17213..55324aa6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index dd3e9572..f8183449 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.0.0' +modulesync_config_version: '7.2.0' diff --git a/.pmtignore b/.pmtignore index 58a04088..10b98306 100644 --- a/.pmtignore +++ b/.pmtignore @@ -35,3 +35,4 @@ /.yardoc/ /.yardopts /Dockerfile +/HISTORY.md diff --git a/.rubocop.yml b/.rubocop.yml index ea22bff8..fded90cf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,8 +1,7 @@ --- -inherit_from: .rubocop_todo.yml - # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ +inherit_from: .rubocop_todo.yml inherit_gem: voxpupuli-test: rubocop.yml diff --git a/Gemfile b/Gemfile index 89f86dc1..c03b7520 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ group :test do gem 'voxpupuli-test', '~> 7.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 3.0', :require => false + gem 'puppet_metadata', '~> 3.5', :require => false gem 'puppet-lint-param-docs', :require => false end @@ -17,13 +17,11 @@ group :development do end group :system_tests do - gem 'voxpupuli-acceptance', '~> 2.0', :require => false + gem 'voxpupuli-acceptance', '~> 3.0', :require => false end group :release do - gem 'github_changelog_generator', '>= 1.16.1', :require => false - gem 'voxpupuli-release', '~> 3.0', :require => false - gem 'faraday-retry', '~> 2.1', :require => false + gem 'voxpupuli-release', '~> 3.0', :require => false end gem 'rake', :require => false From 92d99e695cab810299a0d7e0de04c323a0636f4d Mon Sep 17 00:00:00 2001 From: markuszilch Date: Tue, 6 Feb 2024 12:38:57 +0100 Subject: [PATCH 05/12] modulesync 7.3.0 --- .github/workflows/ci.yml | 7 ++++++- .msync.yml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be95f1df..cf4c56b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,12 @@ name: CI -on: pull_request +on: + pull_request: {} + push: + branches: + - main + - master concurrency: group: ${{ github.ref_name }} diff --git a/.msync.yml b/.msync.yml index f8183449..f46ee025 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.2.0' +modulesync_config_version: '7.3.0' From 914da01ee073ffc242f901db12dd3d377182e17b Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 12 Apr 2024 13:44:07 +0200 Subject: [PATCH 06/12] modulesync 7.4.0 --- .github/CONTRIBUTING.md | 16 +++++++++++++--- .gitignore | 2 ++ .msync.yml | 2 +- Dockerfile | 24 ------------------------ 4 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 Dockerfile diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6aaa603f..88093274 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by running: ```sh -bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)" +bundle config set --local path '.vendor/' +bundle config set --local without 'development system_tests release' +bundle install --jobs "$(nproc)" ``` If you also want to run acceptance tests: ```sh -bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)" +bundle config set --local path '.vendor/' +bundle config set --local without 'development release' +bundle config set --local with 'system_tests' +bundle install --jobs "$(nproc)" ``` Our all in one solution if you don't know if you need to install or update gems: ```sh -bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean +bundle config set --local path '.vendor/' +bundle config set --local without 'development release' +bundle config set --local with 'system_tests' +bundle install --jobs "$(nproc)" +bundle update +bundle clean ``` As an alternative to the `--jobs "$(nproc)` parameter, you can set an diff --git a/.gitignore b/.gitignore index 84fd904c..adea1b01 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ .*.sw? /.yardoc/ /Guardfile +bolt-debug.log +.rerun.json diff --git a/.msync.yml b/.msync.yml index f46ee025..28b61dcf 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.3.0' +modulesync_config_version: '7.4.0' diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8dd82d63..00000000 --- a/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# MANAGED BY MODULESYNC -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - -FROM ruby:2.7 - -WORKDIR /opt/puppet - -# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39 -RUN mkdir -p /etc/sv - -ARG PUPPET_GEM_VERSION="~> 6.0" -ARG PARALLEL_TEST_PROCESSORS=4 - -# Cache gems -COPY Gemfile . -RUN bundle install --without system_tests development release --path=${BUNDLE_PATH:-vendor/bundle} - -COPY . . - -RUN bundle install -RUN bundle exec rake release_checks - -# Container should not saved -RUN exit 1 From 64dfe1af012667a4def35fa54bdc629459546442 Mon Sep 17 00:00:00 2001 From: markuszilch Date: Thu, 25 Apr 2024 17:23:01 +0200 Subject: [PATCH 07/12] modulesync 7.5.0 --- .msync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.msync.yml b/.msync.yml index 28b61dcf..ade23f9e 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.4.0' +modulesync_config_version: '7.5.0' From 43b18df7472526fdb2d491dd574549bb496c6e57 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 3 Jun 2024 18:54:41 +0200 Subject: [PATCH 08/12] modulesync 8.0.1 --- .github/workflows/ci.yml | 2 -- .msync.yml | 2 +- .overcommit.yml | 8 +++++--- .rspec | 5 ----- .rspec_parallel | 4 ---- Gemfile | 4 ++-- 6 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 .rspec delete mode 100644 .rspec_parallel diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf4c56b1..1f82c4c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,5 +19,3 @@ jobs: puppet: name: Puppet uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 - with: - pidfile_workaround: 'CentOS' diff --git a/.msync.yml b/.msync.yml index ade23f9e..876cb3b0 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '7.5.0' +modulesync_config_version: '8.0.1' diff --git a/.overcommit.yml b/.overcommit.yml index d367adae..4ed994cc 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -43,10 +43,12 @@ PreCommit: enabled: true description: 'Runs rubocop on modified files only' command: ['bundle', 'exec', 'rubocop'] - PuppetLint: + RakeTarget: enabled: true - description: 'Runs puppet-lint on modified files only' - command: ['bundle', 'exec', 'puppet-lint'] + description: 'Runs lint on modified files only' + targets: + - 'lint' + command: ['bundle', 'exec', 'rake'] YamlSyntax: enabled: true JsonSyntax: diff --git a/.rspec b/.rspec deleted file mode 100644 index f634583d..00000000 --- a/.rspec +++ /dev/null @@ -1,5 +0,0 @@ -# Managed by modulesync - DO NOT EDIT -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - ---format documentation ---color diff --git a/.rspec_parallel b/.rspec_parallel deleted file mode 100644 index a9a84f85..00000000 --- a/.rspec_parallel +++ /dev/null @@ -1,4 +0,0 @@ -# Managed by modulesync - DO NOT EDIT -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - ---format progress diff --git a/Gemfile b/Gemfile index c03b7520..b9bcb6b8 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 7.0', :require => false + gem 'voxpupuli-test', '~> 7.2', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false - gem 'puppet_metadata', '~> 3.5', :require => false + gem 'puppet_metadata', '~> 4.0', :require => false gem 'puppet-lint-param-docs', :require => false end From 8ad9ad7cf8653998cb528f587cec34b439d90b31 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 12 Jun 2024 11:39:09 +0200 Subject: [PATCH 09/12] modulesync 9.0.0 --- .github/labeler.yml | 3 +++ .msync.yml | 2 +- Gemfile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .github/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000..7899de84 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,3 @@ +--- +skip-changelog: + - head-branch: ['^release-*', 'release'] diff --git a/.msync.yml b/.msync.yml index 876cb3b0..36071685 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '8.0.1' +modulesync_config_version: '9.0.0' diff --git a/Gemfile b/Gemfile index b9bcb6b8..7050aeb0 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 7.2', :require => false + gem 'voxpupuli-test', '~> 8.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 4.0', :require => false From ee6256066553a8bc88088df2cb022668012221f4 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 9 Jul 2024 16:18:54 +0200 Subject: [PATCH 10/12] modulesync 9.1.0 --- .github/CONTRIBUTING.md | 12 ++++++++-- .github/labeler.yml | 3 +++ .github/release.yml | 42 +++++++++++++++++++++++++++++++++++ .github/workflows/labeler.yml | 17 ++++++++++++++ .github/workflows/release.yml | 7 ++++++ .msync.yml | 2 +- .puppet-lint.rc | 3 +++ Gemfile | 2 +- spec/spec_helper.rb | 4 ++++ 9 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 .github/release.yml create mode 100644 .github/workflows/labeler.yml diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 88093274..daceb642 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -245,15 +245,23 @@ with: BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker ``` +or + +```sh +BEAKER_PUPPET_COLLECTION=none BEAKER_setfile=archlinux-64 bundle exec rake beaker +``` + +This latter example will use the distribution's own version of Puppet. + You can replace the string `debian11` with any common operating system. The following strings are known to work: * ubuntu2004 * ubuntu2204 * debian11 -* centos7 -* centos8 +* debian12 * centos9 +* archlinux * almalinux8 * almalinux9 * fedora36 diff --git a/.github/labeler.yml b/.github/labeler.yml index 7899de84..f2d08d6b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,6 @@ --- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + skip-changelog: - head-branch: ['^release-*', 'release'] diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000..f5b5d7a9 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,42 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes + +changelog: + exclude: + labels: + - duplicate + - invalid + - modulesync + - question + - skip-changelog + - wont-fix + - wontfix + + categories: + - title: Breaking Changes 🛠 + labels: + - backwards-incompatible + + - title: New Features 🎉 + labels: + - enhancement + + - title: Bug Fixes 🐛 + labels: + - bug + + - title: Documentation Updates 📚 + labels: + - documentation + - docs + + - title: Dependency Updates ⬆️ + labels: + - dependencies + + - title: Other Changes + labels: + - "*" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 00000000..66127cd0 --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,17 @@ +--- +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + +name: "Pull Request Labeler" + +on: + pull_request_target: {} + +jobs: + labeler: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55324aa6..93b33c2b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,3 +20,10 @@ jobs: # https://docs.github.com/en/actions/security-guides/encrypted-secrets username: ${{ secrets.PUPPET_FORGE_USERNAME }} api_key: ${{ secrets.PUPPET_FORGE_API_KEY }} + + create-github-release: + name: Create GitHub Release + runs-on: ubuntu-latest + steps: + - name: Create GitHub release + uses: voxpupuli/gha-create-a-github-release@v1 diff --git a/.msync.yml b/.msync.yml index 36071685..95e8c977 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.0.0' +modulesync_config_version: '9.1.0' diff --git a/.puppet-lint.rc b/.puppet-lint.rc index dd8272c7..05d28a26 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,3 +1,6 @@ +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ + --fail-on-warnings --no-parameter_documentation-check --no-parameter_types-check diff --git a/Gemfile b/Gemfile index 7050aeb0..926cec48 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' group :test do - gem 'voxpupuli-test', '~> 8.0', :require => false + gem 'voxpupuli-test', '~> 9.0', :require => false gem 'coveralls', :require => false gem 'simplecov-console', :require => false gem 'puppet_metadata', '~> 4.0', :require => false diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9efb4ae6..58c9b66a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,6 +9,10 @@ require 'voxpupuli/test/spec_helper' +RSpec.configure do |c| + c.facterdb_string_keys = false +end + add_mocked_facts! if File.exist?(File.join(__dir__, 'default_module_facts.yml')) From 4f01ad33bc2c9109493aae1c47926a0f7c38dc1c Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 13 Sep 2024 14:52:41 +0200 Subject: [PATCH 11/12] modulesync 9.2.0 --- .github/workflows/ci.yml | 3 ++- .github/workflows/labeler.yml | 1 + .github/workflows/release.yml | 1 + .msync.yml | 2 +- .pmtignore | 1 + Gemfile | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f82c4c9..8c32acf9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ name: CI +# yamllint disable-line rule:truthy on: pull_request: {} push: @@ -18,4 +19,4 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 66127cd0..73be88dc 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -4,6 +4,7 @@ name: "Pull Request Labeler" +# yamllint disable-line rule:truthy on: pull_request_target: {} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93b33c2b..1b147750 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ name: Release +# yamllint disable-line rule:truthy on: push: tags: diff --git a/.msync.yml b/.msync.yml index 95e8c977..8606f6ec 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.1.0' +modulesync_config_version: '9.2.0' diff --git a/.pmtignore b/.pmtignore index 10b98306..a9d37aa0 100644 --- a/.pmtignore +++ b/.pmtignore @@ -20,6 +20,7 @@ /.github/ /.librarian/ /Puppetfile.lock +/Puppetfile *.iml /.editorconfig /.fixtures.yml diff --git a/Gemfile b/Gemfile index 926cec48..da948e9d 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ end gem 'rake', :require => false gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test] -puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24' +puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"] gem 'puppet', puppetversion, :require => false, :groups => [:test] # vim: syntax=ruby From 1599b9c440eb6b9f210f7bc273471530f3e38134 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Mon, 16 Sep 2024 20:58:26 +0200 Subject: [PATCH 12/12] modulesync 9.3.0 --- .github/workflows/release.yml | 2 +- .msync.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b147750..4adf65cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ on: jobs: release: name: Release - uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2 + uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3 with: allowed_owner: 'voxpupuli' secrets: diff --git a/.msync.yml b/.msync.yml index 8606f6ec..ac84b45d 100644 --- a/.msync.yml +++ b/.msync.yml @@ -2,4 +2,4 @@ # Managed by modulesync - DO NOT EDIT # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -modulesync_config_version: '9.2.0' +modulesync_config_version: '9.3.0'