puppet 6.16.0-universal-darwin → 7.0.0-universal-darwin

data/lib/puppet/pops/lookup/context.rb

@@ -47,7 +47,7 @@ class EnvironmentContext < Adaptable::Adapter
     file_data = @file_data_cache[path]
     stat = Puppet::FileSystem.stat(path)
     unless file_data && file_data.valid?(stat)
-      Puppet.debug("File at '#{path}' was changed, reloading") if file_data
+      Puppet.debug { "File at '#{path}' was changed, reloading" } if file_data
       content = Puppet::FileSystem.read(path, :encoding => 'utf-8')
       file_data = FileData.new(path, stat.ino, stat.mtime, stat.size, block_given? ? yield(content) : content)
       @file_data_cache[path] = file_data

data/lib/puppet/pops/lookup/hiera_config.rb

@@ -46,6 +46,7 @@ class HieraConfig
   KEY_DATADIR = 'datadir'.freeze
   KEY_DEFAULT_HIERARCHY = 'default_hierarchy'.freeze
   KEY_HIERARCHY = 'hierarchy'.freeze
+  KEY_PLAN_HIERARCHY = 'plan_hierarchy'.freeze
   KEY_LOGGER = 'logger'.freeze
   KEY_OPTIONS = 'options'.freeze
   KEY_PATH = 'path'.freeze
@@ -580,6 +581,7 @@ class HieraConfigV5 < HieraConfig
           tf.optional(KEY_OPTIONS) => tf.hash_kv(option_name_t, tf.data),
         }),
       tf.optional(KEY_HIERARCHY) => hierarchy_t,
+      tf.optional(KEY_PLAN_HIERARCHY) => hierarchy_t,
       tf.optional(KEY_DEFAULT_HIERARCHY) => hierarchy_t
     })
   end
@@ -600,7 +602,15 @@ class HieraConfigV5 < HieraConfig
       return data_providers
     end
 
-    @config[use_default_hierarchy ? KEY_DEFAULT_HIERARCHY : KEY_HIERARCHY].each do |he|
+    compiler = Puppet.lookup(:pal_compiler) { nil }
+    config_key = if compiler.is_a?(Puppet::Pal::ScriptCompiler) && !@config[KEY_PLAN_HIERARCHY].nil?
+          KEY_PLAN_HIERARCHY
+        elsif use_default_hierarchy
+          KEY_DEFAULT_HIERARCHY
+        else
+          KEY_HIERARCHY
+        end
+    @config[config_key].each do |he|
       name = he[KEY_NAME]
       if data_providers.include?(name)
         first_line = find_line_matching(/\s+name:\s+['"]?#{name}(?:[^\w]|$)/)
@@ -691,6 +701,9 @@ class HieraConfigV5 < HieraConfig
     defaults = config[KEY_DEFAULTS]
     validate_defaults(defaults) unless defaults.nil?
     config[KEY_HIERARCHY].each { |he| validate_hierarchy(he, defaults, owner) }
+    if config.include?(KEY_PLAN_HIERARCHY)
+      config[KEY_PLAN_HIERARCHY].each { |he| validate_hierarchy(he, defaults, owner) }
+    end
 
     if config.include?(KEY_DEFAULT_HIERARCHY)
       unless owner.is_a?(ModuleDataProvider)

data/lib/puppet/pops/model/ast.pp

@@ -276,9 +276,6 @@ type Puppet::AST = TypeSet[{
     ResourceTypeDefinition => Object[{
       parent => NamedDefinition
     }],
-    Application => Object[{
-      parent => NamedDefinition
-    }],
     QRefDefinition => Object[{
       parent => Definition,
       attributes => {
@@ -334,33 +331,6 @@ type Puppet::AST = TypeSet[{
         }
       }
     }],
-    SiteDefinition => Object[{
-      parent => Definition,
-      attributes => {
-        'body' => {
-          type => Optional[Expression],
-          value => undef
-        }
-      }
-    }],
-    SubLocatedExpression => Object[{
-      parent => Expression,
-      attributes => {
-        'expr' => Expression,
-        'line_offsets' => {
-          type => Array[Integer],
-          value => []
-        },
-        'leading_line_count' => {
-          type => Optional[Integer],
-          value => undef
-        },
-        'leading_line_offset' => {
-          type => Optional[Integer],
-          value => undef
-        }
-      }
-    }],
     HeredocExpression => Object[{
       parent => Expression,
       attributes => {
@@ -616,18 +586,6 @@ type Puppet::AST = TypeSet[{
         }
       }
     }],
-    CapabilityMapping => Object[{
-      parent => Definition,
-      attributes => {
-        'kind' => String,
-        'capability' => String,
-        'component' => Expression,
-        'mappings' => {
-          type => Array[AbstractAttributeOperation],
-          value => []
-        }
-      }
-    }],
     ResourceDefaultsExpression => Object[{
       parent => AbstractResource,
       attributes => {

data/lib/puppet/pops/model/ast.rb

@@ -2055,32 +2055,6 @@ class ResourceTypeDefinition < NamedDefinition
   end
 end
 
-class Application < NamedDefinition
-  def self._pcore_type
-    @_pcore_type ||= Types::PObjectType.new('Puppet::AST::Application', {
-      'parent' => NamedDefinition._pcore_type
-    })
-  end
-
-  def _pcore_contents
-    @parameters.each { |value| yield(value) }
-    yield(@body) unless @body.nil?
-  end
-
-  def _pcore_all_contents(path, &block)
-    path << self
-    @parameters.each do |value|
-      block.call(value, path)
-      value._pcore_all_contents(path, &block)
-    end
-    unless @body.nil?
-      block.call(@body, path)
-      @body._pcore_all_contents(path, &block)
-    end
-    path.pop
-  end
-end
-
 class QRefDefinition < Definition
   def self._pcore_type
     @_pcore_type ||= Types::PObjectType.new('Puppet::AST::QRefDefinition', {
@@ -2466,171 +2440,6 @@ class NodeDefinition < Definition
   alias == eql?
 end
 
-class SiteDefinition < Definition
-  def self._pcore_type
-    @_pcore_type ||= Types::PObjectType.new('Puppet::AST::SiteDefinition', {
-      'parent' => Definition._pcore_type,
-      'attributes' => {
-        'body' => {
-          'type' => Types::POptionalType.new(Expression._pcore_type),
-          'value' => nil
-        }
-      }
-    })
-  end
-
-  def self.from_hash(init_hash)
-    from_asserted_hash(Types::TypeAsserter.assert_instance_of('Puppet::AST::SiteDefinition initializer', _pcore_type.init_hash_type, init_hash))
-  end
-
-  def self.from_asserted_hash(init_hash)
-    new(
-      init_hash['locator'],
-      init_hash['offset'],
-      init_hash['length'],
-      init_hash['body'])
-  end
-
-  def self.create(locator, offset, length, body = nil)
-    ta = Types::TypeAsserter
-    attrs = _pcore_type.attributes(true)
-    ta.assert_instance_of('Puppet::AST::Positioned[locator]', attrs['locator'].type, locator)
-    ta.assert_instance_of('Puppet::AST::Positioned[offset]', attrs['offset'].type, offset)
-    ta.assert_instance_of('Puppet::AST::Positioned[length]', attrs['length'].type, length)
-    ta.assert_instance_of('Puppet::AST::SiteDefinition[body]', attrs['body'].type, body)
-    new(locator, offset, length, body)
-  end
-
-  attr_reader :body
-
-  def initialize(locator, offset, length, body = nil)
-    super(locator, offset, length)
-    @hash = @hash ^ body.hash
-    @body = body
-  end
-
-  def _pcore_init_hash
-    result = super
-    result['body'] = @body unless @body == nil
-    result
-  end
-
-  def _pcore_contents
-    yield(@body) unless @body.nil?
-  end
-
-  def _pcore_all_contents(path, &block)
-    path << self
-    unless @body.nil?
-      block.call(@body, path)
-      @body._pcore_all_contents(path, &block)
-    end
-    path.pop
-  end
-
-  def eql?(o)
-    super &&
-    @body.eql?(o.body)
-  end
-  alias == eql?
-end
-
-class SubLocatedExpression < Expression
-  def self._pcore_type
-    @_pcore_type ||= Types::PObjectType.new('Puppet::AST::SubLocatedExpression', {
-      'parent' => Expression._pcore_type,
-      'attributes' => {
-        'expr' => Expression._pcore_type,
-        'line_offsets' => {
-          'type' => Types::PArrayType.new(Types::PIntegerType::DEFAULT),
-          'value' => []
-        },
-        'leading_line_count' => {
-          'type' => Types::POptionalType.new(Types::PIntegerType::DEFAULT),
-          'value' => nil
-        },
-        'leading_line_offset' => {
-          'type' => Types::POptionalType.new(Types::PIntegerType::DEFAULT),
-          'value' => nil
-        }
-      }
-    })
-  end
-
-  def self.from_hash(init_hash)
-    from_asserted_hash(Types::TypeAsserter.assert_instance_of('Puppet::AST::SubLocatedExpression initializer', _pcore_type.init_hash_type, init_hash))
-  end
-
-  def self.from_asserted_hash(init_hash)
-    new(
-      init_hash['locator'],
-      init_hash['offset'],
-      init_hash['length'],
-      init_hash['expr'],
-      init_hash.fetch('line_offsets') { _pcore_type['line_offsets'].value },
-      init_hash['leading_line_count'],
-      init_hash['leading_line_offset'])
-  end
-
-  def self.create(locator, offset, length, expr, line_offsets = _pcore_type['line_offsets'].value, leading_line_count = nil, leading_line_offset = nil)
-    ta = Types::TypeAsserter
-    attrs = _pcore_type.attributes(true)
-    ta.assert_instance_of('Puppet::AST::Positioned[locator]', attrs['locator'].type, locator)
-    ta.assert_instance_of('Puppet::AST::Positioned[offset]', attrs['offset'].type, offset)
-    ta.assert_instance_of('Puppet::AST::Positioned[length]', attrs['length'].type, length)
-    ta.assert_instance_of('Puppet::AST::SubLocatedExpression[expr]', attrs['expr'].type, expr)
-    ta.assert_instance_of('Puppet::AST::SubLocatedExpression[line_offsets]', attrs['line_offsets'].type, line_offsets)
-    ta.assert_instance_of('Puppet::AST::SubLocatedExpression[leading_line_count]', attrs['leading_line_count'].type, leading_line_count)
-    ta.assert_instance_of('Puppet::AST::SubLocatedExpression[leading_line_offset]', attrs['leading_line_offset'].type, leading_line_offset)
-    new(locator, offset, length, expr, line_offsets, leading_line_count, leading_line_offset)
-  end
-
-  attr_reader :expr
-  attr_reader :line_offsets
-  attr_reader :leading_line_count
-  attr_reader :leading_line_offset
-
-  def initialize(locator, offset, length, expr, line_offsets = _pcore_type['line_offsets'].value, leading_line_count = nil, leading_line_offset = nil)
-    super(locator, offset, length)
-    @hash = @hash ^ expr.hash ^ line_offsets.hash ^ leading_line_count.hash ^ leading_line_offset.hash
-    @expr = expr
-    @line_offsets = line_offsets
-    @leading_line_count = leading_line_count
-    @leading_line_offset = leading_line_offset
-  end
-
-  def _pcore_init_hash
-    result = super
-    result['expr'] = @expr
-    result['line_offsets'] = @line_offsets unless _pcore_type['line_offsets'].default_value?(@line_offsets)
-    result['leading_line_count'] = @leading_line_count unless @leading_line_count == nil
-    result['leading_line_offset'] = @leading_line_offset unless @leading_line_offset == nil
-    result
-  end
-
-  def _pcore_contents
-    yield(@expr) unless @expr.nil?
-  end
-
-  def _pcore_all_contents(path, &block)
-    path << self
-    unless @expr.nil?
-      block.call(@expr, path)
-      @expr._pcore_all_contents(path, &block)
-    end
-    path.pop
-  end
-
-  def eql?(o)
-    super &&
-    @expr.eql?(o.expr) &&
-    @line_offsets.eql?(o.line_offsets) &&
-    @leading_line_count.eql?(o.leading_line_count) &&
-    @leading_line_offset.eql?(o.leading_line_offset)
-  end
-  alias == eql?
-end
-
 class HeredocExpression < Expression
   def self._pcore_type
     @_pcore_type ||= Types::PObjectType.new('Puppet::AST::HeredocExpression', {
@@ -4284,101 +4093,6 @@ class ResourceExpression < AbstractResource
   alias == eql?
 end
 
-class CapabilityMapping < Definition
-  def self._pcore_type
-    @_pcore_type ||= Types::PObjectType.new('Puppet::AST::CapabilityMapping', {
-      'parent' => Definition._pcore_type,
-      'attributes' => {
-        'kind' => Types::PStringType::DEFAULT,
-        'capability' => Types::PStringType::DEFAULT,
-        'component' => Expression._pcore_type,
-        'mappings' => {
-          'type' => Types::PArrayType.new(AbstractAttributeOperation._pcore_type),
-          'value' => []
-        }
-      }
-    })
-  end
-
-  def self.from_hash(init_hash)
-    from_asserted_hash(Types::TypeAsserter.assert_instance_of('Puppet::AST::CapabilityMapping initializer', _pcore_type.init_hash_type, init_hash))
-  end
-
-  def self.from_asserted_hash(init_hash)
-    new(
-      init_hash['locator'],
-      init_hash['offset'],
-      init_hash['length'],
-      init_hash['kind'],
-      init_hash['capability'],
-      init_hash['component'],
-      init_hash.fetch('mappings') { _pcore_type['mappings'].value })
-  end
-
-  def self.create(locator, offset, length, kind, capability, component, mappings = _pcore_type['mappings'].value)
-    ta = Types::TypeAsserter
-    attrs = _pcore_type.attributes(true)
-    ta.assert_instance_of('Puppet::AST::Positioned[locator]', attrs['locator'].type, locator)
-    ta.assert_instance_of('Puppet::AST::Positioned[offset]', attrs['offset'].type, offset)
-    ta.assert_instance_of('Puppet::AST::Positioned[length]', attrs['length'].type, length)
-    ta.assert_instance_of('Puppet::AST::CapabilityMapping[kind]', attrs['kind'].type, kind)
-    ta.assert_instance_of('Puppet::AST::CapabilityMapping[capability]', attrs['capability'].type, capability)
-    ta.assert_instance_of('Puppet::AST::CapabilityMapping[component]', attrs['component'].type, component)
-    ta.assert_instance_of('Puppet::AST::CapabilityMapping[mappings]', attrs['mappings'].type, mappings)
-    new(locator, offset, length, kind, capability, component, mappings)
-  end
-
-  attr_reader :kind
-  attr_reader :capability
-  attr_reader :component
-  attr_reader :mappings
-
-  def initialize(locator, offset, length, kind, capability, component, mappings = _pcore_type['mappings'].value)
-    super(locator, offset, length)
-    @hash = @hash ^ kind.hash ^ capability.hash ^ component.hash ^ mappings.hash
-    @kind = kind
-    @capability = capability
-    @component = component
-    @mappings = mappings
-  end
-
-  def _pcore_init_hash
-    result = super
-    result['kind'] = @kind
-    result['capability'] = @capability
-    result['component'] = @component
-    result['mappings'] = @mappings unless _pcore_type['mappings'].default_value?(@mappings)
-    result
-  end
-
-  def _pcore_contents
-    yield(@component) unless @component.nil?
-    @mappings.each { |value| yield(value) }
-  end
-
-  def _pcore_all_contents(path, &block)
-    path << self
-    unless @component.nil?
-      block.call(@component, path)
-      @component._pcore_all_contents(path, &block)
-    end
-    @mappings.each do |value|
-      block.call(value, path)
-      value._pcore_all_contents(path, &block)
-    end
-    path.pop
-  end
-
-  def eql?(o)
-    super &&
-    @kind.eql?(o.kind) &&
-    @capability.eql?(o.capability) &&
-    @component.eql?(o.component) &&
-    @mappings.eql?(o.mappings)
-  end
-  alias == eql?
-end
-
 class ResourceDefaultsExpression < AbstractResource
   def self._pcore_type
     @_pcore_type ||= Types::PObjectType.new('Puppet::AST::ResourceDefaultsExpression', {
@@ -4895,14 +4609,11 @@ def self.register_pcore_types
   Model::NamedDefinition,
   Model::FunctionDefinition,
   Model::ResourceTypeDefinition,
-  Model::Application,
   Model::QRefDefinition,
   Model::TypeAlias,
   Model::TypeMapping,
   Model::TypeDefinition,
   Model::NodeDefinition,
-  Model::SiteDefinition,
-  Model::SubLocatedExpression,
   Model::HeredocExpression,
   Model::HostClassDefinition,
   Model::PlanDefinition,
@@ -4936,7 +4647,6 @@ def self.register_pcore_types
   Model::ResourceBody,
   Model::AbstractResource,
   Model::ResourceExpression,
-  Model::CapabilityMapping,
   Model::ResourceDefaultsExpression,
   Model::ResourceOverrideExpression,
   Model::SelectorEntry,

data/lib/puppet/pops/model/factory.rb

@@ -120,13 +120,6 @@ class Factory
 
   # Building of Model classes
 
-  def build_Application(o, n, ps, body)
-    @init_hash[KEY_NAME] = n
-    @init_hash[KEY_PARAMETERS] = ps
-    b = f_build_body(body)
-    @init_hash[KEY_BODY] = b unless b.nil?
-  end
-
   def build_ArithmeticExpression(o, op, a, b)
     @init_hash[KEY_OPERATOR] = op
     build_BinaryExpression(o, a, b)
@@ -387,13 +380,6 @@ class Factory
     @init_hash['return_type'] = return_type unless return_type.nil?
   end
 
-  def build_CapabilityMapping(o, kind, component, capability, mappings)
-    @init_hash['kind'] = kind
-    @init_hash['component'] = component
-    @init_hash['capability'] = capability
-    @init_hash['mappings'] = mappings
-  end
-
   def build_NodeDefinition(o, hosts, parent, body)
     @init_hash['host_matches'] = hosts
     @init_hash['parent'] = parent unless parent.nil? # no nop here
@@ -401,11 +387,6 @@ class Factory
     @init_hash[KEY_BODY] = b unless b.nil?
   end
 
-  def build_SiteDefinition(o, body)
-    b = f_build_body(body)
-    @init_hash[KEY_BODY] = b unless b.nil?
-  end
-
   def build_Parameter(o, name, expr)
     @init_hash[KEY_NAME] = name
     @init_hash[KEY_VALUE] = expr
@@ -444,22 +425,6 @@ class Factory
     @init_hash['selectors'] = selectors
   end
 
-  # Builds a SubLocatedExpression - this wraps the expression in a sublocation configured
-  # from the given token
-  # A SubLocated holds its own locator that is used for subexpressions holding positions relative
-  # to what it describes.
-  #
-  def build_SubLocatedExpression(o, token, expression)
-    @init_hash[KEY_EXPR] = expression
-    @init_hash[KEY_OFFSET] = token.offset
-    @init_hash[KEY_LENGTH] =  token.length
-    locator = token.locator
-    @init_hash[KEY_LOCATOR] = locator
-    @init_hash['leading_line_count'] = locator.leading_line_count
-    @init_hash['leading_line_offset'] = locator.leading_line_offset
-    @init_hash['line_offsets'] = locator.line_index # index of lines in sublocated
-  end
-
   def build_SelectorEntry(o, matching, value)
     @init_hash['matching_expr'] = matching
     @init_hash['value_expr'] = value
@@ -758,8 +723,6 @@ class Factory
 
   def self.NODE(hosts, parent, body);    new(NodeDefinition, hosts, parent, body);       end
 
-  def self.SITE(body);                   new(SiteDefinition, body);                      end
-
   # Parameters
 
   # Mark parameter as capturing the rest of arguments
@@ -966,14 +929,6 @@ class Factory
     new(ResourceTypeDefinition, name, parameters, body)
   end
 
-  def self.CAPABILITY_MAPPING(kind, component, cap_name, mappings)
-    new(CapabilityMapping, kind, component, cap_name, mappings)
-  end
-
-  def self.APPLICATION(name, parameters, body)
-    new(Application, name, parameters, body)
-  end
-
   def self.PLAN(name, parameters, body)
     new(PlanDefinition, name, parameters, body, nil)
   end