(PUP-12046) Send facts for catalog download WIP

Author: tvpartytonight

lib/puppet/face/catalog.rb

@@ -33,6 +33,10 @@
     Puppet::Resource::Catalog object.
   EOT
 
+  unless find.options.include?(:facts_for_catalog)
+    find.add_option(Puppet::Interface::Option.new(find, '--facts_for_catalog'))
+  end
+
   action(:apply) do
     summary "Find and apply a catalog."
     description <<-'EOT'
@@ -135,9 +139,11 @@
     when_invoked do |_options|
       Puppet::Resource::Catalog.indirection.terminus_class = :rest
       Puppet::Resource::Catalog.indirection.cache_class = nil
+      facts = Puppet::Face[:facts, '0.0.1'].find(Puppet[:certname])
       catalog = nil
       retrieval_duration = thinmark do
-        catalog = Puppet::Face[:catalog, '0.0.1'].find(Puppet[:certname])
+        catalog = Puppet::Face[:catalog, '0.0.1'].find(Puppet[:certname],
+                                                       { facts_for_catalog: facts })
       end
       catalog.retrieval_duration = retrieval_duration
       catalog.write_class_file

lib/puppet/indirector/face.rb

@@ -70,9 +70,9 @@ def call_indirection_method(method, key, options)
       if args.length == 1
         key = Puppet[:certname]
       else
-        key = args.first
+        key = args.shift
       end
-      call_indirection_method :find, key, {}
+      call_indirection_method :find, key, args.first
     end
   end