(PUP-11074) Add catalog edge only if parent resource has a container

Managing resources with generators behaves differently with `puppet
resource` and `puppet apply`.

When running with `puppet apply`, the parent resource is always
contained by something like `Class[Main]`, so adding an edge between
that and our generated resource works.

When running with `puppet resource`, the parent resource is not
contained by anything (`container_of(parent_resource)` returns nil),
which adds an edge with a nil vertex to the catalog. This in turn causes
the run to fail with a NilClass exception when performing pre-run
checks[1] in the Transaction class, as the catalog now contains a nil
vertex.

[1] https://github.com/puppetlabs/puppet/blob/ab56d86ecb4b71298c75325462bf73376420bb40/lib/puppet/transaction.rb#L80

Author: GabrielNagy

lib/puppet/transaction/additional_resource_generator.rb

@@ -137,7 +137,7 @@ def add_resource(res, parent_resource, priority=nil)
       else
         @catalog.add_resource_after(parent_resource, res)
       end
-      @catalog.add_edge(@catalog.container_of(parent_resource), res)
+      @catalog.add_edge(@catalog.container_of(parent_resource), res) if @catalog.container_of(parent_resource)
       if @relationship_graph && priority
         # If we have a relationship_graph we should add the resource
         # to it (this is an eval_generate). If we don't, then the

spec/integration/application/resource_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'puppet_spec/files'
+
+describe "puppet resource", unless: Puppet::Util::Platform.jruby? do
+  include PuppetSpec::Files
+
+  let(:resource) { Puppet::Application[:resource] }
+
+  describe "when handling file and tidy types" do
+    let!(:dir) { dir_containing('testdir', 'testfile' => 'contents') }
+
+    it 'does not raise when generating file resources' do
+      resource.command_line.args = ['file', dir, 'ensure=directory', 'recurse=true']
+
+      expect {
+        resource.run
+      }.to output(/ensure.+=> 'directory'/).to_stdout
+    end
+
+    it 'correctly cleans up a given path' do
+      resource.command_line.args = ['tidy', dir, 'rmdirs=true', 'recurse=true']
+
+      expect {
+        resource.run
+      }.to output(/Notice: \/File\[#{dir}\]\/ensure: removed/).to_stdout
+
+      expect(Puppet::FileSystem.exist?(dir)).to be false
+    end
+  end
+end