From 1b51c397479b5d409b355963949ded00e0b9b9f4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 6 Nov 2023 11:56:05 +0900 Subject: [PATCH] Remove logic for Puppet < 4 Puppet < 4 support was removed long ago. Change-Id: I88d6aa585a3ade80024318701d5e3783f4820e48 --- lib/puppet_x/keystone/composite_namevar.rb | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/lib/puppet_x/keystone/composite_namevar.rb b/lib/puppet_x/keystone/composite_namevar.rb index a5ff43184..61b21900c 100644 --- a/lib/puppet_x/keystone/composite_namevar.rb +++ b/lib/puppet_x/keystone/composite_namevar.rb @@ -1,29 +1,3 @@ -# Cherry pick PUP-1073 from puppetlabs: support of composite namevar for alias. -if Gem::Version.new(Puppet.version.sub(/\(Puppet Enterprise .*/i, '').strip) < Gem::Version.new('4.0.0') - Puppet::Resource::Catalog.class_eval do - def create_resource_aliases(resource) - # Skip creating aliases and checking collisions for non-isomorphic resources. - return unless resource.respond_to?(:isomorphic?) and resource.isomorphic? - # Add an alias if the uniqueness key is valid and not the - # title, which has already been checked. - ukey = resource.uniqueness_key - if ukey.any? and ukey != [resource.title] - self.alias(resource, ukey) - end - end - end - Puppet::Resource.class_eval do - def uniqueness_key - # Temporary kludge to deal with inconsistent use patterns; ensure we don't return nil for namevar/:name - h = self.to_hash - name = h[namevar] || h[:name] || self.name - h[namevar] ||= name - h[:name] ||= name - h.values_at(*key_attributes.sort_by { |k| k.to_s }) - end - end -end - require 'puppet_x/keystone/composite_namevar/helpers' module PuppetX