(PUP-5395) Fix failing test, debug using blocks, and remove nil check

In this commit:

Fix data_binding_spec.rb which was failing in an order sensitive way.
Enclose formatted debug statement in Indirector in block.
Remove redundant nil check for environment config.

Added ticket PUP-5434 so we don't forget to remove deprecated methods.

Author: thallgren

Diff for: lib/puppet/data_providers/lookup_adapter.rb

@@ -172,14 +172,8 @@ def initialize_env_provider
     # Support running tests without an injector being configured == using a null implementation
     return EnvironmentDataProvider.new() unless injector
 
-    # Get the environment's configuration since we need to know which data provider
-    # should be used (includes 'none' which gets a null implementation).
-    #
-    env_conf = @env.configuration
-
-    # Get the data provider and find the bound implementation
-    # TODO: PUP-1640, drop the nil check when legacy env support is dropped
-    provider_name = env_conf.nil? ? 'none' : env_conf.environment_data_provider
+    # Get the name of the data provider from the environment's configuration and find the bound implementation
+    provider_name = @env.configuration.environment_data_provider
     service_type = Registry.hash_of_environment_data_providers
     service_name = ENV_DATA_PROVIDERS_KEY
 

Diff for: lib/puppet/indirector/hiera.rb

@@ -18,7 +18,7 @@ def initialize(*args)
   def find(request)
     not_found = Object.new
     options = request.options
-    Puppet.debug "Performing a hiera indirector lookup of #{request.key} with options #{options.inspect}"
+    Puppet.debug { "Performing a hiera indirector lookup of #{request.key} with options #{options.inspect}" }
     value = hiera.lookup(request.key, not_found, Hiera::Scope.new(options[:variables]), nil, convert_merge(options[:merge]))
     throw :no_such_key if value.equal?(not_found)
     value

Diff for: spec/integration/data_binding_spec.rb

@@ -50,9 +50,11 @@
     }
   }}
 
-
   before do
-    Puppet[:data_binding_terminus] = "hiera"
+    # Drop all occurances of cached hiera instances. This will reset @hiera in Puppet::Indirector::Hiera, Testing::DataBinding::Hiera,
+    # and Puppet::DataBinding::Hiera. Different classes are active as indirection depending on configuration
+    ObjectSpace.each_object(Class).select {|klass| klass <= Puppet::Indirector::Hiera }.each { |klass| klass.instance_variable_set(:@hiera, nil) }
+    Puppet[:data_binding_terminus] = 'hiera'
     Puppet[:modulepath] = dir
   end