Jira (PUP-5114) Retrieve content using content_uri

[Michael Smith (JIRA)]

Title: Message Title

Michael Smith commented on PUP-5114   Re: Retrieve content using content_uri The question should be resolved by PUP-5876; content_uri will only be set if there's a code_id. As far as implementation, I believe it will amount to diff --git a/lib/puppet/type/file/content.rb b/lib/puppet/type/file/content.rb index 8ccac99..06985fe 100644 --- a/lib/puppet/type/file/content.rb +++ b/lib/puppet/type/file/content.rb @@ -212,8 +212,12 @@ module Puppet end   def get_from_puppet_source(source_or_content, &block) - source = source_or_content.metadata.source - request = Puppet::Indirector::Request.new(:file_content, :find, source, nil, :environment => resource.catalog.environment_instance) + if resource[:content_uri] + request = Puppet::Indirector::Request.new(:code_content, :find, resource[:content_uri], nil, :environment => resource.catalog.environment_instance) + else + source = source_or_content.metadata.source + request = Puppet::Indirector::Request.new(:file_content, :find, source, nil, :environment => resource.catalog.environment_instance) + end   request.do_request(:fileserver) do |req| connection = Puppet::Network::HttpPool.http_instance(req.server, req.port) Add Comment   This message was sent by Atlassian JIRA (v6.4.12#64027-sha1:e3691cc) -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To unsubscribe from this group and stop receiving emails from it, send an email to puppet-bugs+unsubscr...@googlegroups.com. To post to this group, send email to puppet-bugs@googlegroups.com. Visit this group at https://groups.google.com/group/puppet-bugs. For more options, visit https://groups.google.com/d/optout.