From f66b594398bf92b142b1a35dd0754ef48ff22762 Mon Sep 17 00:00:00 2001
From: Michal Fojtik <mfojtik@redhat.com>
Date: Wed, 1 Feb 2012 14:37:45 +0100
Subject: [PATCH core 1/3] EC2: We should return 404 instead of 502 or 500 in
 case when resource is not available


Signed-off-by: Michal fojtik <mfojtik@redhat.com>
---
 server/lib/deltacloud/drivers/ec2/ec2_driver.rb |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
index 50bc39f..fa733f0 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -280,7 +280,7 @@ module Deltacloud
           ec2 = new_client(credentials)
           opts ||= {}
           safely do
-            ec2.describe_key_pairs(opts[:id] || nil).collect do |key|
+            ec2.describe_key_pairs(opts[:id] ? [opts[:id]] : nil).collect do |key|
               convert_key(key)
             end
           end
@@ -973,6 +973,14 @@ module Deltacloud
             status 401
           end
 
+          on /(NotFound|InvalidInstanceID|InvalidAMIID)/ do
+            status 404
+          end
+
+          on /Invalid availability zone/ do
+            status 404
+          end
+
           on /Error/ do
             status 502
           end
-- 
1.7.4.4