(PUP-11981) WIP

Author: AriaXLi

Diff for: lib/puppet/info_service.rb

@@ -6,6 +6,7 @@ module Puppet::InfoService
   require_relative 'info_service/plan_information_service'
 
   def self.classes_per_environment(env_file_hash)
+    #require 'pry-byebug'; binding.pry
     Puppet::InfoService::ClassInformationService.new.classes_per_environment(env_file_hash)
   end
 

Diff for: lib/puppet/info_service/class_information_service.rb

@@ -26,6 +26,7 @@ def classes_per_environment(env_file_hash)
     #     if file already processed, use last result or error
     #
     env_file_hash.each do |env, files|
+      #require 'pry-byebug'; binding.pry
       env_result = result[env] = {}
       files.each do |f|
         env_result[f] = result_of(f)
@@ -56,6 +57,7 @@ def parse_file(f)
     return {:error => _("The file %{f} does not exist") % { f: f }} unless Puppet::FileSystem.exist?(f)
 
     begin
+      #require 'pry-byebug'; binding.pry
       parse_result = @parser.parse_file(f)
       {:classes =>
         parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
@@ -77,9 +79,11 @@ def extract_type(structure, p)
     return structure if p.type_expr.nil?
     structure[:type] = typeexpr_to_string(p.type_expr)
     structure
+    # require 'pry-byebug'; binding.pry
   end
 
   def extract_default(structure, p)
+    # require 'pry-byebug'; binding.pry
     value_expr = p.value
     return structure if value_expr.nil?
     default_value = value_as_literal(value_expr)

Diff for: lib/puppet/pops/evaluator/literal_evaluator.rb

@@ -13,7 +13,7 @@ module Evaluator
 # Regular Expression (produces ruby regular expression)
 #
 # Not considered literal
-# QualifiedReference  # i.e. File, FooBar
+# QualifiedReference  # i.e. File, FooBar # REMOVE THIS?
 #
 class LiteralEvaluator
 
@@ -28,6 +28,7 @@ def literal(ast)
   end
 
   def literal_Object(o)
+    #require 'byebug'; byebug
     throw :not_literal
   end
 
@@ -40,6 +41,7 @@ def literal_Program(o)
   end
 
   def literal_LiteralString(o)
+    #require 'byebug'; byebug if $DEBUG
     o.value
   end
 
@@ -48,6 +50,7 @@ def literal_QualifiedName(o)
   end
 
   def literal_LiteralNumber(o)
+    #require 'byebug'; byebug
     o.value
   end
 
@@ -67,6 +70,17 @@ def literal_LiteralRegularExpression(o)
     o.value
   end
 
+  def literal_QualifiedReference(o)
+    #require 'pry-byebug'; binding.pry
+    o.value
+  end
+
+  def literal_AccessExpression(o)
+    #require 'byebug'; byebug
+    throw :not_literal if o.keys.size == 1 && o.keys[0].is_a?(Model::LiteralList)
+    o.keys.map {|v| literal(v) }
+  end
+
   def literal_ConcatenatedString(o)
     # use double quoted string value if there is no interpolation
     throw :not_literal unless o.segments.size == 1 && o.segments[0].is_a?(Model::LiteralString)

Diff for: lib/puppet/pops/issues.rb

@@ -207,6 +207,10 @@ def self.hard_issue(issue_code, *args, &block)
     _("The numeric parameter name '$%{name}' cannot be used (clashes with numeric match result variables)") % { name: name }
   end
 
+  ILLEGAL_NONLITERAL_PARAMETER_TYPE = issue :ILLEGAL_NONLITERAL_PARAMETER_TYPE, :name, :type_class do
+    _("The parameter '$%{name}' must be a literal type, not %{type_class}") % { name: name, type_class: label.a_an(type_class) }
+  end
+
   # In certain versions of Puppet it may be allowed to assign to a not already assigned key
   # in an array or a hash. This is an optional validation that may be turned on to prevent accidental
   # mutation.

Diff for: lib/puppet/pops/validation/checker4_0.rb

@@ -471,6 +471,7 @@ def check_HostClassDefinition(o)
     internal_check_parameter_name_uniqueness(o)
     internal_check_reserved_params(o)
     internal_check_no_idem_last(o)
+    internal_check_parameter_type_literal(o)
   end
 
   def check_ResourceTypeDefinition(o)
@@ -481,6 +482,19 @@ def check_ResourceTypeDefinition(o)
     internal_check_no_idem_last(o)
   end
 
+  def internal_check_parameter_type_literal(o)
+    type = nil
+    o.parameters.each do |p|
+      next unless p.type_expr
+      #require 'byebug'; byebug
+      catch :not_literal do
+        #require 'byebug'; byebug
+        type = literal(p.type_expr)
+      end
+      acceptor.accept(Issues::ILLEGAL_NONLITERAL_PARAMETER_TYPE, p, {name: p.name, type_class: p.type_expr.class}) if type.nil?
+    end
+  end
+
   def internal_check_return_type(o)
     r = o.return_type
     internal_check_type_ref(o, r) unless r.nil?

Diff for: lib/puppet/pops/visitor.rb

@@ -79,6 +79,7 @@ def visit_this_class(receiver, clazz, args)
   # (This is ~30% faster than calling the general method)
   #
   def visit_this_0(receiver, thing)
+    #require 'byebug'; byebug
     method_name = @cache[thing.class]
     if method_name
       return receiver.send(method_name, thing)

Diff for: spec/unit/info_service_spec.rb

@@ -313,7 +313,7 @@ class Borked($Herp+$Derp) {}
         CODE
         'json_unsafe.pp' => <<-CODE,
              class json_unsafe($arg1 = /.*/, $arg2 = default, $arg3 = {1 => 1}) {}
-          CODE
+        CODE
        })
     end
 
@@ -326,6 +326,7 @@ class json_unsafe($arg1 = /.*/, $arg2 = default, $arg3 = {1 => 1}) {}
     end
 
     it "produces classes and parameters from a given file" do
+      #require 'pry-byebug'; binding.pry
       files = ['foo.pp'].map {|f| File.join(code_dir, f) }
       result = Puppet::InfoService.classes_per_environment({'production' => files })
       expect(result).to eq({

Diff for: spec/unit/pops/evaluator/literal_evaluator_spec.rb

@@ -16,6 +16,8 @@
     '"a"'     => 'a',
     'a'       => 'a',
     'a::b'    => 'a::b',
+    'Integer[1]' => [1],
+    'File' => "file",
 
     # special values
     'default' => :default,
@@ -35,9 +37,9 @@
     expect(leval.literal(parser.parse_string('undef'))).to be_nil
   end
 
-  ['1+1', 'File', '[1,2, 1+2]', '{a=>1+1}', 'Integer[1]', '"x$y"', '"x${y}z"'].each do |source|
+  ['1+1', '[1,2, 1+2]', '{a=>1+1}', '"x$y"', '"x${y}z"', 'Integer[1-3]', 'Optional[[String]]'].each do |source|
     it "throws :not_literal for non literal expression '#{source}'" do
-      expect{leval.literal(parser.parse_string('1+1'))}.to throw_symbol(:not_literal)
+      expect{leval.literal(parser.parse_string(source))}.to throw_symbol(:not_literal)
     end
   end
 end