(CONT-789) Rubocop Manual Fix 3 - Naming/HeredocDelimiterNaming

Author: david22swan

.rubocop_todo.yml

@@ -48,19 +48,6 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Max: 18
 
-# Offense count: 8
-# Configuration parameters: ForbiddenDelimiters.
-# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'lib/puppet/type/mysql_login_path.rb'
-    - 'spec/acceptance/types/mysql_grant_spec.rb'
-    - 'spec/acceptance/types/mysql_user_spec.rb'
-    - 'spec/classes/mysql_backup_mysqldump_spec.rb'
-    - 'spec/classes/mysql_backup_xtrabackup_spec.rb'
-    - 'spec/classes/mysql_server_account_security_spec.rb'
-    - 'spec/classes/mysql_server_backup_spec.rb'
-
 # Offense count: 1
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional

lib/puppet/type/mysql_login_path.rb

@@ -5,7 +5,7 @@
 Puppet::ResourceApi.register_type(
   name: 'mysql_login_path',
 
-  docs: <<-EOS,
+  docs: <<-DESCRIPTION,
   @summary
     Manage a MySQL login path.
   @see
@@ -31,7 +31,7 @@
 
   This type provides Puppet with the capabilities to store authentication credentials in an obfuscated login path file
   named .mylogin.cnf created with the mysql_config_editor utility. Supports only MySQL Community Edition > v5.6.6.
-  EOS
+  DESCRIPTION
   features: ['simple_get_filter', 'canonicalize'],
   title_patterns: [
     {

spec/acceptance/types/mysql_grant_spec.rb

@@ -415,7 +415,7 @@ class { 'mysql::server':
 
   describe 'adding function privileges' do
     it 'works without errors' do
-      pp = <<-EOS
+      pp = <<-MANIFEST
         exec { 'simplefunc-create':
           command => '/usr/bin/mysql --user="root" --password="password" --database=mysql -NBe "CREATE FUNCTION simplefunc (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN CONCAT(\\'Hello, \\', s, \\'!\\')"',
           before  => Mysql_user['test3@tester'],
@@ -432,7 +432,7 @@ class { 'mysql::server':
           privileges => ['EXECUTE'],
           require    => Mysql_user['test3@tester'],
         }
-      EOS
+      MANIFEST
 
       apply_manifest(pp, catch_failures: true)
     end

spec/acceptance/types/mysql_user_spec.rb

@@ -47,11 +47,11 @@ class { 'mysql::server': * => $ed25519_opts }
 
     describe 'changing authentication plugin', if: (Gem::Version.new(mysql_version) > Gem::Version.new('5.5.0') && os[:release] !~ %r{^16\.04}) do
       it 'works without errors', if: (os[:family] != 'sles' && os[:release].to_i == 15) do
-        pp = <<-EOS
+        pp = <<-MANIFEST
           mysql_user { 'ashp@localhost':
             plugin => 'auth_socket',
           }
-        EOS
+        MANIFEST
 
         idempotent_apply(pp)
       end
@@ -78,12 +78,12 @@ class { 'mysql::server': * => $ed25519_opts }
 
     describe 'using ed25519 authentication plugin', if: Gem::Version.new(mysql_version) > Gem::Version.new('10.1.21') do
       it 'works without errors' do
-        pp = <<-EOS
+        pp = <<-MANIFEST
           mysql_user { 'ashp@localhost':
             plugin        => 'ed25519',
             password_hash => 'z0pjExBYbzbupUByZRrQvC6kRCcE8n/tC7kUdUD11fU',
           }
-        EOS
+        MANIFEST
 
         idempotent_apply(pp)
       end

spec/classes/mysql_backup_mysqldump_spec.rb

@@ -6,9 +6,9 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
-        <<-EOF
+        <<-MANIFEST
           class { 'mysql::server': }
-        EOF
+        MANIFEST
       end
       let(:facts) do
         facts.merge(root_home: '/root')

spec/classes/mysql_backup_xtrabackup_spec.rb

@@ -6,9 +6,9 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
-        <<-EOF
+        <<-MANIFEST
           class { 'mysql::server': }
-        EOF
+        MANIFEST
       end
       let(:facts) do
         facts.merge(root_home: '/root',

spec/classes/mysql_server_account_security_spec.rb

@@ -6,9 +6,9 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
-        <<-EOF
+        <<-MANIFEST
         anchor {'mysql::server::end': }
-        EOF
+        MANIFEST
       end
 
       context 'with fqdn==myhost.mydomain' do

spec/classes/mysql_server_backup_spec.rb

@@ -6,9 +6,9 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:pre_condition) do
-        <<-EOF
+        <<-MANIFEST
           class { 'mysql::server': }
-        EOF
+        MANIFEST
       end
       let(:facts) do
         facts.merge(root_home: '/root')