From aca0e09220e66caf788901d55cc0a7c77838a7ae Mon Sep 17 00:00:00 2001
From: Brian Nelson <mrpoundsign@gmail.com>
Date: Fri, 17 Apr 2015 12:32:24 -0700
Subject: [PATCH 1/2] Fix mock VPC ELB creation in regions other than us-east-1

The way it was getting the region would always fail if
you weren't passing in availability zones. Fixed so
it finds the region for subnet_ids passed in.
---
 lib/fog/aws/requests/elb/create_load_balancer.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb
index 9724ce96b..3584b1dc8 100644
--- a/lib/fog/aws/requests/elb/create_load_balancer.rb
+++ b/lib/fog/aws/requests/elb/create_load_balancer.rb
@@ -74,9 +74,19 @@ module Fog
           dns_name = Fog::AWS::ELB::Mock.dns_name(lb_name, @region)
 
           availability_zones = [*availability_zones].compact
-          region = availability_zones.empty? ? "us-east-1" : availability_zones.first.gsub(/[a-z]$/, '')
-          supported_platforms = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"]
           subnet_ids = options[:subnet_ids] || []
+          region = if availability_zones.any?
+                     availability_zones.first.gsub(/[a-z]$/, '')
+                   elsif subnet_ids.any?
+                     Fog::Compute::AWS::Mock.data.select do |_, region_data|
+                       region_data[@aws_access_key_id][:subnets].any? do |region_subnets|
+                         subnet_ids.include? region_subnets['subnetId']
+                       end
+                     end.keys[0]
+                   else
+                     'us-east-1'
+                   end
+          supported_platforms = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:account_attributes].find { |h| h["attributeName"] == "supported-platforms" }["values"]
           subnets = Fog::Compute::AWS::Mock.data[region][@aws_access_key_id][:subnets].select {|e| subnet_ids.include?(e["subnetId"]) }
 
           # http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/default-vpc.html

From 46bb89e3add5ce62c19d7d7d5c4fb57f06b7bd09 Mon Sep 17 00:00:00 2001
From: Brian Nelson <mrpoundsign@gmail.com>
Date: Fri, 17 Apr 2015 13:36:04 -0700
Subject: [PATCH 2/2] Attempt to fix 1.8.7 failure

---
 lib/fog/aws/requests/elb/create_load_balancer.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/fog/aws/requests/elb/create_load_balancer.rb b/lib/fog/aws/requests/elb/create_load_balancer.rb
index 3584b1dc8..c12b74eba 100644
--- a/lib/fog/aws/requests/elb/create_load_balancer.rb
+++ b/lib/fog/aws/requests/elb/create_load_balancer.rb
@@ -78,11 +78,14 @@ module Fog
           region = if availability_zones.any?
                      availability_zones.first.gsub(/[a-z]$/, '')
                    elsif subnet_ids.any?
-                     Fog::Compute::AWS::Mock.data.select do |_, region_data|
-                       region_data[@aws_access_key_id][:subnets].any? do |region_subnets|
-                         subnet_ids.include? region_subnets['subnetId']
+                     # using Hash here for Rubt 1.8.7 support.
+                     Hash[
+                       Fog::Compute::AWS::Mock.data.select do |_, region_data|
+                         region_data[@aws_access_key_id][:subnets].any? do |region_subnets|
+                           subnet_ids.include? region_subnets['subnetId']
+                         end
                        end
-                     end.keys[0]
+                     ].keys[0]
                    else
                      'us-east-1'
                    end