Skip to content

Commit 15a57ef

Browse files
committed
Revert "(PUP-11320) Move ssh_authorized_key resources creation at the end"
This reverts commit 0343d57.
1 parent 1675a6c commit 15a57ef

File tree

3 files changed

+18
-44
lines changed

3 files changed

+18
-44
lines changed

acceptance/tests/resource/user/should_correctly_ensure_depending_resources.rb

Lines changed: 0 additions & 43 deletions
This file was deleted.

lib/puppet/type/user.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ module Puppet
6666
newproperty(:ensure, :parent => Puppet::Property::Ensure) do
6767
newvalue(:present, :event => :user_created) do
6868
provider.create
69+
@resource.generate
6970
end
7071

7172
newvalue(:absent, :event => :user_removed) do
@@ -692,8 +693,9 @@ def delimiter
692693
defaultto false
693694
end
694695

695-
def eval_generate
696+
def generate
696697
if !self[:purge_ssh_keys].empty?
698+
return [] if self[:ensure] == :present && !provider.exists?
697699
if Puppet::Type.type(:ssh_authorized_key).nil?
698700
warning _("Ssh_authorized_key type is not available. Cannot purge SSH keys.")
699701
else

spec/unit/transaction/additional_resource_generator_spec.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,21 @@ class container {
479479
"Notify[goodbye]"))
480480
end
481481

482+
it "sets resources_failed_to_generate to true if resource#generate raises an exception" do
483+
catalog = compile_to_ral(<<-MANIFEST)
484+
user { 'foo':
485+
ensure => present,
486+
}
487+
MANIFEST
488+
489+
allow(catalog.resource("User[foo]")).to receive(:generate).and_raise(RuntimeError)
490+
relationship_graph = relationship_graph_for(catalog)
491+
generator = Puppet::Transaction::AdditionalResourceGenerator.new(catalog, relationship_graph, prioritizer)
492+
generator.generate_additional_resources(catalog.resource("User[foo]"))
493+
494+
expect(generator.resources_failed_to_generate).to be_truthy
495+
end
496+
482497
def relationships_after_generating(manifest, resource_to_generate)
483498
catalog = compile_to_ral(manifest)
484499
generate_resources_in(catalog, nil, resource_to_generate)

0 commit comments

Comments
 (0)