(FM-7696) remove overzealous exception handling

puppetlabs · Jan 24, 2019 · 4a1ce11 · 4a1ce11
1 parent b6cbdcf
commit 4a1ce11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/lib/puppet/resource_api/transport.rb b/lib/puppet/resource_api/transport.rb
@@ -21,13 +21,9 @@ def register(schema)
 
   def connect(name, connection_info)
     validate(name, connection_info)
-    begin
-      require "puppet/transport/#{name}"
-      class_name = name.split('_').map { |e| e.capitalize }.join
-      Puppet::Transport.const_get(class_name).new(connection_info)
-    rescue LoadError, NameError => detail
-      raise Puppet::DevError, 'Cannot load transport for `%{target}`: %{detail}' % { target: name, detail: detail }
-    end
+    require "puppet/transport/#{name}"
+    class_name = name.split('_').map { |e| e.capitalize }.join
+    Puppet::Transport.const_get(class_name).new(connection_info)
   end
   module_function :connect # rubocop:disable Style/AccessModifierDeclarations
 

diff --git a/spec/puppet/resource_api/transport_spec.rb b/spec/puppet/resource_api/transport_spec.rb
@@ -104,8 +104,7 @@
     context 'when the transport file does not exist' do
       it 'throws a DevError' do
         expect(described_class).to receive(:validate).with(name, connection_info)
-        expect { described_class.connect(name, connection_info) }.to raise_error Puppet::DevError,
-                                                                                 %r{Cannot load transport for `test_target`}
+        expect { described_class.connect(name, connection_info) }.to raise_error LoadError, %r{(no such file to load|cannot load such file) -- puppet/transport/test_target}
       end
     end
 
@@ -114,7 +113,7 @@
         it 'throws a DevError' do
           expect(described_class).to receive(:validate).with(name, connection_info)
           expect(described_class).to receive(:require).with('puppet/transport/test_target')
-          expect { described_class.connect(name, connection_info) }.to raise_error Puppet::DevError,
+          expect { described_class.connect(name, connection_info) }.to raise_error NameError,
                                                                                    %r{uninitialized constant (Puppet::Transport|TestTarget)}
         end
       end