localstack-core 4.7.1.dev96__tar.gz → 4.7.1.dev98__tar.gz

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.7.1.dev96
+Version: 4.7.1.dev98
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/aws/mocking.py

@@ -224,7 +224,7 @@ custom_arns = {
 def generate_instance(shape: Shape, graph: ShapeGraph) -> Instance | None:
     if shape is None:
         return None
-    raise ValueError("could not generate shape for type %s" % shape.type_name)
+    raise ValueError(f"could not generate shape for type {shape.type_name}")
 
 
 @generate_instance.register
@@ -383,7 +383,7 @@ def _(shape: Shape, graph: ShapeGraph) -> int | float | bool | bytes | date:
     if shape.type_name == "timestamp":
         return datetime.now()
 
-    raise ValueError("unknown type %s" % shape.type_name)
+    raise ValueError(f"unknown type {shape.type_name}")
 
 
 def generate_response(operation: OperationModel):

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/aws/protocol/parser.py

@@ -265,12 +265,12 @@ class RequestParser(abc.ABC):
                 if uri_param_name in uri_params:
                     payload = uri_params[uri_param_name]
             else:
-                raise UnknownParserError("Unknown shape location '%s'." % location)
+                raise UnknownParserError(f"Unknown shape location '{location}'.")
         else:
             # If we don't have to use a specific location, we use the node
             payload = node
 
-        fn_name = "_parse_%s" % shape.type_name
+        fn_name = f"_parse_{shape.type_name}"
         handler = getattr(self, fn_name, self._noop_parser)
         try:
             return handler(request, shape, payload, uri_params) if payload is not None else None
@@ -322,7 +322,7 @@ class RequestParser(abc.ABC):
             return True
         if value == "false":
             return False
-        raise ValueError("cannot parse boolean value %s" % node)
+        raise ValueError(f"cannot parse boolean value {node}")
 
     @_text_content
     def _noop_parser(self, _, __, node: Any, ___):
@@ -336,7 +336,7 @@ class RequestParser(abc.ABC):
         if timestamp_format is None:
             timestamp_format = self.TIMESTAMP_FORMAT
         timestamp_format = timestamp_format.lower()
-        converter = getattr(self, "_timestamp_%s" % timestamp_format)
+        converter = getattr(self, f"_timestamp_{timestamp_format}")
         final_value = converter(value)
         return final_value
 
@@ -740,7 +740,7 @@ class RestXMLRequestParser(BaseRestRequestParser):
                 elif tag_name == value_location_name:
                     val_name = self._parse_shape(request, value_shape, single_pair, uri_params)
                 else:
-                    raise ProtocolParserError("Unknown tag: %s" % tag_name)
+                    raise ProtocolParserError(f"Unknown tag: {tag_name}")
             parsed[key_name] = val_name
         return parsed
 
@@ -786,7 +786,7 @@ class RestXMLRequestParser(BaseRestRequestParser):
             root = parser.close()
         except ETree.ParseError as e:
             raise ProtocolParserError(
-                "Unable to parse request (%s), invalid XML received:\n%s" % (e, xml_string)
+                f"Unable to parse request ({e}), invalid XML received:\n{xml_string}"
             ) from e
         return root
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/aws/protocol/serializer.py

@@ -527,7 +527,7 @@ class ResponseSerializer(abc.ABC):
             timestamp_format = self.TIMESTAMP_FORMAT
         timestamp_format = timestamp_format.lower()
         datetime_obj = parse_to_aware_datetime(value)
-        converter = getattr(self, "_timestamp_%s" % timestamp_format)
+        converter = getattr(self, f"_timestamp_{timestamp_format}")
         final_value = converter(datetime_obj)
         return final_value
 
@@ -689,7 +689,7 @@ class BaseXMLResponseSerializer(ResponseSerializer):
             name = shape.serialization.get("resultWrapper")
 
         try:
-            method = getattr(self, "_serialize_type_%s" % shape.type_name, self._default_serialize)
+            method = getattr(self, f"_serialize_type_{shape.type_name}", self._default_serialize)
             method(xmlnode, params, shape, name, mime_type)
         except (TypeError, ValueError, AttributeError) as e:
             raise ProtocolSerializerError(
@@ -705,7 +705,7 @@ class BaseXMLResponseSerializer(ResponseSerializer):
             namespace_metadata = shape.serialization["xmlNamespace"]
             attribute_name = "xmlns"
             if namespace_metadata.get("prefix"):
-                attribute_name += ":%s" % namespace_metadata["prefix"]
+                attribute_name += ":{}".format(namespace_metadata["prefix"])
             structure_node.attrib[attribute_name] = namespace_metadata["uri"]
         for key, value in params.items():
             if value is None:
@@ -1261,7 +1261,7 @@ class JSONResponseSerializer(ResponseSerializer):
         else:
             json_version = operation_model.metadata.get("jsonVersion")
             if json_version is not None:
-                response.headers["Content-Type"] = "application/x-amz-json-%s" % json_version
+                response.headers["Content-Type"] = f"application/x-amz-json-{json_version}"
         response.set_response(
             self._serialize_body_params(parameters, shape, operation_model, mime_type, request_id)
         )
@@ -1286,7 +1286,7 @@ class JSONResponseSerializer(ResponseSerializer):
     def _serialize(self, body: dict, value: Any, shape, key: str | None, mime_type: str):
         """This method dynamically invokes the correct `_serialize_type_*` method for each shape type."""
         try:
-            method = getattr(self, "_serialize_type_%s" % shape.type_name, self._default_serialize)
+            method = getattr(self, f"_serialize_type_{shape.type_name}", self._default_serialize)
             method(body, value, shape, key, mime_type)
         except (TypeError, ValueError, AttributeError) as e:
             raise ProtocolSerializerError(

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/aws/scaffold.py

@@ -221,7 +221,7 @@ class ShapeNode:
 
     def _print_as_typed_dict(self, output, doc=True, quote_types=False):
         name = to_valid_python_name(self.shape.name)
-        output.write('%s = TypedDict("%s", {\n' % (name, name))
+        output.write(f'{name} = TypedDict("{name}", {{\n')
         for k, v in self.shape.members.items():
             member_name = to_valid_python_name(v.name)
             # check if the member name is the same as the type name (recursive types need to use forward references)

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/cli/localstack.py

@@ -602,7 +602,7 @@ def cmd_stop() -> None:
 
     try:
         DOCKER_CLIENT.stop_container(container_name)
-        console.print("container stopped: %s" % container_name)
+        console.print(f"container stopped: {container_name}")
     except NoSuchContainer:
         raise CLIError(
             f'Expected a running LocalStack container named "{container_name}", but found none'

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/cli/plugins.py

@@ -56,7 +56,7 @@ def find(where, exclude, include, output):
     elif output == "dict":
         rprint(dict(plugins))
     else:
-        raise CLIError("unknown output format %s" % output)
+        raise CLIError(f"unknown output format {output}")
 
 
 @cli.command("list")

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/config.py

@@ -286,7 +286,7 @@ def ping(host):
     """Returns True if the host responds to a ping request"""
     is_in_windows = is_windows()
     ping_opts = "-n 1 -w 2000" if is_in_windows else "-c 1 -W 2"
-    args = "ping %s %s" % (ping_opts, host)
+    args = f"ping {ping_opts} {host}"
     return (
         subprocess.call(
             args, shell=not is_in_windows, stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -435,8 +435,8 @@ TMP_FOLDER = os.path.join(tempfile.gettempdir(), "localstack")
 VOLUME_DIR = os.environ.get("LOCALSTACK_VOLUME_DIR", "").strip() or TMP_FOLDER
 
 # fix for Mac OS, to be able to mount /var/folders in Docker
-if TMP_FOLDER.startswith("/var/folders/") and os.path.exists("/private%s" % TMP_FOLDER):
-    TMP_FOLDER = "/private%s" % TMP_FOLDER
+if TMP_FOLDER.startswith("/var/folders/") and os.path.exists(f"/private{TMP_FOLDER}"):
+    TMP_FOLDER = f"/private{TMP_FOLDER}"
 
 # whether to enable verbose debug logging ("LOG" is used when using the CLI with LOCALSTACK_LOG instead of LS_LOG)
 LS_LOG = eval_log_type("LS_LOG") or eval_log_type("LOG")
@@ -1237,8 +1237,8 @@ def use_custom_dns():
 
 
 # s3 virtual host name
-S3_VIRTUAL_HOSTNAME = "s3.%s" % LOCALSTACK_HOST.host
-S3_STATIC_WEBSITE_HOSTNAME = "s3-website.%s" % LOCALSTACK_HOST.host
+S3_VIRTUAL_HOSTNAME = f"s3.{LOCALSTACK_HOST.host}"
+S3_STATIC_WEBSITE_HOSTNAME = f"s3-website.{LOCALSTACK_HOST.host}"
 
 BOTO_WAITER_DELAY = int(os.environ.get("BOTO_WAITER_DELAY") or "1")
 BOTO_WAITER_MAX_ATTEMPTS = int(os.environ.get("BOTO_WAITER_MAX_ATTEMPTS") or "120")

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/dev/run/configurators.py

@@ -363,10 +363,7 @@ def _list_files_in_container_image(container_client: ContainerClient, image_name
         try:
             # docker export yields paths without prefixed slashes, so we add them here
             # since the file is pretty big (~4MB for community, ~7MB for pro) we gzip it
-            cmd = "docker export %s | tar -t | awk '{ print \"/\" $0 }' | gzip > %s" % (
-                container_id,
-                cache_file,
-            )
+            cmd = f"docker export {container_id} | tar -t | awk '{{ print \"/\" $0 }}' | gzip > {cache_file}"
             run(cmd, shell=True)
         finally:
             container_client.remove_container(container_id)

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/runtime/hooks.py

@@ -65,7 +65,7 @@ class HookManager(PluginManager):
             fn_plugin(*args, **kwargs)
 
     def __str__(self):
-        return "HookManager(%s)" % self.namespace
+        return f"HookManager({self.namespace})"
 
     def __repr__(self):
         return self.__str__()

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/runtime/init.py

@@ -91,7 +91,7 @@ class ShellScriptRunner(ScriptRunner):
     def run(self, path: str) -> None:
         exit_code = subprocess.call(args=[], executable=path)
         if exit_code != 0:
-            raise OSError("Script %s returned a non-zero exit code %s" % (path, exit_code))
+            raise OSError(f"Script {path} returned a non-zero exit code {exit_code}")
 
 
 class PythonScriptRunner(ScriptRunner):

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/runtime/main.py

@@ -20,13 +20,13 @@ def print_runtime_information(in_docker: bool = False):
     if in_docker:
         try:
             container_name = get_main_container_name()
-            print("LocalStack Docker container name: %s" % container_name)
+            print(f"LocalStack Docker container name: {container_name}")
             inspect_result = DOCKER_CLIENT.inspect_container(container_name)
             container_id = inspect_result["Id"]
-            print("LocalStack Docker container id: %s" % container_id[:12])
+            print(f"LocalStack Docker container id: {container_id[:12]}")
             image_details = DOCKER_CLIENT.inspect_image(inspect_result["Image"])
             digests = image_details.get("RepoDigests") or ["Unavailable"]
-            print("LocalStack Docker image sha: %s" % digests[0])
+            print(f"LocalStack Docker image sha: {digests[0]}")
         except ContainerException:
             print(
                 "LocalStack Docker container info: Failed to inspect the LocalStack docker container. "
@@ -44,10 +44,10 @@ def print_runtime_information(in_docker: bool = False):
                 )
 
     if config.LOCALSTACK_BUILD_DATE:
-        print("LocalStack build date: %s" % config.LOCALSTACK_BUILD_DATE)
+        print(f"LocalStack build date: {config.LOCALSTACK_BUILD_DATE}")
 
     if config.LOCALSTACK_BUILD_GIT_HASH:
-        print("LocalStack build git hash: %s" % config.LOCALSTACK_BUILD_GIT_HASH)
+        print(f"LocalStack build git hash: {config.LOCALSTACK_BUILD_GIT_HASH}")
 
     print()
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/apigateway/helpers.py

@@ -367,10 +367,7 @@ def resolve_references(data: dict, rest_api_id, allow_recursive=True) -> dict:
 
 def path_based_url(api_id: str, stage_name: str, path: str) -> str:
     """Return URL for inbound API gateway for given API ID, stage name, and path"""
-    pattern = "%s/restapis/{api_id}/{stage_name}/%s{path}" % (
-        config.external_service_url(),
-        PATH_USER_REQUEST,
-    )
+    pattern = f"{config.external_service_url()}/restapis/{{api_id}}/{{stage_name}}/{PATH_USER_REQUEST}{{path}}"
     return pattern.format(api_id=api_id, stage_name=stage_name, path=path)
 
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/apigateway/legacy/helpers.py

@@ -37,7 +37,7 @@ PATH_REGEX_TEST_INVOKE_API = r"^\/restapis\/([A-Za-z0-9_\-]+)\/resources\/([A-Za
 
 # regex path pattern for user requests, handles stages like $default
 PATH_REGEX_USER_REQUEST = (
-    r"^/restapis/([A-Za-z0-9_\\-]+)(?:/([A-Za-z0-9\_($|%%24)\\-]+))?/%s/(.*)$" % PATH_USER_REQUEST
+    rf"^/restapis/([A-Za-z0-9_\\-]+)(?:/([A-Za-z0-9\_($|%24)\\-]+))?/{PATH_USER_REQUEST}/(.*)$"
 )
 # URL pattern for invocations
 HOST_REGEX_EXECUTE_API = r"(?:.*://)?([a-zA-Z0-9]+)(?:(-vpce-[^.]+))?\.execute-api\.(.*)"
@@ -375,12 +375,12 @@ def get_apigateway_path_for_resource(
     path_part = target_resource.get("pathPart", "")
     if path_suffix:
         if path_part:
-            path_suffix = "%s/%s" % (path_part, path_suffix)
+            path_suffix = f"{path_part}/{path_suffix}"
     else:
         path_suffix = path_part
     parent_id = target_resource.get("parentId")
     if not parent_id:
-        return "/%s" % path_suffix
+        return f"/{path_suffix}"
     return get_apigateway_path_for_resource(
         api_id,
         parent_id,
@@ -419,7 +419,7 @@ def get_resource_for_path(
     for api_path, details in path_map.items():
         api_path_regex = re.sub(r"{[^+]+\+}", r"[^\?#]+", api_path)
         api_path_regex = re.sub(r"{[^}]+}", r"[^/]+", api_path_regex)
-        if re.match(r"^%s$" % api_path_regex, path):
+        if re.match(rf"^{api_path_regex}$", path):
             matches.append((api_path, details))
 
     # if there are no matches, it's not worth to proceed, bail here!
@@ -508,8 +508,7 @@ def connect_api_gateway_to_sqs(gateway_name, stage_name, queue_arn, path, accoun
             "integrations": [
                 {
                     "type": "AWS",
-                    "uri": "arn:%s:apigateway:%s:sqs:path/%s/%s"
-                    % (partition, sqs_region, sqs_account, queue_name),
+                    "uri": f"arn:{partition}:apigateway:{sqs_region}:sqs:path/{sqs_account}/{queue_name}",
                     "requestTemplates": {"application/json": template},
                     "requestParameters": {
                         "integration.request.header.Content-Type": "'application/x-www-form-urlencoded'"
@@ -660,11 +659,11 @@ def set_api_id_stage_invocation_path(
     if path_match:
         api_id = path_match.group(1)
         stage = path_match.group(2)
-        relative_path_w_query_params = "/%s" % path_match.group(3)
+        relative_path_w_query_params = f"/{path_match.group(3)}"
     elif host_match:
         api_id = extract_api_id_from_hostname_in_url(host_header)
         stage = path.strip("/").split("/")[0]
-        relative_path_w_query_params = "/%s" % path.lstrip("/").partition("/")[2]
+        relative_path_w_query_params = "/{}".format(path.lstrip("/").partition("/")[2])
     elif test_invoke_match:
         stage = invocation_context.stage
         api_id = invocation_context.api_id

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/apigateway/legacy/integration.py

@@ -783,7 +783,7 @@ class HTTPIntegration(BackendIntegration):
             instances = client.list_instances(ServiceId=service_id)["Instances"]
             instance = (instances or [None])[0]
             if instance and instance.get("Id"):
-                uri = "http://%s/%s" % (instance["Id"], invocation_path.lstrip("/"))
+                uri = "http://{}/{}".format(instance["Id"], invocation_path.lstrip("/"))
 
         # apply custom request template
         invocation_context.context = get_event_request_context(invocation_context)
@@ -977,8 +977,9 @@ class StepFunctionIntegration(BackendIntegration):
                     headers={"Content-Type": APPLICATION_JSON},
                     data=json.dumps(
                         {
-                            "message": "StepFunctions execution %s failed with status '%s'"
-                            % (result["executionArn"], result_status)
+                            "message": "StepFunctions execution {} failed with status '{}'".format(
+                                result["executionArn"], result_status
+                            )
                         }
                     ),
                 )

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/apigateway/legacy/invocations.py

@@ -280,7 +280,7 @@ def invoke_rest_api(invocation_context: ApiInvocationContext):
 
     extracted_path, resource = get_target_resource_details(invocation_context)
     if not resource:
-        return make_error_response("Unable to find path %s" % invocation_context.path, 404)
+        return make_error_response(f"Unable to find path {invocation_context.path}", 404)
 
     # validate request
     validator = RequestValidator(invocation_context)
@@ -307,7 +307,7 @@ def invoke_rest_api(invocation_context: ApiInvocationContext):
             # default to returning CORS headers if this is an OPTIONS request
             return get_cors_response(headers)
         return make_error_response(
-            "Unable to find integration for: %s %s (%s)" % (method, invocation_path, raw_path),
+            f"Unable to find integration for: {method} {invocation_path} ({raw_path})",
             404,
         )
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/apigateway/legacy/provider.py

@@ -3025,7 +3025,7 @@ def to_documentation_part_response_json(api_id, data):
 
 
 def to_base_mapping_response_json(domain_name, base_path, data):
-    self_link = "/domainnames/%s/basepathmappings/%s" % (domain_name, base_path)
+    self_link = f"/domainnames/{domain_name}/basepathmappings/{base_path}"
     result = to_response_json("basepathmapping", data, self_link=self_link)
     result = select_from_typed_dict(BasePathMapping, result)
     return result
@@ -3061,9 +3061,9 @@ def to_response_json(model_type, data, api_id=None, self_link=None, id_attr=None
     id_attr = id_attr or "id"
     result = deepcopy(data)
     if not self_link:
-        self_link = "/%ss/%s" % (model_type, data[id_attr])
+        self_link = f"/{model_type}s/{data[id_attr]}"
         if api_id:
-            self_link = "/restapis/%s/%s" % (api_id, self_link)
+            self_link = f"/restapis/{api_id}/{self_link}"
     # TODO: check if this is still required - "_links" are listed in the sample responses in the docs, but
     #  recent parity tests indicate that this field is not returned by real AWS...
     # https://docs.aws.amazon.com/apigateway/latest/api/API_GetAuthorizers.html#API_GetAuthorizers_Example_1_Response
@@ -3075,7 +3075,7 @@ def to_response_json(model_type, data, api_id=None, self_link=None, id_attr=None
         "name": model_type,
         "templated": True,
     }
-    result["_links"]["%s:delete" % model_type] = {"href": self_link}
+    result["_links"][f"{model_type}:delete"] = {"href": self_link}
     return result
 
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/apigateway/resource_providers/aws_apigateway_resource.py

@@ -72,7 +72,7 @@ class ApiGatewayResourceProvider(ResourceProvider[ApiGatewayResourceProperties])
             root_resource = ([r for r in resources if r["path"] == "/"] or [None])[0]
             if not root_resource:
                 raise Exception(
-                    "Unable to find root resource for REST API %s" % params["restApiId"]
+                    "Unable to find root resource for REST API {}".format(params["restApiId"])
                 )
             params["parentId"] = root_resource["id"]
         response = apigw.create_resource(**params)

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/api_utils.py

@@ -77,9 +77,7 @@ def get_remote_template_body(url: str) -> str:
             result = client.get_object(Bucket=parts[0], Key=parts[2])
             body = to_str(result["Body"].read())
             return body
-        raise RuntimeError(
-            "Unable to fetch template body (code %s) from URL %s" % (status_code, url)
-        )
+        raise RuntimeError(f"Unable to fetch template body (code {status_code}) from URL {url}")
     else:
         raise RuntimeError(
             f"Bad status code from fetching template from url '{url}' ({status_code})",
@@ -112,11 +110,9 @@ def get_template_body(req_data: dict) -> str:
                 result = client.get_object(Bucket=parts[0], Key=parts[2])
                 body = to_str(result["Body"].read())
                 return body
-            raise Exception(
-                "Unable to fetch template body (code %s) from URL %s" % (status_code, url)
-            )
+            raise Exception(f"Unable to fetch template body (code {status_code}) from URL {url}")
         return to_str(response.content)
-    raise Exception("Unable to get template body from input: %s" % req_data)
+    raise Exception(f"Unable to get template body from input: {req_data}")
 
 
 def is_local_service_url(url: str) -> bool:
@@ -127,7 +123,7 @@ def is_local_service_url(url: str) -> bool:
         constants.LOCALHOST_HOSTNAME,
         localstack_host().host,
     )
-    if any(re.match(r"^[^:]+://[^:/]*%s([:/]|$)" % host, url) for host in candidates):
+    if any(re.match(rf"^[^:]+://[^:/]*{host}([:/]|$)", url) for host in candidates):
         return True
     host = url.split("://")[-1].split("/")[0]
     return "localhost" in host

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/cfn_utils.py

@@ -59,7 +59,7 @@ def convert_types(obj, types):
         def recurse(o, path):
             if isinstance(o, dict):
                 for k, v in dict(o).items():
-                    key_path = "%s%s" % (path or ".", k)
+                    key_path = "{}{}".format(path or ".", k)
                     if key in [k, key_path]:
                         o[k] = type_class(v)
             return o

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/engine/entities.py

@@ -360,8 +360,7 @@ class Stack:
         resource = resource_map.get(resource_id)
         if not resource:
             raise Exception(
-                'Unable to find details for resource "%s" in stack "%s"'
-                % (resource_id, self.stack_name)
+                f'Unable to find details for resource "{resource_id}" in stack "{self.stack_name}"'
             )
         return resource
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/engine/template_deployer.py

@@ -329,7 +329,7 @@ def _resolve_refs_recursively(
                 account_id, region_name, stack_name, resources, parameters, value["Ref"]
             )
             if ref is None:
-                msg = 'Unable to resolve Ref for resource "%s" (yet)' % value["Ref"]
+                msg = 'Unable to resolve Ref for resource "{}" (yet)'.format(value["Ref"])
                 LOG.debug("%s - %s", msg, resources.get(value["Ref"]) or set(resources.keys()))
 
                 raise DependencyNotYetSatisfied(resource_ids=value["Ref"], message=msg)
@@ -450,7 +450,7 @@ def _resolve_refs_recursively(
                     raise DependencyNotYetSatisfied(
                         resource_ids=key, message=f"Could not resolve {val} to terminal value type"
                     )
-                result = result.replace("${%s}" % key, str(resolved_val))
+                result = result.replace(f"${{{key}}}", str(resolved_val))
 
             # resolve placeholders
             result = resolve_placeholders_in_string(

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_transform.py

@@ -146,7 +146,7 @@ class ChangeSetModelTransform(ChangeSetModelPreproc):
         if not location or not location.startswith("s3://"):
             raise FailedTransformationException(
                 transformation=INCLUDE_TRANSFORM,
-                message="Unexpected Location parameter for AWS::Include transformer: %s" % location,
+                message=f"Unexpected Location parameter for AWS::Include transformer: {location}",
             )
 
         s3_client = connect_to(
@@ -158,7 +158,7 @@ class ChangeSetModelTransform(ChangeSetModelPreproc):
         except ClientError:
             raise FailedTransformationException(
                 transformation=INCLUDE_TRANSFORM,
-                message="Error downloading S3 object '%s/%s'" % (bucket, path),
+                message=f"Error downloading S3 object '{bucket}/{path}'",
             )
         try:
             template_to_include = parse_template(content)

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/provider.py

@@ -159,7 +159,7 @@ def find_stack_instance(stack_set: StackSet, account: str, region: str):
 
 def stack_not_found_error(stack_name: str):
     # FIXME
-    raise ValidationError("Stack with id %s does not exist" % stack_name)
+    raise ValidationError(f"Stack with id {stack_name} does not exist")
 
 
 def not_found_error(message: str):
@@ -305,7 +305,7 @@ class CloudformationProvider(CloudformationApi):
             deployer.deploy_stack()
         except Exception as e:
             stack.set_stack_status("CREATE_FAILED")
-            msg = 'Unable to create stack "%s": %s' % (stack.stack_name, e)
+            msg = f'Unable to create stack "{stack.stack_name}": {e}'
             LOG.error("%s", exc_info=LOG.isEnabledFor(logging.DEBUG))
             raise ValidationError(msg) from e
 

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/cloudformation/service_models.py

@@ -13,7 +13,7 @@ class DependencyNotYetSatisfied(Exception):
     """Exception indicating that a resource dependency is not (yet) deployed/available."""
 
     def __init__(self, resource_ids, message=None):
-        message = message or "Unresolved dependencies: %s" % resource_ids
+        message = message or f"Unresolved dependencies: {resource_ids}"
         super().__init__(message)
         resource_ids = resource_ids if isinstance(resource_ids, list) else [resource_ids]
         self.resource_ids = resource_ids

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/dynamodb/server.py

@@ -162,7 +162,7 @@ class DynamodbServer(Server):
         cmd = [
             "java",
             *self._get_java_vm_options(),
-            "-Xmx%s" % self.heap_size,
+            f"-Xmx{self.heap_size}",
             f"-javaagent:{dynamodblocal_package.get_installer().get_ddb_agent_jar_path()}",
             f"-Djava.library.path={self.library_path}",
             "-jar",

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/edge.py

@@ -72,7 +72,7 @@ def start_component(
                 default_port=constants.DEFAULT_PORT_EDGE,
             ),
         )
-    raise Exception("Unexpected component name '%s' received during start up" % component)
+    raise Exception(f"Unexpected component name '{component}' received during start up")
 
 
 def start_proxy(

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/events/v1/provider.py

@@ -206,12 +206,12 @@ class EventsProvider(EventsApi, ServiceLifecycleHook):
                 raise ValueError("If the value is greater than 1, the unit must be plural")
 
             if "minute" in unit:
-                return "*/%s * * * *" % value
+                return f"*/{value} * * * *"
             if "hour" in unit:
-                return "0 */%s * * *" % value
+                return f"0 */{value} * * *"
             if "day" in unit:
-                return "0 0 */%s * *" % value
-            raise ValueError("Unable to parse events schedule expression: %s" % schedule)
+                return f"0 0 */{value} * *"
+            raise ValueError(f"Unable to parse events schedule expression: {schedule}")
         return schedule
 
     @staticmethod
@@ -374,7 +374,7 @@ def _dump_events_to_files(events_with_added_uuid):
         for event in events_with_added_uuid:
             target = os.path.join(
                 _get_events_tmp_dir(),
-                "%s_%s" % (current_time_millis, event["uuid"]),
+                "{}_{}".format(current_time_millis, event["uuid"]),
             )
             save_file(target, json.dumps(event["event"]))
     except Exception as e:

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/kinesis/provider.py

@@ -49,7 +49,7 @@ def find_stream_for_consumer(consumer_arn):
         for cons in kinesis.list_stream_consumers(StreamARN=stream_arn)["Consumers"]:
             if cons["ConsumerARN"] == consumer_arn:
                 return stream_name
-    raise Exception("Unable to find stream for stream consumer %s" % consumer_arn)
+    raise Exception(f"Unable to find stream for stream consumer {consumer_arn}")
 
 
 class KinesisProvider(KinesisApi, ServiceLifecycleHook):

{localstack_core-4.7.1.dev96 → localstack_core-4.7.1.dev98}/localstack-core/localstack/services/plugins.py

@@ -286,19 +286,19 @@ class ServiceManager:
         container = self.get_service_container(name)
 
         if not container:
-            raise ValueError("no such service %s" % name)
+            raise ValueError(f"no such service {name}")
 
         if container.state == ServiceState.STARTING:
             if not poll_condition(lambda: container.state != ServiceState.STARTING, timeout=30):
-                raise TimeoutError("gave up waiting for service %s to start" % name)
+                raise TimeoutError(f"gave up waiting for service {name} to start")
 
         if container.state == ServiceState.STOPPING:
             if not poll_condition(lambda: container.state == ServiceState.STOPPED, timeout=30):
-                raise TimeoutError("gave up waiting for service %s to stop" % name)
+                raise TimeoutError(f"gave up waiting for service {name} to stop")
 
         with container.lock:
             if container.state == ServiceState.DISABLED:
-                raise ServiceDisabled("service %s is disabled" % name)
+                raise ServiceDisabled(f"service {name} is disabled")
 
             if container.state == ServiceState.RUNNING:
                 return container.service
@@ -314,7 +314,7 @@ class ServiceManager:
                     raise container.errors[-1]
 
         raise ServiceStateException(
-            "service %s is not ready (%s) and could not be started" % (name, container.state)
+            f"service {name} is not ready ({container.state}) and could not be started"
         )
 
     # legacy map compatibility
@@ -692,7 +692,7 @@ def check_service_health(api, expect_shutdown=False):
             LOG.warning('Service "%s" not yet available, retrying...', api)
         else:
             LOG.warning('Service "%s" still shutting down, retrying...', api)
-        raise Exception("Service check failed for api: %s" % api)
+        raise Exception(f"Service check failed for api: {api}")
 
 
 @hooks.on_infra_start(should_load=lambda: config.EAGER_SERVICE_LOADING)