(PUP-10589) Print location of CSR

Author: joshcooper

lib/puppet/application/ssl.rb

@@ -209,7 +209,7 @@ def generate_request(certname)
 
     csr = @cert_provider.create_request(certname, key)
     @cert_provider.save_request(certname, csr)
-    Puppet.notice _("Generated certificate request for '%{name}' at %{requestdir}") % { name: certname, requestdir: Puppet[:requestdir] }
+    Puppet.notice _("Generated certificate request in '%{path}'") % { path: @cert_provider.to_path(Puppet[:requestdir], certname) }
   rescue => e
     raise Puppet::Error.new(_("Failed to generate certificate request: %{message}") % { message: e.message }, e)
   end

lib/puppet/x509/cert_provider.rb

@@ -346,13 +346,17 @@ def load_request_from_pem(pem)
     OpenSSL::X509::Request.new(pem)
   end
 
-  private
-
+  # Return the path to the cert related object (key, CSR, cert, etc).
+  #
+  # @param base [String] base directory
+  # @param name [String] the name associated with the cert related object
   def to_path(base, name)
     raise _("Certname %{name} must not contain unprintable or non-ASCII characters") % { name: name.inspect } unless name =~ VALID_CERTNAME
     File.join(base, "#{name.downcase}.pem")
   end
 
+  private
+
   def permissions_for_setting(name)
     setting = Puppet.settings.setting(name)
     perm = { mode: setting.mode.to_i(8) }

spec/unit/application/ssl_spec.rb

@@ -182,24 +182,24 @@ def expects_command_to_fail(message)
     it 'generates an RSA private key' do
       File.unlink(Puppet[:hostprivkey])
 
-      expects_command_to_pass(%r{Generated certificate request for '#{name}' at #{requestdir}})
+      expects_command_to_pass(%r{Generated certificate request in '#{csr_path}'})
     end
 
     it 'generates an EC private key' do
       Puppet[:key_type] = 'ec'
       File.unlink(Puppet[:hostprivkey])
 
-      expects_command_to_pass(%r{Generated certificate request for '#{name}' at #{requestdir}})
+      expects_command_to_pass(%r{Generated certificate request in '#{csr_path}'})
     end
 
     it 'registers OIDs' do
       expect(Puppet::SSL::Oids).to receive(:register_puppet_oids)
 
-      expects_command_to_pass(%r{Generated certificate request for '#{name}' at #{requestdir}})
+      expects_command_to_pass(%r{Generated certificate request in '#{csr_path}'})
     end
 
     it 'saves the CSR locally' do
-      expects_command_to_pass(%r{Generated certificate request for '#{name}' at #{requestdir}})
+      expects_command_to_pass(%r{Generated certificate request in '#{csr_path}'})
 
       expect(Puppet::FileSystem).to be_exist(csr_path)
     end