Add Puppet 8 support

CHANGELOG.md

@@ -499,7 +499,7 @@ This release also adds the ability to define logging rolling file settings and a
 * Recursively create the logdir for elasticsearch when creating multiple instances
 * Files and directories with root ownership now specify UID/GID 0 instead to improve compatability with *BSDs.
 * Elasticsearch Debian init file changed to avoid throwing errors when DATA_DIR, WORK_DIR and/or LOG_DIR were an empty variable.
-* Fixed a broken File dependency when a plugin was set to absent and ::elasticsearch set to present.
+* Fixed a broken File dependency when a plugin was set to absent and elasticsearch set to present.
 * Fixed issue when using the `proxy` parameter on plugins in Elasticsearch 2.x.
 
 #### Changes

HISTORY.md

@@ -397,7 +397,7 @@ This release also adds the ability to define logging rolling file settings and a
 * Recursively create the logdir for elasticsearch when creating multiple instances
 * Files and directories with root ownership now specify UID/GID 0 instead to improve compatability with *BSDs.
 * Elasticsearch Debian init file changed to avoid throwing errors when DATA_DIR, WORK_DIR and/or LOG_DIR were an empty variable.
-* Fixed a broken File dependency when a plugin was set to absent and ::elasticsearch set to present.
+* Fixed a broken File dependency when a plugin was set to absent and elasticsearch set to present.
 * Fixed issue when using the `proxy` parameter on plugins in Elasticsearch 2.x.
 
 #### Changes

lib/puppet/provider/elastic_rest.rb

@@ -92,7 +92,7 @@ def self.api_objects(protocol = 'http',
                        password = nil,
                        ca_file = nil,
                        ca_path = nil,
-                       validate_tls: true)
+                       validate_tls = true)
 
     uri = URI("#{protocol}://#{host}:#{port}/#{format_uri(api_discovery_uri)}")
     http = Net::HTTP.new uri.host, uri.port
@@ -158,7 +158,7 @@ def self.prefetch(resources)
         (p.key?(:password) ? p[:password].value : nil),
         (p.key?(:ca_file) ? p[:ca_file].value : nil),
         (p.key?(:ca_path) ? p[:ca_path].value : nil),
-        { validate_tls: p[:validate_tls].value },
+        (p.key?(:validate_tls) ? p[:validate_tls].value : true),
       ]
       # Deduplicate identical settings, and fetch templates
     end.uniq
@@ -264,7 +264,7 @@ def flush
       resource[:password],
       resource[:ca_file],
       resource[:ca_path],
-      validate_tls: resource[:validate_tls]
+      resource[:validate_tls].nil? ? true : resource[:validate_tls]
     ).find do |t|
       t[:name] == resource[:name]
     end

lib/puppet/type/elasticsearch_component_template.rb

@@ -102,7 +102,7 @@ def insync?(value)
 
       fail(format('Could not find any content at %s', self[:source])) unless tmp
 
-      self[:content] = PSON.load(tmp.content)
+      self[:content] = JSON.parse(tmp.content)
     end
   end
   # rubocop:enable Style/SignalException

lib/puppet/type/elasticsearch_ilm_policy.rb

@@ -78,7 +78,7 @@ def insync?(value)
 
       fail(format('Could not find any content at %s', self[:source])) unless tmp
 
-      self[:content] = PSON.load(tmp.content)
+      self[:content] = JSON.parse(tmp.content)
     end
   end
   # rubocop:enable Style/SignalException

lib/puppet/type/elasticsearch_index_template.rb

@@ -109,7 +109,7 @@ def insync?(value)
 
       fail(format('Could not find any content at %s', self[:source])) unless tmp
 
-      self[:content] = PSON.load(tmp.content)
+      self[:content] = JSON.parse(tmp.content)
     end
   end
   # rubocop:enable Style/SignalException

lib/puppet/type/elasticsearch_slm_policy.rb

@@ -78,7 +78,7 @@ def insync?(value)
 
       fail(format('Could not find any content at %s', self[:source])) unless tmp
 
-      self[:content] = PSON.load(tmp.content)
+      self[:content] = JSON.parse(tmp.content)
     end
   end
   # rubocop:enable Style/SignalException

lib/puppet/type/elasticsearch_template.rb

@@ -110,7 +110,7 @@ def insync?(value)
 
       fail(format('Could not find any content at %s', self[:source])) unless tmp
 
-      self[:content] = PSON.load(tmp.content)
+      self[:content] = JSON.parse(tmp.content)
     end
   end
   # rubocop:enable Style/SignalException

metadata.json

@@ -78,7 +78,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ]
 }

spec/helpers/acceptance/tests/package_url_shared_examples.rb

@@ -10,8 +10,6 @@
       <<-MANIFEST
         api_timeout => 60,
         config => {
-          'cluster.name' => '#{v[:cluster_name]}',
-          'http.bind_host' => '0.0.0.0',
   #{es_config.map { |k, v| "        '#{k}' => '#{v}'," }.join("\n")}
         },
         jvm_options => [

spec/helpers/acceptance/tests/slm_policy_shared_examples.rb

@@ -99,8 +99,6 @@
       <<-MANIFEST
         api_timeout => 60,
         config => {
-          'cluster.name' => '#{v[:cluster_name]}',
-          'http.bind_host' => '0.0.0.0',
     #{es_config.map { |k, v| "        '#{k}' => '#{v}'," }.join("\n")}
         },
         jvm_options => [

spec/helpers/acceptance/tests/snapshot_repository_shared_examples.rb

@@ -29,8 +29,6 @@
       <<-MANIFEST
         api_timeout => 60,
         config => {
-          'cluster.name' => '#{v[:cluster_name]}',
-          'http.bind_host' => '0.0.0.0',
   #{es_config.map { |k, v| "        '#{k}' => '#{v}'," }.join("\n")}
         },
         jvm_options => [

spec/helpers/unit/type/elasticsearch_rest_shared_examples.rb

@@ -65,7 +65,7 @@
         end.not_to raise_error
       end
 
-      it 'parses PSON-like values for certain types' do
+      it 'parses JSON-like values for certain types' do
         expect(described_class.new(
           :name => resource_name,
           meta_property => { 'key' => { 'value' => '0', 'other' => true } }

spec/unit/provider/elasticsearch_keystore/elasticsearch_keystore_spec.rb

@@ -54,13 +54,15 @@
           to receive(:execute).
           with(
             [executable, 'list'],
-            custom_environment: {
-              'ES_INCLUDE' => defaults_file,
-              'ES_PATH_CONF' => "/etc/elasticsearch/#{instance}"
-            },
-            uid: 'elasticsearch',
-            gid: 'elasticsearch',
-            failonfail: true
+            {
+              custom_environment: {
+                'ES_INCLUDE' => defaults_file,
+                'ES_PATH_CONF' => "/etc/elasticsearch/#{instance}"
+              },
+              uid: 'elasticsearch',
+              gid: 'elasticsearch',
+              failonfail: true
+            }
           ).
           and_return(
             Puppet::Util::Execution::ProcessOutput.new(
@@ -118,13 +120,15 @@
         receive(:execute).
           with(
             [executable, 'create'],
-            custom_environment: {
-              'ES_INCLUDE' => '/etc/default/elasticsearch-es-03',
-              'ES_PATH_CONF' => '/etc/elasticsearch/es-03'
-            },
-            uid: 'elasticsearch',
-            gid: 'elasticsearch',
-            failonfail: true
+            {
+              custom_environment: {
+                'ES_INCLUDE' => '/etc/default/elasticsearch-es-03',
+                'ES_PATH_CONF' => '/etc/elasticsearch/es-03'
+              },
+              uid: 'elasticsearch',
+              gid: 'elasticsearch',
+              failonfail: true
+            }
           ).
           and_return(Puppet::Util::Execution::ProcessOutput.new('', 0))
       )
@@ -135,13 +139,15 @@
         have_received(:execute).
           with(
             [executable, 'create'],
-            custom_environment: {
-              'ES_INCLUDE' => '/etc/default/elasticsearch-es-03',
-              'ES_PATH_CONF' => '/etc/elasticsearch/es-03'
-            },
-            uid: 'elasticsearch',
-            gid: 'elasticsearch',
-            failonfail: true
+            {
+              custom_environment: {
+                'ES_INCLUDE' => '/etc/default/elasticsearch-es-03',
+                'ES_PATH_CONF' => '/etc/elasticsearch/es-03'
+              },
+              uid: 'elasticsearch',
+              gid: 'elasticsearch',
+              failonfail: true
+            }
           )
       )
     end