apply review notes. Change $:: to $. Use facts[]. Change erb template…

… to epp
voxpupuli · Sep 1, 2018 · b25c7ba · b25c7ba
1 parent 765bc66
commit b25c7ba
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 110 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -6,6 +6,7 @@
 
   $config_settings = $proxysql::config_settings
   $proxy_config_file = $proxysql::proxy_config_file
+  $split_config = $proxysql::split_config
 
   if $proxysql::manage_config_file  {
     file { 'proxysql-config-file':
@@ -23,7 +24,7 @@
     file { 'proxysql-proxy-config-file':
       ensure                  => file,
       path                    => $proxysql::proxy_config_file,
-      content                 => template('proxysql/proxysql_proxy.cnf.erb'),
+      content                 => epp('proxysql/proxysql_proxy.cnf.epp', { config_settings => $config_settings }),
       mode                    => '0640',
       owner                   => $proxysql::sys_owner,
       group                   => $proxysql::sys_group,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -122,54 +122,54 @@
 #   Determines wheter this module will update the ProxySQL proxy configuration file. Defaults to 'true'
 #
 class proxysql (
-  String $package_name = $::proxysql::params::package_name,
-  String $package_ensure = $::proxysql::params::package_ensure,
-  Array[String] $package_install_options = $::proxysql::params::package_install_options,
-  String $service_name = $::proxysql::params::service_name,
-  String $service_ensure = $::proxysql::params::service_ensure,
+  String $package_name = $proxysql::params::package_name,
+  String $package_ensure = $proxysql::params::package_ensure,
+  Array[String] $package_install_options = $proxysql::params::package_install_options,
+  String $service_name = $proxysql::params::service_name,
+  String $service_ensure = $proxysql::params::service_ensure,
 
-  String $datadir = $::proxysql::params::datadir,
+  String $datadir = $proxysql::params::datadir,
 
-  String $listen_ip = $::proxysql::params::listen_ip,
-  Integer $listen_port = $::proxysql::params::listen_port,
-  String $listen_socket = $::proxysql::params::listen_socket,
+  String $listen_ip = $proxysql::params::listen_ip,
+  Integer $listen_port = $proxysql::params::listen_port,
+  String $listen_socket = $proxysql::params::listen_socket,
 
-  String $admin_username = $::proxysql::params::admin_username,
-  Sensitive[String] $admin_password = $::proxysql::params::admin_password,
-  String $admin_listen_ip = $::proxysql::params::admin_listen_ip,
-  Integer $admin_listen_port = $::proxysql::params::admin_listen_port,
-  String $admin_listen_socket = $::proxysql::params::admin_listen_socket,
+  String $admin_username = $proxysql::params::admin_username,
+  Sensitive[String] $admin_password = $proxysql::params::admin_password,
+  String $admin_listen_ip = $proxysql::params::admin_listen_ip,
+  Integer $admin_listen_port = $proxysql::params::admin_listen_port,
+  String $admin_listen_socket = $proxysql::params::admin_listen_socket,
 
-  String $monitor_username = $::proxysql::params::monitor_username,
-  Sensitive[String] $monitor_password = $::proxysql::params::monitor_password,
+  String $monitor_username = $proxysql::params::monitor_username,
+  Sensitive[String] $monitor_password = $proxysql::params::monitor_password,
 
-  Boolean $split_config = $::proxysql::params::split_config,
-  String $config_file = $::proxysql::params::config_file,
-  Boolean $manage_config_file = $::proxysql::params::manage_config_file,
-  String $proxy_config_file = $::proxysql::params::proxy_config_file,
-  Boolean $manage_proxy_config_file = $::proxysql::params::manage_proxy_config_file,
+  Boolean $split_config = $proxysql::params::split_config,
+  String $config_file = $proxysql::params::config_file,
+  Boolean $manage_config_file = $proxysql::params::manage_config_file,
+  String $proxy_config_file = $proxysql::params::proxy_config_file,
+  Boolean $manage_proxy_config_file = $proxysql::params::manage_proxy_config_file,
 
-  String $mycnf_file_name = $::proxysql::params::mycnf_file_name,
-  Boolean $manage_mycnf_file = $::proxysql::params::manage_mycnf_file,
+  String $mycnf_file_name = $proxysql::params::mycnf_file_name,
+  Boolean $manage_mycnf_file = $proxysql::params::manage_mycnf_file,
 
-  Boolean $restart = $::proxysql::params::restart,
+  Boolean $restart = $proxysql::params::restart,
 
-  Boolean $load_to_runtime = $::proxysql::params::load_to_runtime,
-  Boolean $save_to_disk = $::proxysql::params::save_to_disk,
+  Boolean $load_to_runtime = $proxysql::params::load_to_runtime,
+  Boolean $save_to_disk = $proxysql::params::save_to_disk,
 
   Boolean $manage_repo = true,
   Hash $repo = {},
 
-  String $package_source  =  $::proxysql::params::package_source,
-  String $package_provider =  $::proxysql::params::package_provider,
+  String $package_source  =  $proxysql::params::package_source,
+  String $package_provider =  $proxysql::params::package_provider,
 
-  String $sys_owner = $::proxysql::params::sys_owner,
-  String $sys_group = $::proxysql::params::sys_group,
+  String $sys_owner = $proxysql::params::sys_owner,
+  String $sys_group = $proxysql::params::sys_group,
 
-  String $rpm_repo_name   =  $::proxysql::params::rpm_repo_name,
-  String $rpm_repo_descr  =  $::proxysql::params::rpm_repo_descr,
-  String $rpm_repo        =  $::proxysql::params::rpm_repo,
-  String $rpm_repo_key    =  $::proxysql::params::rpm_repo_key,
+  String $rpm_repo_name   =  $proxysql::params::rpm_repo_name,
+  String $rpm_repo_descr  =  $proxysql::params::rpm_repo_descr,
+  String $rpm_repo        =  $proxysql::params::rpm_repo,
+  String $rpm_repo_key    =  $proxysql::params::rpm_repo_key,
 
   Hash $override_config_settings = {},
 ) inherits ::proxysql::params {
@@ -190,21 +190,21 @@
   $config_settings = deep_merge($proxysql::params::config_settings, $settings, $override_config_settings)
   # lint:endignore
 
-  anchor { '::proxysql::begin': }
-  -> class { '::proxysql::repo':}
-  -> class { '::proxysql::install':}
-  -> class { '::proxysql::config':}
-  -> class { '::proxysql::service':}
-  -> class { '::proxysql::admin_credentials':}
-  -> class { '::proxysql::reload_config':}
-  -> anchor { '::proxysql::end': }
+  anchor { 'proxysql::begin': }
+  -> class { 'proxysql::repo':}
+  -> class { 'proxysql::install':}
+  -> class { 'proxysql::config':}
+  -> class { 'proxysql::service':}
+  -> class { 'proxysql::admin_credentials':}
+  -> class { 'proxysql::reload_config':}
+  -> anchor { 'proxysql::end': }
 
-  Class['::proxysql::install']
-  ~> Class['::proxysql::service']
+  Class['proxysql::install']
+  ~> Class['proxysql::service']
 
   if $restart {
-    Class['::proxysql::config']
-    ~> Class['::proxysql::service']
+    Class['proxysql::config']
+    ~> Class['proxysql::service']
   }
 
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -23,7 +23,7 @@
   $admin_listen_ip     = '127.0.0.1'
   $admin_listen_port   = 6032
 
-  case $::operatingsystem {
+  case $facts['operatingsystem'] {
     'Debian': {
       $admin_listen_socket = '/tmp/proxysql_admin.sock'
       $package_provider    = 'dpkg'

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -5,7 +5,7 @@
 #
 class proxysql::repo inherits proxysql {
   if $proxysql::manage_repo == true {
-    case $::operatingsystem {
+    case $facts['operatingsystem'] {
       'Debian', 'Ubuntu': {
         create_resources('::apt::source', $proxysql::repo)
       }

diff --git a/spec/classes/proxysql_spec.rb b/spec/classes/proxysql_spec.rb
@@ -13,15 +13,19 @@
           it { is_expected.to compile.with_all_deps }
 
           it { is_expected.to contain_class('proxysql::params') }
-          it { is_expected.to contain_anchor('::proxysql::begin').that_comes_before('Class[proxysql::repo]') }
+          it { is_expected.to contain_anchor('proxysql::begin').that_comes_before('Class[proxysql::repo]') }
+          it { is_expected.to contain_anchor('proxysql::begin').that_comes_before('Class[proxysql::repo]') }
           it { is_expected.to contain_class('proxysql::repo').that_comes_before('Class[proxysql::install]') }
           it { is_expected.to contain_class('proxysql::install').that_comes_before('Class[proxysql::config]') }
           it { is_expected.to contain_class('proxysql::config').that_comes_before('Class[proxysql::service]') }
           it { is_expected.to contain_class('proxysql::service').that_comes_before('Class[proxysql::admin_credentials]') }
           it { is_expected.to contain_class('proxysql::admin_credentials').that_comes_before('Class[proxysql::reload_config]') }
-          it { is_expected.to contain_class('proxysql::reload_config').that_comes_before('Anchor[::proxysql::end]') }
+          it { is_expected.to contain_class('proxysql::reload_config').that_comes_before('Anchor[proxysql::end]') }
 
-          it { is_expected.to contain_anchor('::proxysql::end') }
+          it { is_expected.to contain_anchor('proxysql::end') }
+          it { is_expected.to contain_class('proxysql::reload_config').that_comes_before('Anchor[proxysql::end]') }
+
+          it { is_expected.to contain_anchor('proxysql::end') }
 
           it { is_expected.to contain_class('proxysql::install').that_notifies('Class[proxysql::service]') }
           it { is_expected.to contain_class('proxysql::service').that_subscribes_to('Class[proxysql::install]') }

diff --git a/templates/proxysql.cnf.erb b/templates/proxysql.cnf.erb
@@ -40,7 +40,7 @@ end
 <%
     else
 -%>
-<% if scope.lookupvar('::proxysql::split_config') == false -%>
+<% if @split_config == false -%>
 <%= k %> = (
 <%
       v.each do |ki, vi|
@@ -67,6 +67,6 @@ end
 end
 -%>
 
-<% if scope.lookupvar('::proxysql::split_config') == true -%>
+<% if @split_config == true -%>
 @include  "<%= @proxy_config_file %>"
 <% end -%>
diff --git a/templates/proxysql_proxy.cnf.epp b/templates/proxysql_proxy.cnf.epp
@@ -0,0 +1,18 @@
+<%- | Hash $config_settings | -%>
+<% $config_settings.each |$key, $value| { -%>
+<% if $key == "mysql_servers" { -%>
+<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>)
+<% } -%>
+<% if $key == "mysql_users" { -%>
+<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>)
+<% } -%>
+<% if $key == "mysql_query_rules" { -%>
+<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>)
+<% } -%>
+<% if $key == "scheduler" { -%>
+<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>)
+<% } -%>
+<% if $key == "mysql_replication_hostgroups" { -%>
+<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>)
+<% } -%>
+<% } -%>
diff --git a/templates/proxysql_proxy.cnf.erb b/templates/proxysql_proxy.cnf.erb