(CONT-789) Rubocop Manual Fix 6 - Naming/MemoizedInstanceVariableName

Author: david22swan

.rubocop_todo.yml

@@ -48,13 +48,6 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 18
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'spec/spec_helper_acceptance_local.rb'
-
 # Offense count: 24
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:

spec/acceptance/00_mysql_server_spec.rb

@@ -38,8 +38,8 @@ class { 'mysql::server':
           databases => {
             'somedb' => {
               ensure  => 'present',
-              charset => '#{fetch_charset}',
-              collate => '#{fetch_charset}_general_ci',
+              charset => '#{charset}',
+              collate => '#{charset}_general_ci',
             },
           }
         }

spec/acceptance/01_mysql_db_spec.rb

@@ -14,8 +14,8 @@ class { 'mysql::server':
         mysql::db { 'spec1':
           user            => 'root1',
           password        => 'password',
-          charset         => '#{fetch_charset}',
-          collate         => '#{fetch_charset}_general_ci',
+          charset         => '#{charset}',
+          collate         => '#{charset}_general_ci',
         }
       MANIFEST
     end
@@ -43,8 +43,8 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
         mysql::db { 'spec2':
           user     => 'root1',
           password => 'password',
-          charset  => '#{fetch_charset}',
-          collate  => '#{fetch_charset}_general_ci',
+          charset  => '#{charset}',
+          collate  => '#{charset}_general_ci',
           sql      => ['/tmp/spec.sql'],
         }
       MANIFEST
@@ -70,8 +70,8 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
           user     => 'root1',
           password => 'password',
           dbname   => 'realdb',
-          charset  => '#{fetch_charset}',
-          collate  => '#{fetch_charset}_general_ci',
+          charset  => '#{charset}',
+          collate  => '#{charset}_general_ci',
         }
       MANIFEST
     end

spec/acceptance/04_mysql_backup_spec.rb

@@ -12,8 +12,8 @@ class { 'mysql::server': root_password => 'password' }
         ]:
           user     => 'backup',
           password => 'secret',
-          charset  => '#{fetch_charset}',
-          collate  => '#{fetch_charset}_general_ci',
+          charset  => '#{charset}',
+          collate  => '#{charset}_general_ci',
         }
 
         class { 'mysql::server::backup':
@@ -74,8 +74,8 @@ class { 'mysql::server': root_password => 'password' }
           ]:
             user     => 'backup',
             password => 'secret',
-            charset  => '#{fetch_charset}',
-            collate  => '#{fetch_charset}_general_ci',
+            charset  => '#{charset}',
+            collate  => '#{charset}_general_ci',
           }
 
           class { 'mysql::server::backup':

spec/acceptance/05_mysql_xtrabackup_spec.rb

@@ -12,8 +12,8 @@ class { 'mysql::server': root_password => 'password' }
         ]:
           user     => 'backup',
           password => 'secret',
-          charset  => '#{fetch_charset}',
-          collate  => '#{fetch_charset}_general_ci',
+          charset  => '#{charset}',
+          collate  => '#{charset}_general_ci',
         }
         case $facts['os']['family'] {
           /Debian/: {
@@ -130,8 +130,8 @@ class { 'mysql::server': root_password => 'password' }
         ]:
           user     => 'backup',
           password => 'secret',
-          charset  => '#{fetch_charset}',
-          collate  => '#{fetch_charset}_general_ci',
+          charset  => '#{charset}',
+          collate  => '#{charset}_general_ci',
         }
         case $facts['os']['family'] {
           /Debian/: {

spec/acceptance/types/mysql_database_spec.rb

@@ -16,8 +16,8 @@ class { 'mysql::server': }
     pp = <<-MANIFEST
         mysql_database { 'spec_db':
           ensure  => present,
-          charset => '#{fetch_charset}',
-          collate => '#{fetch_charset}_general_ci',
+          charset => '#{charset}',
+          collate => '#{charset}_general_ci',
         }
     MANIFEST
     it 'works without errors' do
@@ -39,8 +39,8 @@ class { 'mysql::server': }
           collate => 'latin1_swedish_ci',
         }
         mysql_database { 'spec_utf8':
-          charset => '#{fetch_charset}',
-          collate => '#{fetch_charset}_general_ci',
+          charset => '#{charset}',
+          collate => '#{charset}_general_ci',
         }
     MANIFEST
     it 'creates two db of different types idempotently' do

spec/acceptance/types/mysql_grant_spec.rb

@@ -274,8 +274,8 @@ class { 'mysql::server':
 
         mysql_database { 'foo':
           ensure  => present,
-          charset => '#{fetch_charset}',
-          collate => '#{fetch_charset}_general_ci',
+          charset => '#{charset}',
+          collate => '#{charset}_general_ci',
         }
 
         exec { 'mysql-create-table':
@@ -685,7 +685,7 @@ class { 'mysql::server': override_options => { 'root_password' => 'password' } }
         mysql::db { 'grant_spec_db':
           user     => 'root1',
           password => 'password',
-          charset  => '#{fetch_charset}',
+          charset  => '#{charset}',
           sql      => ['/tmp/grant_spec_table.sql'],
         }
     MANIFEST

spec/spec_helper_acceptance_local.rb

@@ -36,7 +36,7 @@ def sles_15?
   os[:family] == 'sles' && os[:release].to_i == 15
 end
 
-def fetch_charset
+def charset
   @charset ||= (ubuntu_2204? || sles_15?) ? 'utf8mb3' : 'utf8'
 end