Merge pull request #3431 from mboersma/fix-bucket-checks

fix(database+registry): check for S3 bucket name before creating it

Author: mboersma

database/templates/create_bucket

@@ -1,14 +1,16 @@
 #!/usr/bin/env python
+
 import boto
 import sys
 from boto.s3.connection import OrdinaryCallingFormat
 
-conn = boto.connect_s3(host='{{ getv "/deis/store/gateway/host" }}',
-                       port={{ getv "/deis/store/gateway/port" }},
-                       is_secure=False,
-                       calling_format=OrdinaryCallingFormat(),
-                      )
-bucket = sys.argv[1]
 
-if not bucket in conn.get_all_buckets():
-  conn.create_bucket(bucket)
+conn = boto.connect_s3(
+    host='{{ getv "/deis/store/gateway/host" }}',
+    port={{ getv "/deis/store/gateway/port" }},
+    is_secure=False,
+    calling_format=OrdinaryCallingFormat())
+name = sys.argv[1]
+
+if name not in (bucket.name for bucket in conn.get_all_buckets()):
+    conn.create_bucket(name)

registry/templates/create_bucket

@@ -1,16 +1,17 @@
 #!/usr/bin/env python
+
 import boto
 import sys
 from boto.s3.connection import OrdinaryCallingFormat
 
-conn = boto.connect_s3(aws_access_key_id='{{ getv "/deis/store/gateway/accessKey" }}',
-                       aws_secret_access_key='{{ getv "/deis/store/gateway/secretKey" }}',
-                       host='{{ getv "/deis/store/gateway/host" }}',
-                       port={{ getv "/deis/store/gateway/port" }},
-                       is_secure=False,
-                       calling_format=OrdinaryCallingFormat(),
-                      )
-bucket = sys.argv[1]
+conn = boto.connect_s3(
+    aws_access_key_id='{{ getv "/deis/store/gateway/accessKey" }}',
+    aws_secret_access_key='{{ getv "/deis/store/gateway/secretKey" }}',
+    host='{{ getv "/deis/store/gateway/host" }}',
+    port={{ getv "/deis/store/gateway/port" }},
+    is_secure=False,
+    calling_format=OrdinaryCallingFormat())
+name = sys.argv[1]
 
-if not bucket in conn.get_all_buckets():
-  conn.create_bucket(bucket)
+if name not in (bucket.name for bucket in conn.get_all_buckets()):
+    conn.create_bucket(name)