Merge pull request #3 from penkin/develop

Added an option to the connection settings to set which region you're wo...

README.rst

@@ -68,6 +68,7 @@ Installation
             #'MAX_SPINLOCK_TIME': 60*60,  # number of seconds before processing spinlocks give up
             #'PREPARE_SILENTLY': False, # If False, raise ValidationError if preparation of uploads fails.
                                         # If True, continue with upload
+            #'REGION': 'us-east-1', # The region you want to create the search domain in. Defaults to 'us-east-1'
         }
     }
 

haystack_cloudsearch/cloudsearch_backend.py

@@ -43,6 +43,20 @@ def __init__(self, connection_alias, **connection_options):
         if not 'AWS_SECRET_KEY' in connection_options:
             raise ImproperlyConfigured("You must specify a 'AWS_SECRET_KEY' in your settings for connection '%s'." % connection_alias)
 
+        # We want to check if there is a 'REGION' passed into the connection. If there is we validate it with the
+        # available regions.
+        region_name = connection_options.get('REGION', None)
+        region_list = [cloudsearch_region.name for cloudsearch_region in boto.cloudsearch.regions()]
+        region_conn = None
+
+        if region_name and region_name not in region_list:
+            raise ImproperlyConfigured("The 'REGION' in your connection settings is not valid. Available regions are %s" % region_list)
+        elif region_name:
+            for region in boto.cloudsearch.regions():
+                if region.name == region_name:
+                    region_conn = region
+                    break
+
         # Allow overrides for the SearchDomain prefix
         self.search_domain_prefix = connection_options.get('SEARCH_DOMAIN_PREFIX', 'haystack')
 
@@ -55,7 +69,12 @@ def __init__(self, connection_alias, **connection_options):
         if self.ip_address is None:
             raise ImproperlyConfigured("You must specify IP_ADDRESS in your settings for connection '%s'." % connection_alias)
 
-        self.boto_conn = boto.connect_cloudsearch(connection_options['AWS_ACCESS_KEY_ID'], connection_options['AWS_SECRET_KEY'])
+        self.boto_conn = boto.connect_cloudsearch(
+            aws_access_key_id=connection_options['AWS_ACCESS_KEY_ID'],
+            aws_secret_access_key=connection_options['AWS_SECRET_KEY'],
+            region=region_conn
+        )
+
         # this will become a standard haystack logger down the line
         self.log = logging.getLogger('haystack-cloudsearch')
         self.setup_complete = False