From 522f2404e61b732a2d16cad4a382752dbdfb814e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 4 May 2020 02:03:22 +0900 Subject: [PATCH] Use anchor to require necessary packages ... so that correct packages are required without re-defining them in resource implementations. Change-Id: Iac4e6aded9e10973560e9e819c36ad395affe129 --- lib/puppet/type/placement_config.rb | 4 ++-- spec/unit/type/placement_config_spec.rb | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/puppet/type/placement_config.rb b/lib/puppet/type/placement_config.rb index e04d0f1..f7e3dd4 100644 --- a/lib/puppet/type/placement_config.rb +++ b/lib/puppet/type/placement_config.rb @@ -46,8 +46,8 @@ Puppet::Type.newtype(:placement_config) do defaultto('') end - autorequire(:package) do - 'placement' + autorequire(:anchor) do + ['placement::install::end'] end end diff --git a/spec/unit/type/placement_config_spec.rb b/spec/unit/type/placement_config_spec.rb index d5f3557..7ff36b2 100644 --- a/spec/unit/type/placement_config_spec.rb +++ b/spec/unit/type/placement_config_spec.rb @@ -1,5 +1,6 @@ require 'puppet' require 'puppet/type/placement_config' + describe 'Puppet::Type.type(:placement_config)' do before :each do @placement_config = Puppet::Type.type(:placement_config).new(:name => 'DEFAULT/foo', :value => 'bar') @@ -52,12 +53,12 @@ describe 'Puppet::Type.type(:placement_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'placement') - catalog.add_resource package, @placement_config + anchor = Puppet::Type.type(:anchor).new(:name => 'placement::install::end') + catalog.add_resource anchor, @placement_config dependency = @placement_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@placement_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end