Merge branch 'master' into feature/2546

moto/batch/models.py

@@ -302,7 +302,9 @@ class Job(threading.Thread, BaseModel):
         self.job_id = str(uuid.uuid4())
         self.job_definition = job_def
         self.job_queue = job_queue
-        self.job_state = "SUBMITTED"  # One of SUBMITTED | PENDING | RUNNABLE | STARTING | RUNNING | SUCCEEDED | FAILED
+        self.job_state = (
+            "SUBMITTED"
+        )  # One of SUBMITTED | PENDING | RUNNABLE | STARTING | RUNNING | SUCCEEDED | FAILED
         self.job_queue.jobs.append(self)
         self.job_started_at = datetime.datetime(1970, 1, 1)
         self.job_stopped_at = datetime.datetime(1970, 1, 1)

moto/cloudformation/responses.py

@@ -177,7 +177,9 @@ class CloudFormationResponse(BaseResponse):
             start = stack_ids.index(token) + 1
         else:
             start = 0
-        max_results = 50  # using this to mske testing of paginated stacks more convenient than default 1 MB
+        max_results = (
+            50
+        )  # using this to mske testing of paginated stacks more convenient than default 1 MB
         stacks_resp = stacks[start : start + max_results]
         next_token = None
         if len(stacks) > (start + max_results):

moto/core/models.py

@@ -44,6 +44,7 @@ class BaseMockAWS(object):
             "AWS_ACCESS_KEY_ID": "foobar_key",
             "AWS_SECRET_ACCESS_KEY": "foobar_secret",
         }
+        self.default_session_mock = mock.patch("boto3.DEFAULT_SESSION", None)
         self.env_variables_mocks = mock.patch.dict(os.environ, FAKE_KEYS)
 
         if self.__class__.nested_count == 0:
@@ -62,6 +63,7 @@ class BaseMockAWS(object):
         self.stop()
 
     def start(self, reset=True):
+        self.default_session_mock.start()
         self.env_variables_mocks.start()
 
         self.__class__.nested_count += 1
@@ -72,6 +74,7 @@ class BaseMockAWS(object):
         self.enable_patching()
 
     def stop(self):
+        self.default_session_mock.stop()
         self.env_variables_mocks.stop()
         self.__class__.nested_count -= 1
 

moto/core/responses.py

@@ -307,7 +307,7 @@ class BaseResponse(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
         def _convert(elem, is_last):
             if not re.match("^{.*}$", elem):
                 return elem
-            name = elem.replace("{", "").replace("}", "")
+            name = elem.replace("{", "").replace("}", "").replace("+", "")
             if is_last:
                 return "(?P<%s>[^/]*)" % name
             return "(?P<%s>.*)" % name

moto/datasync/responses.py

@@ -153,7 +153,7 @@ class DataSyncResponse(BaseResponse):
         task_execution_arn = self._get_param("TaskExecutionArn")
         task_execution = self.datasync_backend._get_task_execution(task_execution_arn)
         result = json.dumps(
-            {"TaskExecutionArn": task_execution.arn, "Status": task_execution.status,}
+            {"TaskExecutionArn": task_execution.arn, "Status": task_execution.status}
         )
         if task_execution.status == "SUCCESS":
             self.datasync_backend.tasks[task_execution.task_arn].status = "AVAILABLE"

moto/datasync/urls.py

@@ -4,6 +4,4 @@ from .responses import DataSyncResponse
 
 url_bases = ["https?://(.*?)(datasync)(.*?).amazonaws.com"]
 
-url_paths = {
-    "{0}/$": DataSyncResponse.dispatch,
-}
+url_paths = {"{0}/$": DataSyncResponse.dispatch}

moto/events/models.py

@@ -316,8 +316,7 @@ class EventsBackend(BaseBackend):
 
         if not event_bus:
             raise JsonRESTError(
-                "ResourceNotFoundException",
-                "Event bus {} does not exist.".format(name),
+                "ResourceNotFoundException", "Event bus {} does not exist.".format(name)
             )
 
         return event_bus

moto/events/responses.py

@@ -261,10 +261,7 @@ class EventsHandler(BaseResponse):
         name = self._get_param("Name")
 
         event_bus = self.events_backend.describe_event_bus(name)
-        response = {
-            "Name": event_bus.name,
-            "Arn": event_bus.arn,
-        }
+        response = {"Name": event_bus.name, "Arn": event_bus.arn}
 
         if event_bus.policy:
             response["Policy"] = event_bus.policy
@@ -285,10 +282,7 @@ class EventsHandler(BaseResponse):
 
         response = []
         for event_bus in self.events_backend.list_event_buses(name_prefix):
-            event_bus_response = {
-                "Name": event_bus.name,
-                "Arn": event_bus.arn,
-            }
+            event_bus_response = {"Name": event_bus.name, "Arn": event_bus.arn}
 
             if event_bus.policy:
                 event_bus_response["Policy"] = event_bus.policy

moto/iam/models.py

@@ -788,7 +788,9 @@ class AccountSummary(BaseModel):
         self._groups_per_user_quota = 10
         self._attached_policies_per_user_quota = 10
         self._policies_quota = 1500
-        self._account_mfa_enabled = 0  # Haven't found any information being able to activate MFA for the root account programmatically
+        self._account_mfa_enabled = (
+            0
+        )  # Haven't found any information being able to activate MFA for the root account programmatically
         self._access_keys_per_user_quota = 2
         self._assume_role_policy_size_quota = 2048
         self._policy_versions_in_use_quota = 10000

moto/iam/policy_validation.py

@@ -88,7 +88,9 @@ class IAMPolicyDocumentValidator:
         self._policy_document = policy_document
         self._policy_json = {}
         self._statements = []
-        self._resource_error = ""  # the first resource error found that does not generate a legacy parsing error
+        self._resource_error = (
+            ""
+        )  # the first resource error found that does not generate a legacy parsing error
 
     def validate(self):
         try: