(PUP-12046) Send facts for catalog download WIP

Author: tvpartytonight

lib/puppet/face/catalog.rb

@@ -135,9 +135,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

@@ -65,14 +65,17 @@ def call_indirection_method(method, key, options)
   action :find do
     summary _("Retrieve an object by name.")
     arguments _("[<key>]")
+    option("--facts_for_catalog") do
+      summary _("Internal option for find to allow facts to be sent for the catalog")
+    end
     when_invoked do |*args|
       # Default the key to Puppet[:certname] if none is supplied
       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