Additional cleanup

* Update rubocop gems
* Fix use of legacy facts

Author: silug

.rubocop.yml

@@ -1,5 +1,5 @@
 ---
-require:
+plugins:
   - rubocop-performance
   - rubocop-rake
   - rubocop-rspec

Gemfile

@@ -13,17 +13,16 @@ gem_sources.each { |gem_source| source gem_source }
 group :syntax do
   gem 'metadata-json-lint'
   gem 'puppet-lint-trailing_comma-check', require: false
-  gem 'rubocop', '~> 1.68.0'
-  gem 'rubocop-performance', '~> 1.23.0'
-  gem 'rubocop-rake', '~> 0.6.0'
-  gem 'rubocop-rspec', '~> 3.2.0'
+  gem 'rubocop', '~> 1.80.2'
+  gem 'rubocop-performance', '~> 1.26.0'
+  gem 'rubocop-rake', '~> 0.7.1'
+  gem 'rubocop-rspec', '~> 3.7.0'
 end
 
 group :test do
   puppet_version = ENV.fetch('PUPPET_VERSION', ['>= 7', '< 9'])
   major_puppet_version = Array(puppet_version).first.scan(%r{(\d+)(?:\.|\Z)}).flatten.first.to_i
   gem 'hiera-puppet-helper'
-  gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem('pdk', ENV.fetch('PDK_VERSION', ['>= 2.0', '< 4.0']), require: false) if major_puppet_version > 5
   gem 'puppet', puppet_version
   gem 'puppetlabs_spec_helper'

spec/acceptance/helpers/manifest_helpers.rb

@@ -64,28 +64,28 @@ def create_export_manifest(opts)
         ensure => 'directory',
         owner  => 'root',
         group  => 'root',
-        mode   => '0644'
+        mode   => '0644',
       }
 
       file { '#{opts[:exported_file]}':
         ensure  => 'file',
         owner   => 'root',
         group   => 'root',
         mode    => '0644',
-        content => "#{opts[:exported_file_content]}\\n"
+        content => "#{opts[:exported_file_content]}\\n",
       }
 
       nfs::server::export { '#{opts[:exported_dir]}':
         clients     => ['*'],
         export_path => '#{opts[:exported_dir]}',
         sec         => ['#{opts[:export_sec]}'],
-        insecure    => #{opts[:export_insecure]}
+        insecure    => #{opts[:export_insecure]},
       }
 
       File['#{opts[:exported_dir]}'] -> Nfs::Server::Export['#{opts[:exported_dir]}']
 
       #{opts[:server_custom]}
-        EOM
+    EOM
   end
 
   # Create a manifest that creates a mount directory and then statically
@@ -108,11 +108,11 @@ def create_static_mount_manifest(opts)
         ensure => 'directory',
         owner  => 'root',
         group  => 'root',
-        mode   => '0644'
+        mode   => '0644',
       }
 
       File['#{opts[:mount_dir]}'] -> Nfs::Client::Mount['#{opts[:mount_dir]}']
-        EOM
+    EOM
   end
 
   def print_test_config(hieradata, manifest)

spec/acceptance/shared_examples/multi_client_nfs_share.rb

@@ -35,13 +35,13 @@
       let(:server_opts) do
         {
           is_server: true,
-       is_client: false,
-       nfsv3: opts[:server_config][:nfsv3],
-       exported_dir: exported_dir,
-       exported_file: File.join(exported_dir, file_basename),
-       exported_file_content: "#{file_search_string} from #{exported_dir}",
-       export_sec: opts[:server_config][:export_sec],
-       export_insecure: opts[:server_config][:export_insecure],
+          is_client: false,
+          nfsv3: opts[:server_config][:nfsv3],
+          exported_dir: exported_dir,
+          exported_file: File.join(exported_dir, file_basename),
+          exported_file_content: "#{file_search_string} from #{exported_dir}",
+          export_sec: opts[:server_config][:export_sec],
+          export_insecure: opts[:server_config][:export_insecure],
         }
       end
 
@@ -76,14 +76,14 @@
           let(:client_opts) do
             {
               is_server: false,
-           is_client: true,
-           nfsv3: (config[:nfs_version] == 3),
-           mount_dir: "/mnt/#{server}-#{File.basename(exported_dir)}",
-           mount_server_ip: internal_network_info(server)[:ip],
-           mount_remote_dir: exported_dir,
-           mount_nfs_version: config[:nfs_version],
-           mount_sec: config[:sec],
-           mount_stunnel: config[:stunnel],
+              is_client: true,
+              nfsv3: (config[:nfs_version] == 3),
+              mount_dir: "/mnt/#{server}-#{File.basename(exported_dir)}",
+              mount_server_ip: internal_network_info(server)[:ip],
+              mount_remote_dir: exported_dir,
+              mount_nfs_version: config[:nfs_version],
+              mount_sec: config[:sec],
+              mount_stunnel: config[:stunnel],
             }
           end
 

spec/acceptance/shared_examples/nfs_share_using_autofs_distinct_roles.rb

@@ -66,7 +66,7 @@
         ensure => 'directory',
         owner  => 'root',
         group  => 'root',
-        mode   => '0644'
+        mode   => '0644',
       }
 
       $export_dirs = [
@@ -78,14 +78,14 @@
           ensure => 'directory',
           owner  => 'root',
           group  => 'root',
-          mode   => '0644'
+          mode   => '0644',
         }
 
         nfs::server::export { $_export_dir:
           clients     => ['*'],
           export_path => $_export_dir,
           sec         => ['#{opts[:nfs_sec]}'],
-          insecure    => #{opts[:export_insecure]}
+          insecure    => #{opts[:export_insecure]},
         }
 
         File["${_export_dir}"] -> Nfs::Server::Export["${_export_dir}"]
@@ -99,7 +99,7 @@
         ensure => 'directory',
         owner  => 'root',
         group  => 'root',
-        mode   => '0644'
+        mode   => '0644',
       }
 
       $files.each |String $_file| {
@@ -143,7 +143,7 @@
         sec                     => '#{opts[:nfs_sec]}',
         autofs                  => true,
         autofs_indirect_map_key => '#{mount_map[:indirect][:map_key]}',
-        autofs_add_key_subst    => #{mount_map[:indirect][:add_key_subst]}
+        autofs_add_key_subst    => #{mount_map[:indirect][:add_key_subst]},
       }
 
       # indirect mount with wildcard and map key substitution
@@ -154,7 +154,7 @@
         sec                     => '#{opts[:nfs_sec]}',
         autofs                  => true,
         autofs_indirect_map_key => '#{mount_map[:indirect_wildcard][:map_key]}',
-        autofs_add_key_subst    => #{mount_map[:indirect_wildcard][:add_key_subst]}
+        autofs_add_key_subst    => #{mount_map[:indirect_wildcard][:add_key_subst]},
       }
 
       #{opts[:client_custom]}
@@ -197,7 +197,6 @@
       context "as just a NFS client #{client} using NFS server #{server}" do
         let(:server_ip) do
           info = internal_network_info(server)
-          expect(info[:ip]).not_to be_nil
           info[:ip]
         end
 
@@ -209,6 +208,10 @@
           client_manifest
         end
 
+        it "checks server IP for #{server}" do
+          expect(info[:ip]).not_to be_nil
+        end
+
         it "applies client manifest to mount dir from #{server}" do
           client_hieradata = Marshal.load(Marshal.dump(opts[:base_hiera]))
           client_hieradata['nfs::is_client'] = true

spec/acceptance/shared_examples/nfs_share_using_static_mounts_combined_roles.rb

@@ -25,26 +25,26 @@
         let(:host_opts) do
           {
             is_server: true,
-         is_client: true,
-         nfsv3: opts[:nfsv3],
-         exported_dir: exported_dir,
-         exported_file: File.join(exported_dir, file_basename),
-         exported_file_content: "#{file_search_string} from #{exported_dir}",
-         export_sec: opts[:nfs_sec],
-         export_insecure: opts[:export_insecure],
-         server_custom: opts[:server_custom],
-         mount_dir: mount_dir,
-         mount_server_ip: internal_network_info(host)[:ip],
-         mount_remote_dir: exported_dir,
-         mount_nfs_version: (opts[:nfsv3] ? 3 : 4),
-         mount_sec: opts[:nfs_sec],
-         mount_autodetect_remote: autodetect_remote,
-         client_custom: <<~EOM,
-           #{opts[:client_custom]}
+            is_client: true,
+            nfsv3: opts[:nfsv3],
+            exported_dir: exported_dir,
+            exported_file: File.join(exported_dir, file_basename),
+            exported_file_content: "#{file_search_string} from #{exported_dir}",
+            export_sec: opts[:nfs_sec],
+            export_insecure: opts[:export_insecure],
+            server_custom: opts[:server_custom],
+            mount_dir: mount_dir,
+            mount_server_ip: internal_network_info(host)[:ip],
+            mount_remote_dir: exported_dir,
+            mount_nfs_version: (opts[:nfsv3] ? 3 : 4),
+            mount_sec: opts[:nfs_sec],
+            mount_autodetect_remote: autodetect_remote,
+            client_custom: <<~EOM,
+              #{opts[:client_custom]}
 
-           Nfs::Server::Export['#{exported_dir}'] -> Nfs::Client::Mount['#{mount_dir}']
-           Service['nfs-server.service'] -> Nfs::Client::Mount['#{mount_dir}']
-          EOM
+              Nfs::Server::Export['#{exported_dir}'] -> Nfs::Client::Mount['#{mount_dir}']
+              Service['nfs-server.service'] -> Nfs::Client::Mount['#{mount_dir}']
+            EOM
           }
         end
 

spec/acceptance/shared_examples/nfs_share_using_static_mounts_distinct_roles.rb

@@ -22,14 +22,14 @@
   let(:server_opts) do
     {
       is_server: true,
-   is_client: false,
-   nfsv3: opts[:nfsv3],
-   exported_dir: exported_dir,
-   exported_file: File.join(exported_dir, file_basename),
-   exported_file_content: "#{file_search_string} from #{exported_dir}",
-   export_sec: opts[:nfs_sec],
-   export_insecure: opts[:export_insecure],
-   server_custom: opts[:server_custom],
+      is_client: false,
+      nfsv3: opts[:nfsv3],
+      exported_dir: exported_dir,
+      exported_file: File.join(exported_dir, file_basename),
+      exported_file_content: "#{file_search_string} from #{exported_dir}",
+      export_sec: opts[:nfs_sec],
+      export_insecure: opts[:export_insecure],
+      server_custom: opts[:server_custom],
     }
   end
 
@@ -65,13 +65,13 @@
         let(:client_opts) do
           {
             is_server: false,
-         is_client: true,
-         nfsv3: opts[:nfsv3],
-         mount_dir: "/mnt/#{server}-#{File.basename(exported_dir)}",
-         mount_server_ip: internal_network_info(server)[:ip],
-         mount_remote_dir: exported_dir,
-         mount_nfs_version: (opts[:nfsv3] ? 3 : 4),
-         mount_sec: opts[:nfs_sec],
+            is_client: true,
+            nfsv3: opts[:nfsv3],
+            mount_dir: "/mnt/#{server}-#{File.basename(exported_dir)}",
+            mount_server_ip: internal_network_info(server)[:ip],
+            mount_remote_dir: exported_dir,
+            mount_nfs_version: (opts[:nfsv3] ? 3 : 4),
+            mount_sec: opts[:nfs_sec],
           }
         end
 
@@ -94,9 +94,11 @@
           apply_manifest_on(client, client_manifest, catch_changes: true)
         end
 
+        # rubocop:disable RSpec/RepeatedExample
         it 'mounts NFS share' do
           on(client, %(grep -q '#{file_search_string}' #{client_opts[:mount_dir]}/#{file_basename}))
         end
+        # rubocop:enable RSpec/RepeatedExample
 
         if opts[:nfsv3]
           # Want to verify the NLM ports are correctly configured.  According
@@ -149,6 +151,7 @@
             end
           end
 
+          # rubocop:disable RSpec/RepeatedExample
           it 'mount should be re-established after client reboot' do
             on(client, %(grep -q '#{file_search_string}' #{client_opts[:mount_dir]}/#{file_basename}))
           end
@@ -162,6 +165,7 @@
           it 'mount should be re-established after server reboot' do
             on(client, %(grep -q '#{file_search_string}' #{client_opts[:mount_dir]}/#{file_basename}))
           end
+          # rubocop:enable RSpec/RepeatedExample
         end
 
         it 'removes mount as prep for next test' do

spec/acceptance/suites/krb5/00_krb5_test_spec.rb

@@ -32,7 +32,7 @@
     'krb5::kdc::auto_keytabs::introspect'      => false,
     'krb5::kdc::auto_keytabs::hosts'           =>
       # Generate keytabs for everyone
-      hosts.map { |host| [ fact_on(host, 'fqdn'), { 'ensure' => 'present' } ] }.to_h,
+      hosts.map { |host| [ fact_on(host, 'networking.fqdn'), { 'ensure' => 'present' } ] }.to_h,
     'krb5::kdc::auto_keytabs::global_services' => [ 'nfs' ],
 
     'nfs::secure_nfs'                          => true,
@@ -51,7 +51,8 @@
   # the Puppet master.
   servers.each do |server|
     context "with server #{server} as NFS server and KDC" do
-      let(:server_fqdn) { fact_on(server, 'fqdn') }
+      let(:server_fqdn) { fact_on(server, 'networking.fqdn') }
+      let(:client_fqdn) { fact_on(client, 'networking.fqdn') }
 
       context 'Kerberos infrastructure set up' do
         let(:kdc_manifest) do
@@ -66,8 +67,8 @@
             include 'krb5'
             include 'ssh'
 
-            krb5::setting::realm { $facts['domain'] :
-              admin_server => '#{server_fqdn}'
+            krb5::setting::realm { $facts['networking']['domain'] :
+              admin_server => '#{server_fqdn}',
             }
           EOM
         end
@@ -78,7 +79,7 @@
         end
 
         it "sets up #{server} keytab and fake keytab sync source" do
-          keytab_src = %(/var/kerberos/krb5kdc/generated_keytabs/#{fact_on(server, 'fqdn')}/krb5.keytab)
+          keytab_src = %(/var/kerberos/krb5kdc/generated_keytabs/#{server_fqdn}/krb5.keytab)
           on(server, %(cp #{keytab_src} /etc))
           server.mkdir_p('/tmp/keytabs')
           on(server, "cp #{keytab_src} /tmp/keytabs/")
@@ -91,7 +92,7 @@
           end
 
           it "copies keytabs from KDC to fake keytab sync source on client #{client}" do
-            keytab_src = %(/var/kerberos/krb5kdc/generated_keytabs/#{fact_on(client, 'fqdn')}/krb5.keytab)
+            keytab_src = %(/var/kerberos/krb5kdc/generated_keytabs/#{client_fqdn}/krb5.keytab)
             tmpdir = Dir.mktmpdir
 
             begin
@@ -128,8 +129,8 @@
 
         client_krb5_manifest_extras = <<~EOM
           # Keep Kerberos realm configured to know location of KDC
-          krb5::setting::realm { $facts['domain'] :
-            admin_server => '#{fact_on(server, 'fqdn')}'
+          krb5::setting::realm { $facts['networking']['domain'] :
+            admin_server => '#{server_fqdn}',
           }
         EOM