From 8122178d063881ec976d89af44bc9cbb7e4955ec Mon Sep 17 00:00:00 2001
From: donoghuc <cas.donoghue@gmail.com>
Date: Thu, 9 May 2024 16:21:46 -0700
Subject: [PATCH] (GH-3309) Ensure bundled-ruby defaults are applied at target
 init

Previously defaults were not applied until an action was actually requested on a target. This made inventory resolution confusing and non-determanistic behavior with apply_prep. This commit moves application of defaults for a target to the init method for creating a target object.

!bug

* **Apply bundled-ruby defaults at target creation** ([#3309](3309))

  Ensure defaults associated with `bundled-ruby` transport config are
  applied at target initialization.
---
 lib/bolt/inventory/target.rb | 4 +++-
 lib/bolt/target.rb           | 4 ----
 lib/bolt/transport/local.rb  | 4 ----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/bolt/inventory/target.rb b/lib/bolt/inventory/target.rb
index abec9ce4ac..0496c37b3a 100644
--- a/lib/bolt/inventory/target.rb
+++ b/lib/bolt/inventory/target.rb
@@ -34,7 +34,7 @@ def initialize(target_data, inventory)
           @name = @uri
           @safe_name = @uri_obj.omit(:password).to_str.sub(%r{^//}, '')
         end
-
+        # handle special localhost target
         if @name == 'localhost'
           default = { 'config' => { 'transport' => 'local' } }
           target_data = Bolt::Util.deep_merge(default, target_data)
@@ -53,6 +53,8 @@ def initialize(target_data, inventory)
         @inventory = inventory
 
         validate
+        # after setting config, apply local defaults when using bundled ruby
+        set_local_defaults if transport_config['bundled-ruby']
       end
 
       def set_local_defaults
diff --git a/lib/bolt/target.rb b/lib/bolt/target.rb
index 1b445eebe2..9a84d83f03 100644
--- a/lib/bolt/target.rb
+++ b/lib/bolt/target.rb
@@ -80,10 +80,6 @@ def resources
       inventory_target.resources
     end
 
-    def set_local_defaults
-      inventory_target.set_local_defaults
-    end
-
     # rubocop:disable Naming/AccessorMethodName
     def set_resource(resource)
       inventory_target.set_resource(resource)
diff --git a/lib/bolt/transport/local.rb b/lib/bolt/transport/local.rb
index b574d9c63c..390554d0ad 100644
--- a/lib/bolt/transport/local.rb
+++ b/lib/bolt/transport/local.rb
@@ -11,10 +11,6 @@ def connected?(_target)
       end
 
       def with_connection(target)
-        if target.transport_config['bundled-ruby']
-          target.set_local_defaults
-        end
-
         yield Connection.new(target)
       end
     end