diff --git a/lib/puppet/provider/proxy_global_variable/proxysql.rb b/lib/puppet/provider/proxy_global_variable/proxysql.rb index e651f282..90f5bc8a 100644 --- a/lib/puppet/provider/proxy_global_variable/proxysql.rb +++ b/lib/puppet/provider/proxy_global_variable/proxysql.rb @@ -7,7 +7,7 @@ # servers. def self.instances instances = [] - data = mysql([defaults_file, '-NBe', 'SHOW GLOBAL VARIABLES']).split("\n") + data = mysql([defaults_file, '-NBe', 'SHOW GLOBAL VARIABLES']).split(%r{\n}) data.each do |line| var, val = line.split(%r{\t}) diff --git a/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb b/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb index bc44a1ab..e51f304b 100644 --- a/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_query_rule/proxysql.rb @@ -7,7 +7,7 @@ def self.instances instances = [] rules = mysql([defaults_file, '-NBe', - 'SELECT `rule_id` FROM `mysql_query_rules`'].compact).split("\n") + 'SELECT `rule_id` FROM `mysql_query_rules`'].compact).split(%r{\n}) # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. @@ -23,7 +23,7 @@ def self.instances @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_flag_out, @mirror_hostgroup = mysql([defaults_file, '-NBe', query].compact).split(%r{\s}) + @mirror_flag_out, @mirror_hostgroup = mysql([defaults_file, '-NBe', query].compact).chomp.split(%r{\t}) name = "mysql_query_rule-#{rule_id}" instances << new( diff --git a/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb b/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb index 4d697bd6..4cad1e6a 100644 --- a/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_replication_hostgroup/proxysql.rb @@ -8,7 +8,7 @@ def self.instances instances = [] hostgroups = mysql([defaults_file, '-NBe', - 'SELECT `writer_hostgroup`, `reader_hostgroup`, `comment` FROM `mysql_replication_hostgroups`'].compact).split("\n") + 'SELECT `writer_hostgroup`, `reader_hostgroup`, `comment` FROM `mysql_replication_hostgroups`'].compact).split(%r{\n}) # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. diff --git a/lib/puppet/provider/proxy_mysql_server/proxysql.rb b/lib/puppet/provider/proxy_mysql_server/proxysql.rb index 0778016c..d16887ee 100644 --- a/lib/puppet/provider/proxy_mysql_server/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_server/proxysql.rb @@ -8,7 +8,7 @@ def self.instances instances = [] servers = mysql([defaults_file, '-NBe', - 'SELECT `hostname`, `port`, `hostgroup_id` FROM `mysql_servers`'].compact).split("\n") + 'SELECT `hostname`, `port`, `hostgroup_id` FROM `mysql_servers`'].compact).split(%r{\n}) # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. @@ -21,7 +21,7 @@ def self.instances @hostname, @port, @hostgroup_id, @status, @weight, @compression, @max_connections, @max_replication_lag, @use_ssl, @max_latency_ms, - @comment = mysql([defaults_file, '-NBe', query].compact).split(%r{\s}) + @comment = mysql([defaults_file, '-NBe', query].compact).chomp.split(%r{\t}) name = "#{hostname}:#{port}-#{hostgroup_id}" instances << new( diff --git a/lib/puppet/provider/proxy_mysql_user/proxysql.rb b/lib/puppet/provider/proxy_mysql_user/proxysql.rb index 89053d3b..5afecba8 100644 --- a/lib/puppet/provider/proxy_mysql_user/proxysql.rb +++ b/lib/puppet/provider/proxy_mysql_user/proxysql.rb @@ -8,7 +8,7 @@ # users. def self.instances users = mysql([defaults_file, '-NBe', - 'SELECT username FROM mysql_users'].compact).split("\n") + 'SELECT username FROM mysql_users'].compact).split(%r{\n}) # To reduce the number of calls to MySQL we collect all the properties in # one big swoop. @@ -17,7 +17,7 @@ def self.instances @password, @active, @use_ssl, @default_hostgroup, @default_schema, @schema_locked, @transaction_persistent, @fast_forward, @backend, @frontend, - @max_connections = mysql([defaults_file, '-NBe', query].compact).split(%r{\s}) + @max_connections = mysql([defaults_file, '-NBe', query].compact).chomp.split(%r{\t}) new(name: name, ensure: :present, diff --git a/lib/puppet/provider/proxy_scheduler/proxysql.rb b/lib/puppet/provider/proxy_scheduler/proxysql.rb index 424ec94f..86b0ca7d 100644 --- a/lib/puppet/provider/proxy_scheduler/proxysql.rb +++ b/lib/puppet/provider/proxy_scheduler/proxysql.rb @@ -7,7 +7,7 @@ def self.instances instances = [] schedulers = mysql([defaults_file, '-NBe', - 'SELECT `id` FROM `scheduler`'].compact).split("\n") + 'SELECT `id` FROM `scheduler`'].compact).split(%r{\n}) schedulers.map do |scheduler_id| query = 'SELECT `active`, `interval_ms`, `filename`, ' @@ -15,7 +15,7 @@ def self.instances query << "FROM `scheduler` WHERE `id` = #{scheduler_id}" @active, @interval_ms, @filename, @arg1, @arg2, @arg3, @arg4, @arg5, - @comment = mysql([defaults_file, '-NBe', query].compact).split(%r{\s}) + @comment = mysql([defaults_file, '-NBe', query].compact).chomp.split(%r{\t}) name = "scheduler-#{scheduler_id}" instances << new(