puppetserver-ca 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738624da584684a68fc407803548fb3d4b6855aa
-  data.tar.gz: cb3ff01a01b44468687668a39ca957d7496038a4
+  metadata.gz: 68f6a3c820f9dd32b2df38855a1e03249cb89ba0
+  data.tar.gz: b885a1ad3e176010f2e36a63f6940b0bab7501ad
 SHA512:
-  metadata.gz: 8ba3e5d5f070022ed1c2d88cc388b18de694782846a836490c3309cd7fe1fa85cfe60943ead8f422911920638ae84099d471b734bf39191e1ea8901d605aaa0d
-  data.tar.gz: e0ec48b8a594b342e47962addc05c0b08976aa06bc335a63c181dc1fd2dbab60cca1a5cd38ebd7b911c8713c2675ac6029fbd6fa9b9e2007939a42dc1841902a
+  metadata.gz: 809c1ce65101f0c3f9aa908540070c59114aae9551170875177c87518e4e43111ebcaa3f8f29b0e400a2dd8e0d5ce996fbf01e35766b395d2c6443086a36ffdd
+  data.tar.gz: f2975078313f77c519c45eb03ccc70272efdad3f859863c97e07a3a800e37ae2fd2e086ad534367eb86b3b86f39272d1428754457150fdf8b8174dd8cb1a5025

data/lib/puppetserver/ca/action/generate.rb

@@ -75,8 +75,8 @@ BANNER
               parsed['subject-alt-names'] = sans
             end
             opts.on('--ca-client',
-                    'Whether this cert will be used to request CA actions.\
-                    Causes the cert to be generated offline.') do |ca_client|
+                    'Whether this cert will be used to request CA actions.',
+                    'Causes the cert to be generated offline.') do |ca_client|
               parsed['ca-client'] = true
             end
           end
@@ -168,9 +168,12 @@ BANNER
               end
             end
             true
-          rescue Errno::ECONNREFUSED => e
-            # Couldn't make a connection
-            false
+          rescue Puppetserver::Ca::ConnectionFailed => e
+            if e.wrapped.is_a? Errno::ECONNREFUSED
+              return false
+            else
+              raise e
+            end
           end
         end
 

data/lib/puppetserver/ca/errors.rb

@@ -1,6 +1,20 @@
 module Puppetserver
   module Ca
-    class Error < StandardError; end
+    class Error < StandardError
+      def self.create(ex, msg)
+        created = new(msg)
+        created.wrap(ex)
+
+        created
+      end
+
+      attr_reader :wrapped
+
+      def wrap(ex)
+        @wrapped = ex
+      end
+    end
+
     class FileNotFound < Error; end
     class InvalidX509Object < Error; end
     class ConnectionFailed < Error; end

data/lib/puppetserver/ca/utils/http_client.rb

@@ -58,9 +58,9 @@ module Puppetserver
                             cert: @cert, key: @key,
                             &request)
           rescue StandardError => e
-            raise ConnectionFailed.new(
-              "Failed connecting to #{url.full_url}\n" +
-              "  Root cause: #{e.message}")
+            raise ConnectionFailed.create(e,
+                    "Failed connecting to #{url.full_url}\n" +
+                    "  Root cause: #{e.message}")
           end
         end
 
@@ -70,12 +70,14 @@ module Puppetserver
           begin
             content = File.read(path)
             block.call(content)
-          rescue Errno::ENOENT
-            raise FileNotFound.new("Could not find '#{setting}' at '#{path}'")
+          rescue Errno::ENOENT => e
+            raise FileNotFound.create(e,
+                    "Could not find '#{setting}' at '#{path}'")
+
           rescue OpenSSL::OpenSSLError => e
-            raise InvalidX509Object.new(
-              "Could not parse '#{setting}' at '#{path}'.\n" +
-              "  OpenSSL returned: #{e.message}")
+            raise InvalidX509Object.create(e,
+                    "Could not parse '#{setting}' at '#{path}'.\n" +
+                    "  OpenSSL returned: #{e.message}")
           end
        end
 

data/lib/puppetserver/ca/version.rb

@@ -1,5 +1,5 @@
 module Puppetserver
   module Ca
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetserver-ca
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter