Allow to switch off S3 bucket name validation

core/registrar/source.py

@@ -6,6 +6,10 @@ from fnmatch import fnmatch
 import logging
 
 import boto3
+import boto3.session
+import botocore.session
+import botocore.handlers
+
 from swiftclient.multithreading import OutputManager
 from swiftclient.service import SwiftError, SwiftService
 
@@ -132,7 +136,8 @@ class SwiftSource(Source):
 
 
 class S3Source(Source):
-    def __init__(self, name=None, bucket_name=None, secret_access_key=None, access_key_id=None, endpoint_url=None, strip_bucket=True, **client_kwargs):
+    def __init__(self, name=None, bucket_name=None, secret_access_key=None, access_key_id=None, endpoint_url=None,
+                 strip_bucket=True, validate_bucket_name=True, **client_kwargs):
         super().__init__(name)
 
         # see https://boto3.amazonaws.com/v1/documentation/api/latest/reference/core/session.html#boto3.session.Session.client
@@ -143,7 +148,13 @@ class S3Source(Source):
         self.endpoint_url = endpoint_url
         self.strip_bucket = strip_bucket
 
-        self.client = boto3.client(
+        botocore_session = botocore.session.Session()
+        if not validate_bucket_name:
+            botocore_session.unregister('before-parameter-build.s3', botocore.handlers.validate_bucket_name)
+
+        session = boto3.session.Session(botocore_session=botocore_session)
+
+        self.client = session.client(
             's3',
             aws_secret_access_key=secret_access_key,
             aws_access_key_id=access_key_id,