puppet 8.2.0-x86-mingw32 → 8.4.0-x86-mingw32

data/lib/puppet/ssl/verifier.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/ssl'
 
 # Verify an SSL connection.
 #
 # @api private
 class Puppet::SSL::Verifier
-
   FIVE_MINUTES_AS_SECONDS = 5 * 60
 
   attr_reader :ssl_context
@@ -30,7 +30,7 @@ class Puppet::SSL::Verifier
   # @api private
   def reusable?(verifier)
     verifier.instance_of?(self.class) &&
-      verifier.ssl_context.object_id == @ssl_context.object_id
+      verifier.ssl_context.equal?(@ssl_context) # same object?
   end
 
   # Configure the `http` connection based on the current `ssl_context`.

data/lib/puppet/ssl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Just to make the constants work out.
 require_relative '../puppet'
 require_relative 'ssl/openssl_loader'

data/lib/puppet/syntax_checkers/base64.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 # A syntax checker for Base64.
 # @api public
 require_relative '../../puppet/syntax_checkers'
 require 'base64'
 class Puppet::SyntaxCheckers::Base64 < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
-
   # Checks the text for BASE64 syntax issues and reports them to the given acceptor.
   # This checker allows the most relaxed form of Base64, including newlines and missing padding.
   # It also accept URLsafe input.
@@ -19,6 +19,7 @@ class Puppet::SyntaxCheckers::Base64 < Puppet::Plugins::SyntaxCheckers::SyntaxCh
     raise ArgumentError.new(_("Base64 syntax checker: the text to check must be a String.")) unless text.is_a?(String)
     raise ArgumentError.new(_("Base64 syntax checker: the syntax identifier must be a String, e.g. json, data+json")) unless syntax.is_a?(String)
     raise ArgumentError.new(_("Base64 syntax checker: invalid Acceptor, got: '%{klass}'.") % { klass: acceptor.class.name }) unless acceptor.is_a?(Puppet::Pops::Validation::Acceptor)
+
     cleaned_text = text.gsub(/[\r?\n[:blank:]]/, '')
     begin
       # Do a strict decode64 on text with all whitespace stripped since the non strict version

data/lib/puppet/syntax_checkers/epp.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 # A syntax checker for JSON.
 # @api public
 require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::EPP < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
-
   # Checks the text for Puppet Language EPP syntax issues and reports them to the given acceptor.
   #
   # Error messages from the checker are capped at 100 chars from the source text.

data/lib/puppet/syntax_checkers/json.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 # A syntax checker for JSON.
 # @api public
 require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::Json < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
-
   # Checks the text for JSON syntax issues and reports them to the given acceptor.
   #
   # Error messages from the checker are capped at 100 chars from the source text.
@@ -18,7 +18,6 @@ class Puppet::SyntaxCheckers::Json < Puppet::Plugins::SyntaxCheckers::SyntaxChec
     raise ArgumentError.new(_("Json syntax checker: the text to check must be a String.")) unless text.is_a?(String)
     raise ArgumentError.new(_("Json syntax checker: the syntax identifier must be a String, e.g. json, data+json")) unless syntax.is_a?(String)
     raise ArgumentError.new(_("Json syntax checker: invalid Acceptor, got: '%{klass}'.") % { klass: acceptor.class.name }) unless acceptor.is_a?(Puppet::Pops::Validation::Acceptor)
-    #raise ArgumentError.new("Json syntax checker: location_info must be a Hash") unless location_info.is_a?(Hash)
 
     begin
       Puppet::Util::Json.load(text)

data/lib/puppet/syntax_checkers/pp.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 # A syntax checker for JSON.
 # @api public
 require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::PP < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
-
   # Checks the text for Puppet Language syntax issues and reports them to the given acceptor.
   #
   # Error messages from the checker are capped at 100 chars from the source text.

data/lib/puppet/syntax_checkers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A name space for syntax checkers provided by Puppet.
 module Puppet::SyntaxCheckers
 end

data/lib/puppet/test/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'tmpdir'
 require 'fileutils'
 
@@ -52,9 +53,9 @@ module Puppet::Test
       Dir.mkdir("#{@environmentpath}/production")
       owner = Process.pid
       Puppet.push_context(Puppet.base_context({
-        :environmentpath => @environmentpath,
-        :basemodulepath => "",
-      }), "Initial for specs")
+                                                :environmentpath => @environmentpath,
+                                                :basemodulepath => "",
+                                              }), "Initial for specs")
       Puppet::Parser::Functions.reset
 
       ObjectSpace.define_finalizer(Puppet.lookup(:environments), proc {
@@ -94,6 +95,7 @@ module Puppet::Test
       # only once.
       #
       return unless @@reentry_count == 0
+
       @@reentry_count = 1
 
       Puppet.mark_context(ROLLBACK_MARK)
@@ -116,10 +118,10 @@ module Puppet::Test
       indirections.each do |indirector|
         $saved_indirection_state[indirector.name] = {
           :@terminus_class => indirector.instance_variable_get(:@terminus_class).value,
-          :@cache_class    => indirector.instance_variable_get(:@cache_class).value,
+          :@cache_class => indirector.instance_variable_get(:@cache_class).value,
           # dup the termini hash so termini created and registered during
           # the test aren't stored in our saved_indirection_state
-          :@termini        => indirector.instance_variable_get(:@termini).dup
+          :@termini => indirector.instance_variable_get(:@termini).dup
         }
       end
 
@@ -157,6 +159,7 @@ module Puppet::Test
       # Ensure that a matching tear down only happens once per completed setup
       # (see #before_each_test).
       return unless @@reentry_count == 1
+
       @@reentry_count = 0
 
       Puppet.settings.send(:clear_everything_for_tests)
@@ -168,7 +171,7 @@ module Puppet::Test
       Puppet.clear_deprecation_warnings
 
       # uncommenting and manipulating this can be useful when tracking down calls to deprecated code
-      #Puppet.log_deprecations_to_file("deprecations.txt", /^Puppet::Util.exec/)
+      # Puppet.log_deprecations_to_file("deprecations.txt", /^Puppet::Util.exec/)
 
       # Restore the indirector configuration.  See before hook.
       indirections = Puppet::Indirector::Indirection.send(:class_variable_get, :@@indirections)
@@ -196,7 +199,6 @@ module Puppet::Test
       Puppet.rollback_context(ROLLBACK_MARK)
     end
 
-
     #########################################################################################
     # PRIVATE METHODS (not part of the public TestHelper API--do not call these from outside
     #  of this class!)
@@ -204,13 +206,13 @@ module Puppet::Test
 
     def self.app_defaults_for_tests()
       {
-          :logdir     => "/dev/null",
-          :confdir    => "/dev/null",
-          :publicdir  => "/dev/null",
-          :codedir    => "/dev/null",
-          :vardir     => "/dev/null",
-          :rundir     => "/dev/null",
-          :hiera_config => "/dev/null",
+        :logdir => "/dev/null",
+        :confdir => "/dev/null",
+        :publicdir => "/dev/null",
+        :codedir => "/dev/null",
+        :vardir => "/dev/null",
+        :rundir => "/dev/null",
+        :hiera_config => "/dev/null",
       }
     end
     private_class_method :app_defaults_for_tests

data/lib/puppet/thread_local.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'concurrent'
 
 class Puppet::ThreadLocal < Concurrent::ThreadLocalVar

data/lib/puppet/transaction/additional_resource_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Adds additional resources to the catalog and relationship graph that are
 # generated by existing resources. There are two ways that a resource can
 # generate additional resources, either through the #generate method or the
@@ -19,6 +20,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
 
   def generate_additional_resources(resource)
     return unless resource.respond_to?(:generate)
+
     begin
       generated = resource.generate
     rescue => detail
@@ -26,6 +28,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
       resource.log_exception(detail, _("Failed to generate additional resources using 'generate': %{detail}") % { detail: detail })
     end
     return unless generated
+
     generated = [generated] unless generated.is_a?(Array)
     generated.collect! do |res|
       @catalog.resource(res.ref) || res
@@ -53,12 +56,13 @@ class Puppet::Transaction::AdditionalResourceGenerator
   def eval_generate(resource)
     return false unless resource.respond_to?(:eval_generate)
     raise Puppet::DevError, _("Depthfirst resources are not supported by eval_generate") if resource.depthfirst?
+
     begin
       generated = replace_duplicates_with_catalog_resources(resource.eval_generate)
       return false if generated.empty?
     rescue => detail
       @resources_failed_to_generate = true
-      #TRANSLATORS eval_generate is a method name and should be left untranslated
+      # TRANSLATORS eval_generate is a method name and should be left untranslated
       resource.log_exception(detail, _("Failed to generate additional resources using 'eval_generate': %{detail}") % { detail: detail })
       return false
     end

data/lib/puppet/transaction/event.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/transaction'
 require_relative '../../puppet/util/tagging'
 require_relative '../../puppet/util/logging'
@@ -68,9 +69,9 @@ class Puppet::Transaction::Event
 
   def initialize_from_hash(data)
     data = Puppet::Pops::Serialization::FromDataConverter.convert(data, {
-      :allow_unresolved => true,
-      :loader => Puppet::Pops::Loaders.static_loader
-    })
+                                                                    :allow_unresolved => true,
+                                                                    :loader => Puppet::Pops::Loaders.static_loader
+                                                                  })
     @audited = data['audited']
     @property = data['property']
     @previous_value = data['previous_value']
@@ -123,6 +124,7 @@ class Puppet::Transaction::Event
 
   def status=(value)
     raise ArgumentError, _("Event status can only be %{statuses}") % { statuses: EVENT_STATUSES.join(', ') } unless EVENT_STATUSES.include?(value)
+
     @status = value
   end
 

data/lib/puppet/transaction/event_manager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/transaction'
 
 # This class stores, routes, and responds to events generated while evaluating
@@ -6,7 +7,6 @@ require_relative '../../puppet/transaction'
 #
 # @api private
 class Puppet::Transaction::EventManager
-
   # @!attribute [r] transaction
   #   @return [Puppet::Transaction] The transaction associated with this event manager.
   attr_reader :transaction
@@ -50,7 +50,7 @@ class Puppet::Transaction::EventManager
   # @param events [Array<Puppet::Transaction::Event>] All events generated by this resource
   # @return [void]
   def queue_events(resource, events)
-    #@events += events
+    # @events += events
 
     # Do some basic normalization so we're not doing so many
     # graph queries for large sets of events.
@@ -58,7 +58,7 @@ class Puppet::Transaction::EventManager
       collection[event.name] ||= []
       collection[event.name] << event
       collection
-    end.collect do |name, list|
+    end.collect do |_name, list|
       # It doesn't matter which event we use - they all have the same source
       # and name here.
       event = list[0]
@@ -118,6 +118,7 @@ class Puppet::Transaction::EventManager
   def queued_events(resource)
     callbacks = @event_queues[resource]
     return unless callbacks
+
     callbacks.each do |callback, events|
       yield callback, events unless events.empty?
     end

data/lib/puppet/transaction/persistence.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'yaml'
 require_relative '../../puppet/util/yaml'
 
@@ -7,7 +8,6 @@ require_relative '../../puppet/util/yaml'
 # as calculating corrective_change).
 # @api private
 class Puppet::Transaction::Persistence
-
   def self.allowed_classes
     @allowed_classes ||= [
       Symbol,
@@ -75,6 +75,7 @@ class Puppet::Transaction::Persistence
     unless Puppet::FileSystem.exist?(filename)
       return
     end
+
     unless File.file?(filename)
       Puppet.warning(_("Transaction store file %{filename} is not a file, ignoring") % { filename: filename })
       return

data/lib/puppet/transaction/report.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/indirector'
 
@@ -205,7 +206,7 @@ class Puppet::Transaction::Report
 
   # @api private
   def prune_internal_data
-    resource_statuses.delete_if {|name,res| res.resource_type == 'Whit'}
+    resource_statuses.delete_if {|_name,res| res.resource_type == 'Whit'}
   end
 
   # @api private
@@ -219,7 +220,7 @@ class Puppet::Transaction::Report
     add_metric(:changes, {TOTAL => change_metric})
     add_metric(:events, calculate_event_metrics)
     @status = compute_status(resource_metrics, change_metric)
-    @noop_pending = @resource_statuses.any? { |name,res| has_noop_events?(res) }
+    @noop_pending = @resource_statuses.any? { |_name,res| has_noop_events?(res) }
   end
 
   # @api private
@@ -301,12 +302,18 @@ class Puppet::Transaction::Report
 
     @resource_statuses = {}
     data['resource_statuses'].map do |key, rs|
-      @resource_statuses[key] = if rs == Puppet::Resource::EMPTY_HASH
-        nil
-      else
-        # Older versions contain tags that causes Psych to create instances directly
-        rs.is_a?(Puppet::Resource::Status) ? rs : Puppet::Resource::Status.from_data_hash(rs)
-      end
+      @resource_statuses[key] =
+        if rs == Puppet::Resource::EMPTY_HASH
+          nil
+        else
+          # Older versions contain tags that causes Psych to create instances
+          # directly
+          if rs.is_a?(Puppet::Resource::Status)
+            rs
+          else
+            Puppet::Resource::Status.from_data_hash(rs)
+          end
+        end
     end
   end
 
@@ -369,7 +376,7 @@ class Puppet::Transaction::Report
   def summary
     report = raw_summary
 
-    ret = String.new
+    ret = ''.dup
     report.keys.sort_by(&:to_s).each do |key|
       ret += "#{Puppet::Util::Metric.labelize(key)}:\n"
 
@@ -385,6 +392,7 @@ class Puppet::Transaction::Report
       }.each do |label|
         value = report[key][label]
         next if value == 0
+
         value = "%0.2f" % value if value.is_a?(Float)
         ret += "   %15s %s\n" % [Puppet::Util::Metric.labelize(label) + ":", value]
       end
@@ -409,10 +417,10 @@ class Puppet::Transaction::Report
       }
     }
 
-    @metrics.each do |name, metric|
+    @metrics.each do |_name, metric|
       key = metric.name.to_s
       report[key] = {}
-      metric.values.each do |metric_name, label, value|
+      metric.values.each do |metric_name, _label, value|
         report[key][metric_name.to_s] = value
       end
       report[key][TOTAL] = 0 unless key == "time" or report[key].include?(TOTAL)
@@ -449,19 +457,19 @@ class Puppet::Transaction::Report
 
   # Mark the report as corrective, if there are any resource_status marked corrective.
   def calculate_report_corrective_change
-    @corrective_change = resource_statuses.any? do |name, status|
+    @corrective_change = resource_statuses.any? do |_name, status|
       status.corrective_change
     end
   end
 
   def calculate_change_metric
-    resource_statuses.map { |name, status| status.change_count || 0 }.inject(0) { |a,b| a+b }
+    resource_statuses.map { |_name, status| status.change_count || 0 }.inject(0) { |a,b| a+b }
   end
 
   def calculate_event_metrics
     metrics = Hash.new(0)
     %w{total failure success}.each { |m| metrics[m] = 0 }
-    resource_statuses.each do |name, status|
+    resource_statuses.each do |_name, status|
       metrics[TOTAL] += status.events.length
       status.events.each do |event|
         metrics[event.status] += 1
@@ -481,7 +489,7 @@ class Puppet::Transaction::Report
       metrics[state.to_s] = 0
     end
 
-    resource_statuses.each do |name, status|
+    resource_statuses.each do |_name, status|
       Puppet::Resource::Status::STATES.each do |state|
         metrics[state.to_s] += 1 if status.send(state)
       end
@@ -492,7 +500,7 @@ class Puppet::Transaction::Report
 
   def calculate_time_metrics
     metrics = Hash.new(0)
-    resource_statuses.each do |name, status|
+    resource_statuses.each do |_name, status|
       metrics[status.resource_type.downcase] += status.evaluation_time if status.evaluation_time
     end
 

data/lib/puppet/transaction/resource_harness.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/resource/status'
 
 class Puppet::Transaction::ResourceHarness
@@ -36,6 +37,7 @@ class Puppet::Transaction::ResourceHarness
 
   def scheduled?(resource)
     return true if Puppet[:ignoreschedules]
+
     schedule = schedule(resource)
     return true unless schedule
 
@@ -55,6 +57,7 @@ class Puppet::Transaction::ResourceHarness
 
     name = resource[:schedule]
     return nil unless name
+
     resource.catalog.resource(:schedule, name) || resource.fail(_("Could not find schedule %{name}") % { name: name })
   end
 
@@ -216,8 +219,8 @@ class Puppet::Transaction::ResourceHarness
     # the resource application context to see if an event was actually generated.
     if !are_audited_values_equal(context.historical_values[property.name], context.current_values[property.name])
       event.message = property.format(_("audit change: previously recorded value %s has been changed to %s"),
-                 property.is_to_s(event.historical_value),
-                 property.is_to_s(event.previous_value))
+                                      property.is_to_s(event.historical_value),
+                                      property.is_to_s(event.previous_value))
     end
 
     event
@@ -310,7 +313,7 @@ class Puppet::Transaction::ResourceHarness
                                      (resource[:audit] || []).map { |p| p.to_sym },
                                      [],
                                      status,
-                                     resource.parameters.select { |n,p| p.is_a?(Puppet::Property) && !p.sensitive })
+                                     resource.parameters.select { |_n,p| p.is_a?(Puppet::Property) && !p.sensitive })
     end
 
     def resource_present?

data/lib/puppet/transaction.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet'
 require_relative '../puppet/util/tagging'
 require_relative '../puppet/util/skip_tags'
@@ -126,6 +127,7 @@ class Puppet::Transaction
       # We don't automatically assign unsuitable providers, so if there
       # is one, it must have been selected by the user.
       return if missing_tags?(resource)
+
       if resource.provider
         resource.err _("Provider %{name} is not functional on this host") % { name: resource.provider.class.name }
       else
@@ -302,9 +304,11 @@ class Puppet::Transaction
     s = resource_status(resource)
     if s && s.dependency_failed?
       if @merge_dependency_warnings && is_puppet_class
-       	# Notes: Puppet::Resource::Status.failed_dependencies() is an Array of Puppet::Resource(s) and
-        #        Puppet::Resource.ref() calls Puppet::Resource.to_s() which is: "#{type}[#{title}]" and
-       	#        Puppet::Resource.resource_status(resource) calls Puppet::Resource.to_s()
+        # Notes: Puppet::Resource::Status.failed_dependencies() is an Array of
+        # Puppet::Resource(s) and Puppet::Resource.ref() calls
+        # Puppet::Resource.to_s() which is: "#{type}[#{title}]" and
+        # Puppet::Resource.resource_status(resource) calls
+        # Puppet::Resource.to_s()
         class_dependencies_to_be_notified = (s.failed_dependencies.map(&:ref) - @failed_class_dependencies_already_notified.to_a)
         class_dependencies_to_be_notified.each do |dep_ref|
           resource.notice _("Class dependency %{dep} has failures: %{status}") % { dep: dep_ref, status: resource_status(dep_ref).failed }
@@ -331,7 +335,6 @@ class Puppet::Transaction
   # up-front at failure time because the graph may be mutated as we
   # walk it.
   def propagate_failure(resource)
-
     provider_class = resource.provider.class
     s = resource_status(resource)
     if prefetch_failed_providers[resource.type][provider_class.name] && !s.nil?
@@ -343,6 +346,7 @@ class Puppet::Transaction
     relationship_graph.direct_dependencies_of(resource).each do |dep|
       s = resource_status(dep)
       next if s.nil?
+
       failed.merge(s.failed_dependencies) if s.dependency_failed?
       failed.add(dep) if s.failed? || s.failed_to_restart?
     end
@@ -375,11 +379,12 @@ class Puppet::Transaction
     type_name = provider_class.resource_type.name
     return if @prefetched_providers[type_name][provider_class.name] ||
       @prefetch_failed_providers[type_name][provider_class.name]
+
     Puppet.debug { "Prefetching #{provider_class.name} resources for #{type_name}" }
     begin
       provider_class.prefetch(resources)
     rescue LoadError, StandardError => detail
-      #TRANSLATORS `prefetch` is a function name and should not be translated
+      # TRANSLATORS `prefetch` is a function name and should not be translated
       message = _("Could not prefetch %{type_name} provider '%{name}': %{detail}") % { type_name: type_name, name: provider_class.name, detail: detail }
       Puppet.log_exception(detail, message)
       @prefetch_failed_providers[type_name][provider_class.name] = true
@@ -422,7 +427,7 @@ class Puppet::Transaction
         end
       end
     elsif resource_status(resource).failed? && @prefetch_failed_providers[resource.type][resource.provider.class.name]
-      #Do not try to evaluate a resource with a known failed provider
+      # Do not try to evaluate a resource with a known failed provider
       resource.warning _("Skipping because provider prefetch failed")
     elsif resource.virtual?
       resource.debug "Skipping because virtual"

data/lib/puppet/trusted_external.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
+
 # A method for retrieving external trusted facts
 module Puppet::TrustedExternal
   def retrieve(certname)
     command = Puppet[:trusted_external_command]
     return nil unless command
+
     Puppet.debug { _("Retrieving trusted external data from %{command}") % {command: command} }
     setting_type = Puppet.settings.setting(:trusted_external_command).type
     if setting_type == :file
       return fetch_data(command, certname)
     end
+
     # command is a directory. Thus, data is a hash of <basename> => <data> for
     # each executable file in command. For example, if the files 'servicenow.rb',
     # 'unicorn.sh' are in command, then data is the following hash:
@@ -18,13 +21,14 @@ module Puppet::TrustedExternal
       abs_path = Puppet::FileSystem.expand_path(file)
       executable_file = Puppet::FileSystem.file?(abs_path) && Puppet::FileSystem.executable?(abs_path)
       unless executable_file
-        Puppet.debug { _("Skipping non-executable file %{file}")  % { file: abs_path } }
+        Puppet.debug { _("Skipping non-executable file %{file}") % { file: abs_path } }
         next
       end
       basename = file.basename(file.extname).to_s
       unless data[basename].nil?
         raise Puppet::Error, _("There is more than one '%{basename}' script in %{dir}") % { basename: basename, dir: command }
       end
+
       data[basename] = fetch_data(abs_path, certname)
     end
     data
@@ -33,9 +37,9 @@ module Puppet::TrustedExternal
 
   def fetch_data(command, certname)
     result = Puppet::Util::Execution.execute([command, certname], {
-      :combine => false,
-      :failonfail => true,
-    })
+                                               :combine => false,
+                                               :failonfail => true,
+                                             })
     JSON.parse(result)
   end
   module_function :fetch_data

data/lib/puppet/type/component.rb

@@ -15,15 +15,21 @@ Puppet::Type.newtype(:component) do
   # Override how parameters are handled so that we support the extra
   # parameters that are used with defined resource types.
   def [](param)
-    return super if self.class.valid_parameter?(param)
-    @extra_parameters[param.to_sym]
+    if self.class.valid_parameter?(param)
+      super
+    else
+      @extra_parameters[param.to_sym]
+    end
   end
 
   # Override how parameters are handled so that we support the extra
   # parameters that are used with defined resource types.
   def []=(param, value)
-    return super if self.class.valid_parameter?(param)
-    @extra_parameters[param.to_sym] = value
+    if self.class.valid_parameter?(param)
+      super
+    else
+      @extra_parameters[param.to_sym] = value
+    end
   end
 
   # Initialize a new component
@@ -64,7 +70,7 @@ Puppet::Type.newtype(:component) do
     catalog.adjacent(self).each do |child|
       if child.respond_to?(:refresh)
         child.refresh
-        child.log "triggering #{:refresh}"
+        child.log "triggering refresh"
       end
     end
   end