Update spec tests

Author: m0dular

data/os/Suse.yaml

@@ -1,7 +1,6 @@
 ---
 puppet_metrics_dashboard::manage_repos: false
 puppet_metrics_dashboard::influx_db_service_name: 'influxdb'
-puppet_metrics_dashboard::grafana_version: '7.1.4'
 puppet_metrics_dashboard::influx_archive_source: 'https://dl.influxdata.com/influxdb/releases/influxdb-1.8.1_linux_amd64.tar.gz'
 puppet_metrics_dashboard::grafana_install_method: 'package'
 puppet_metrics_dashboard::grafana_manage_repo: false

manifests/init.pp

@@ -225,7 +225,6 @@
   String $influx_db_password,
 
   String $telegraf_db_name,
-  Optional[String[1]] $telegraf_db_retention_duration = undef,
   String[2] $telegraf_agent_interval,
   String[2] $http_response_timeout,
   String[2] $pg_query_interval,
@@ -246,15 +245,17 @@
   Hash $grafana_config,
 
   Boolean             $grafana_manage_repo = $manage_repos,
-  Optional[Stdlib::Httpsurl] $influx_archive_source = undef,
-  Optional[Stdlib::Httpsurl] $grafana_archive_source = undef,
   Enum['docker', 'archive', 'package', 'repo'] $grafana_install_method = 'repo',
 
   Puppet_metrics_dashboard::HostList $master_list        = puppet_metrics_dashboard::localhost_or_hosts_with_pe_profile('master'),
   Puppet_metrics_dashboard::HostList $puppetdb_list      = puppet_metrics_dashboard::localhost_or_hosts_with_pe_profile('puppetdb'),
   Puppet_metrics_dashboard::HostList $postgres_host_list = puppet_metrics_dashboard::localhost_or_hosts_with_pe_profile('database'),
 
   Puppet_metrics_dashboard::Puppetdb_metric $puppetdb_metrics = puppet_metrics_dashboard::puppetdb_metrics(),
+
+  Optional[String[1]] $telegraf_db_retention_duration = undef,
+  Optional[Stdlib::Httpsurl] $influx_archive_source = undef,
+  Optional[Stdlib::Httpsurl] $grafana_archive_source = undef,
   ) {
 
   unless $facts['os']['family'] =~ /^(RedHat|Debian|Suse)$/ {

manifests/post_start_configs.pp

@@ -30,20 +30,20 @@
       unless  => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \'show databases\' | grep ${db_name}",
       require => Exec['create influxdb admin user'],
     }
-    # lint:endignore
   }
 
   if $puppet_metrics_dashboard::telegraf_db_retention_duration =~ NotUndef {
-    exec { "create default telegraf database retention policy":
+    exec { 'create default telegraf database retention policy':
       command => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \"CREATE RETENTION POLICY telegraf_default ON ${puppet_metrics_dashboard::telegraf_db_name} DURATION ${puppet_metrics_dashboard::telegraf_db_retention_duration} REPLICATION 1 DEFAULT\"",
-      unless => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \"SHOW RETENTION POLICIES ON ${puppet_metrics_dashboard::telegraf_db_name}\" | grep -w telegraf_default",
+      unless  => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \"SHOW RETENTION POLICIES ON ${puppet_metrics_dashboard::telegraf_db_name}\" | grep -w telegraf_default",
       require => Exec["create influxdb puppet_metrics database ${puppet_metrics_dashboard::telegraf_db_name}"],
     }
   } else {
-    exec { "drop existing retention policy if ever created":
+    exec { 'drop existing retention policy if ever created':
       command => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \"DROP RETENTION POLICY telegraf_default ON ${puppet_metrics_dashboard::telegraf_db_name}\"",
-      onlyif => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \"SHOW RETENTION POLICIES ON ${puppet_metrics_dashboard::telegraf_db_name}\" | grep -w telegraf_default",
+      onlyif  => "influx -username admin -password ${puppet_metrics_dashboard::influx_db_password} -execute \"SHOW RETENTION POLICIES ON ${puppet_metrics_dashboard::telegraf_db_name}\" | grep -w telegraf_default",
     }
+    # lint:endignore
   }
 
   $_uri = $puppet_metrics_dashboard::use_dashboard_ssl ? {

manifests/profile/ldap_auth.pp

@@ -18,7 +18,8 @@
 #   Set to false if you do not want to skip SSL cert validation. Defaults to true.
 #
 # @param ldap_bind_dn
-#   Search user bind dn. If you can provide a single bind expression that matches all possible users, you can skip specifying ldap_bind_password.
+#   Search user bind dn. If you can provide a single bind expression that matches all possible users,
+#   you can skip specifying ldap_bind_password.
 #
 # @param ldap_bind_password
 #   Search user bind password. If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""

manifests/profile/master/postgres.pp

@@ -34,15 +34,15 @@
     plugin_type => 'postgresql_extensible',
     options     => [{
       'interval'      => $query_interval,
-      'address'       => "postgres://telegraf@${postgres_host}:${port}/pe-puppetdb?sslmode=require&sslkey=/etc/telegraf/${trusted['certname']}_key.pem&sslcert=/etc/telegraf/${trusted['certname']}_cert.pem&sslrootcert=/etc/telegraf/ca.pem",
+      'address'       => "postgres://telegraf@${postgres_host}:${port}/pe-puppetdb?sslmode=require&sslkey=/etc/telegraf/${trusted['certname']}_key.pem&sslcert=/etc/telegraf/${trusted['certname']}_cert.pem&sslrootcert=/etc/telegraf/ca.pem", #lint:ignore:140chars
       'outputaddress' => $postgres_host,
       'databases'     => $databases,
       'query'         => [{
         'sqlquery'   => 'SELECT * FROM pg_stat_database',
         'version'    => 901,
         'withdbname' => false,
         },{
-        'sqlquery'   => 'SELECT relname as s_table, pg_relation_size(relid) as size FROM pg_catalog.pg_statio_user_tables ORDER BY pg_total_relation_size(relid) DESC',
+        'sqlquery'   => 'SELECT relname as s_table, pg_relation_size(relid) as size FROM pg_catalog.pg_statio_user_tables ORDER BY pg_total_relation_size(relid) DESC', #lint:ignore:140chars
         'version'    => 901,
         'withdbname' => false,
         'tagvalue'   => 's_table',
@@ -52,7 +52,7 @@
         'withdbname' => false,
         'tagvalue'   => 'v_table',
         },{
-        'sqlquery'   => 'SELECT relname as io_table, heap_blks_read, heap_blks_hit, idx_blks_read, idx_blks_hit, toast_blks_read, toast_blks_hit, tidx_blks_read, tidx_blks_hit FROM pg_statio_user_tables',
+        'sqlquery'   => 'SELECT relname as io_table, heap_blks_read, heap_blks_hit, idx_blks_read, idx_blks_hit, toast_blks_read, toast_blks_hit, tidx_blks_read, tidx_blks_hit FROM pg_statio_user_tables', #lint:ignore:140chars
         'version'    => 901,
         'withdbname' => false,
         'tagvalue'   => 'io_table',

manifests/profile/postgres.pp

@@ -1,13 +1,13 @@
 # @summary This class is deprecated.  Please use the Puppet_metrics_dashboard::Profile::Master::Postgres_access class.
 #
 # @param grafana_host
-#   The FQDN of the host where telegraf runs.
-#   Defaults to an empty string.  You can explicitly set this parameter or the class attempts to lookup which host has the puppet_metrics_dashboard class applied in PuppetDB.  If the parameter is not set and the lookup does not return anything we issue a warning.
-#
+#   The FQDN of the host where telegraf runs.  Defaults to an empty string.
+#   You can explicitly set this parameter or the class attempts to lookup which host has the puppet_metrics_dashboard class applied
+#   in PuppetDB.  If the parameter is not set and the lookup does not return anything we issue a warning.
 class puppet_metrics_dashboard::profile::postgres (
   String $grafana_host = ''
 ){
 
-  fail('The Puppet_metrics_dashboard::Profile::Postgres class is deprecated.  Please use the Puppet_metrics_dashboard::Profile::Master::Postgres_access instead.')
+  fail('Puppet_metrics_dashboard::Profile::Postgres is deprecated in favor of Puppet_metrics_dashboard::Profile::Master::Postgres_access.')
 
 }

manifests/service.pp

@@ -9,9 +9,9 @@
       systemd::unit_file { "${puppet_metrics_dashboard::influx_db_service_name}.service":
         source => "puppet:///modules/${module_name}/influxdb.service",
       }
-      service {"${puppet_metrics_dashboard::influx_db_service_name}":
-        ensure => running,
-        enable => true,
+      service {$puppet_metrics_dashboard::influx_db_service_name:
+        ensure  => running,
+        enable  => true,
         require => Systemd::Unit_file["${puppet_metrics_dashboard::influx_db_service_name}.service"],
       }
     }

spec/classes/grafana_spec.rb

@@ -54,7 +54,7 @@
           when 'Suse'
             is_expected.to contain_class('grafana')
               .with_install_method('package')
-              .with_manage_package_repo(true)
+              .with_manage_package_repo(false)
               .with_version('8.2.2')
               .with_require('Service[influxdb]')
           end

spec/classes/init_spec.rb

@@ -35,12 +35,12 @@
         # verify the defualts have not changed
         # rubocop:disable RSpec/ExampleWording
         it 'should have all the expected default vaulues for parameters' do
-          case facts[:os]['family']
-          when 'Suse'
-            manage_repos = false
-          else
-            manage_repos = true
-          end
+          manage_repos = case facts[:os]['family']
+                         when 'Suse'
+                           false
+                         else
+                           true
+                         end
           is_expected.to contain_class('puppet_metrics_dashboard')
             .with_add_dashboard_examples(false)
             .with_manage_repos(manage_repos)

spec/classes/post_start_configs_spec.rb

@@ -2,12 +2,7 @@
 
 describe 'puppet_metrics_dashboard::post_start_configs' do
   on_supported_os.each do |os, facts|
-    influx_command = case facts[:os]['family']
-                     when 'Suse'
-                       '/opt/influxdb/usr/bin/influx'
-                     else
-                       '/usr/bin/influx'
-                     end
+    influx_command = 'influx'
     context "with facter #{RSpec.configuration.default_facter_version} on #{os}" do
       let(:node) do
         'testhost.example.com'