Adding the topscope metadata to the configuration being returned to the client, just like it expects, and fixing how the resource handler calls the master type.

1 files changed, 16 insertions, 1 deletions

diff --git a/lib/puppet/parser/configuration.rb b/lib/puppet/parser/configuration.rb
index 26553d443..ea784da05 100644
--- a/lib/puppet/parser/configuration.rb
+++ b/lib/puppet/parser/configuration.rb
@@ -344,8 +344,23 @@ class Puppet::Parser::Configuration
             end
         end
 
-        # Clear the cache to encourage the GC
+        # Retrive the bucket for the top-level scope and set the appropriate metadata.
         result = buckets[topscope]
+        case topscope.type
+        when "": result.type = "main"
+        when nil: devfail "A Scope with no type"
+        else
+            result.type = topscope.type
+        end
+        if topscope.name
+            result.name = topscope.name
+        end
+
+        unless classlist.empty?
+            result.classes = classlist
+        end
+
+        # Clear the cache to encourage the GC
         buckets.clear
         return result
     end