From 38b523a54252ae4c35fbc3dc7a9d35adc2b881c5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 4 May 2020 15:27:54 +0900 Subject: [PATCH] Use anchor to require necessary packages ... so that correct packages are required without re-defining them in resource implementations. Change-Id: Ib00bf9593a3ea05a70538758e268b85b0b8dbc3f --- lib/puppet/type/watcher_config.rb | 4 ++-- spec/unit/type/watcher_config_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/puppet/type/watcher_config.rb b/lib/puppet/type/watcher_config.rb index acc57d9..2e833a2 100644 --- a/lib/puppet/type/watcher_config.rb +++ b/lib/puppet/type/watcher_config.rb @@ -46,8 +46,8 @@ Puppet::Type.newtype(:watcher_config) do defaultto('') end - autorequire(:package) do - 'watcher' + autorequire(:anchor) do + ['watcher::install::end'] end end diff --git a/spec/unit/type/watcher_config_spec.rb b/spec/unit/type/watcher_config_spec.rb index 703a8f1..18205cb 100644 --- a/spec/unit/type/watcher_config_spec.rb +++ b/spec/unit/type/watcher_config_spec.rb @@ -1,5 +1,6 @@ require 'puppet' require 'puppet/type/watcher_config' + describe 'Puppet::Type.type(:watcher_config)' do before :each do @watcher_config = Puppet::Type.type(:watcher_config).new(:name => 'DEFAULT/foo', :value => 'bar') @@ -52,13 +53,12 @@ describe 'Puppet::Type.type(:watcher_config)' do it 'should autorequire the package that install the file' do catalog = Puppet::Resource::Catalog.new - package = Puppet::Type.type(:package).new(:name => 'watcher') - catalog.add_resource package, @watcher_config + anchor = Puppet::Type.type(:anchor).new(:name => 'watcher::install::end') + catalog.add_resource anchor, @watcher_config dependency = @watcher_config.autorequire expect(dependency.size).to eq(1) expect(dependency[0].target).to eq(@watcher_config) - expect(dependency[0].source).to eq(package) + expect(dependency[0].source).to eq(anchor) end - end