[aws|elb] move ELB error handling related to certs to the ELB service instead of duplicating at the request level.

lib/fog/aws/elb.rb

@@ -144,34 +144,33 @@ module Fog
               :version            => '2011-04-05'
           }
           )
-          begin
-            response = @connection.request({
-              :body       => body,
-              :expects    => 200,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :idempotent => idempotent,
-              :host       => @host,
-              :method     => 'POST',
-              :parser     => parser
-            })
-          rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code>/m)
-              case match[1]
-              when 'LoadBalancerNotFound'
-                raise Fog::AWS::ELB::NotFound
-              when 'DuplicateLoadBalancerName'
-                raise Fog::AWS::ELB::IdentifierTaken
-              when 'InvalidInstance'
-                raise Fog::AWS::ELB::InvalidInstance
-              else
-                raise
-              end
+
+          response = @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :idempotent => idempotent,
+            :host       => @host,
+            :method     => 'POST',
+            :parser     => parser
+          })
+        rescue Excon::Errors::HTTPStatusError => error
+          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
+            case match[1]
+            when 'CertificateNotFound'
+              raise Fog::AWS::IAM::NotFound.slurp(error, match[2])
+            when 'LoadBalancerNotFound'
+              raise Fog::AWS::ELB::NotFound
+            when 'DuplicateLoadBalancerName'
+              raise Fog::AWS::ELB::IdentifierTaken
+            when 'InvalidInstance'
+              raise Fog::AWS::ELB::InvalidInstance
             else
               raise
             end
+          else
+            raise
           end
-
-          response
         end
       end
     end

lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -46,15 +46,6 @@ module Fog
             'LoadBalancerName' => lb_name,
             :parser            => Fog::Parsers::AWS::ELB::CreateLoadBalancer.new
           }.merge!(params))
-        rescue Excon::Errors::HTTPStatusError => error
-          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
-            case match[1]
-            when 'CertificateNotFound'
-              raise Fog::AWS::IAM::NotFound.slurp(error, match[2])
-            else
-              raise
-            end
-          end
         end
       end
 

lib/fog/aws/requests/elb/create_load_balancer_listeners.rb

@@ -43,15 +43,6 @@ module Fog
             'LoadBalancerName' => lb_name,
             :parser            => Fog::Parsers::AWS::ELB::Empty.new
           }.merge!(params))
-        rescue Excon::Errors::HTTPStatusError => error
-          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
-            case match[1]
-            when 'CertificateNotFound'
-              raise Fog::AWS::IAM::NotFound.slurp(error, match[2])
-            else
-              raise
-            end
-          end
         end
 
       end