PDK Update

Author: david22swan

.pdkignore

@@ -26,22 +26,19 @@
 .envrc
 /inventory.yaml
 /spec/fixtures/litmus_inventory.yaml
-/appveyor.yml
-/.editorconfig
 /.fixtures.yml
 /Gemfile
 /.gitattributes
 /.gitignore
-/.gitlab-ci.yml
 /.pdkignore
 /.puppet-lint.rc
 /Rakefile
 /rakelib/
 /.rspec
-/.rubocop.yml
-/.travis.yml
+/..yml
 /.yardopts
 /spec/
 /.vscode/
 /.sync.yml
 /.devcontainer/
+/.rubocop.yml

.rubocop.yml

@@ -7,9 +7,8 @@ require:
 AllCops:
   NewCops: enable
   DisplayCopNames: true
-  ExtraDetails: true
+  TargetRubyVersion: '2.6'
   DisplayStyleGuide: true
-  TargetRubyVersion: '2.7'
   Include:
   - "**/*.rb"
   Exclude:

.sync.yml

@@ -27,5 +27,5 @@ spec/spec_helper.rb:
   unmanaged: false
 .travis.yml:
   delete: true
-rubocop.yml:
+.rubocop.yml:
   unmanaged: true

Gemfile

@@ -14,32 +14,32 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 group :development do
-  gem "json", '= 2.1.0',                           require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.3.0',                           require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.5.1',                           require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.1',                           require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", '= 2.6.3',                           require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "voxpupuli-puppet-lint-plugins", '~> 4.0',   require: false
-  gem "facterdb", '~> 1.18',                       require: false
-  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
-  gem "puppetlabs_spec_helper", '~> 5.0',          require: false
-  gem "rspec-puppet-facts", '~> 2.0',              require: false
-  gem "codecov", '~> 0.2',                         require: false
-  gem "dependency_checker", '~> 0.2',              require: false
-  gem "parallel_tests", '= 3.12.1',                require: false
-  gem "pry", '~> 0.10',                            require: false
-  gem "simplecov-console", '~> 0.5',               require: false
-  gem "puppet-debugger", '~> 1.0',                 require: false
-  gem "rubocop", '= 1.48.1',                       require: false
-  gem "rubocop-performance", '= 1.16.0',           require: false
-  gem "rubocop-rspec", '= 2.19.0',                 require: false
-  gem "rb-readline", '= 0.5.5',                    require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "ruby-pwsh",                                 require: false
-  gem "github_changelog_generator", '= 1.15.2',    require: false
+  gem "json", '= 2.1.0',                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                         require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                         require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                         require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
+  gem "facterdb", '~> 1.18',                     require: false
+  gem "metadata-json-lint", '~> 3.0',            require: false
+  gem "puppetlabs_spec_helper", '~> 6.0',        require: false
+  gem "rspec-puppet-facts", '~> 2.0',            require: false
+  gem "codecov", '~> 0.2',                       require: false
+  gem "dependency_checker", '~> 1.0.0',          require: false
+  gem "parallel_tests", '= 3.12.1',              require: false
+  gem "pry", '~> 0.10',                          require: false
+  gem "simplecov-console", '~> 0.5',             require: false
+  gem "puppet-debugger", '~> 1.0',               require: false
+  gem "rubocop", '= 1.48.1',                     require: false
+  gem "rubocop-performance", '= 1.16.0',         require: false
+  gem "rubocop-rspec", '= 2.19.0',               require: false
+  gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "ruby-pwsh",                               require: false
+  gem "github_changelog_generator", '= 1.15.2',  require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
-  gem "serverspec", '~> 2.41',    require: false
+  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
+  gem "serverspec", '~> 2.41',   require: false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

lib/puppet/provider/java_ks/keytool.rb

@@ -365,10 +365,6 @@ def run_command(cmd, target = false, stdinfile = false, env = {})
         cmd << '-deststorepass' << @resource[:password]
       end
     end
-    # if Facter.value('osfamily') == 'Windows' && @resource[:password]
-    #   cmd_to_run = cmd.is_a?(String) ? cmd.split(%r{\s}).first : cmd.first
-    #   cmd << '-J-Dkeystore.pkcs12.legacy' if cmd_to_run == command_keytool
-    # end
 
     # Now run the command
     options = { failonfail: true, combine: true }

metadata.json

@@ -103,6 +103,6 @@
   ],
   "description": "Uses a combination of keytool and Ruby openssl library to manage entries in a Java keystore.",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "heads/main-0-ge5b0114",
+  "template-ref": "heads/main-0-gab2bd48",
   "pdk-version": "2.7.1"
 }

spec/spec_helper.rb

@@ -25,7 +25,7 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+    default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end

spec/spec_helper_acceptance_local.rb

@@ -157,23 +157,21 @@ def create_cert_file(cert_name, contents)
     # install java if windows
     if os[:family] == 'windows'
       LitmusHelper.instance.run_shell('puppet module install puppetlabs-chocolatey')
-      pp_one = <<~MANIFEST
+      pp_windows = <<~MANIFEST
         include chocolatey
-        # package { 'jdk8':
-        #   ensure   => '8.0.211',
-        #   provider => 'chocolatey',
-        #   install_options => ['-y']
-        # }
+        package { 'jre8':
+          ensure   => '8.0.371',
+          provider => 'chocolatey',
+          install_options => ['-y']
+        }
       MANIFEST
-      LitmusHelper.instance.apply_manifest(pp_one, catch_failures: true)
-      # LitmusHelper.instance.run_shell('C:\ProgramData\chocolatey\choco.exe upgrade jdk8 --version 8.0.211 -y')
-      LitmusHelper.instance.run_shell('C:\ProgramData\chocolatey\choco.exe upgrade jre8 --version 8.0.371 -y')
+      LitmusHelper.instance.apply_manifest(pp_windows, catch_failures: true)
     else
       LitmusHelper.instance.run_shell('puppet module install puppetlabs-java')
-      pp_two = <<~MANIFEST
+      pp_linux = <<~MANIFEST
         class { 'java': }
       MANIFEST
-      LitmusHelper.instance.apply_manifest(pp_two)
+      LitmusHelper.instance.apply_manifest(pp_linux)
     end
   end
 end