localstack-core 4.7.1.dev96__py3-none-any.whl → 4.7.1.dev97__py3-none-any.whl

localstack/state/pickle.py

@@ -64,7 +64,7 @@ def register(cls: type = None, subclasses: bool = False):
         elif callable(fn):
             add_dispatch_entry(cls, fn, subclasses=subclasses)
         else:
-            raise ValueError("cannot register %s" % fn)
+            raise ValueError(f"cannot register {fn}")
 
         return fn
 

localstack/testing/pytest/fixtures.py

@@ -232,7 +232,7 @@ def s3_create_bucket(s3_empty_bucket, aws_client):
 
     def factory(**kwargs) -> str:
         if "Bucket" not in kwargs:
-            kwargs["Bucket"] = "test-bucket-%s" % short_uid()
+            kwargs["Bucket"] = f"test-bucket-{short_uid()}"
 
         if (
             "CreateBucketConfiguration" not in kwargs
@@ -335,7 +335,7 @@ def sqs_create_queue(aws_client):
 
     def factory(**kwargs):
         if "QueueName" not in kwargs:
-            kwargs["QueueName"] = "test-queue-%s" % short_uid()
+            kwargs["QueueName"] = f"test-queue-{short_uid()}"
 
         response = aws_client.sqs.create_queue(**kwargs)
         url = response["QueueUrl"]
@@ -503,7 +503,7 @@ def sns_create_topic(aws_client):
 
     def _create_topic(**kwargs):
         if "Name" not in kwargs:
-            kwargs["Name"] = "test-topic-%s" % short_uid()
+            kwargs["Name"] = f"test-topic-{short_uid()}"
         response = aws_client.sns.create_topic(**kwargs)
         topic_arns.append(response["TopicArn"])
         return response

localstack/utils/analytics/metadata.py

@@ -41,7 +41,7 @@ class ClientMetadata:
             k = "*" * len(k)
         d["api_key"] = k
 
-        return "ClientMetadata(%s)" % d
+        return f"ClientMetadata({d})"
 
 
 def get_version_string() -> str:

localstack/utils/aws/arns.py

@@ -120,7 +120,7 @@ def iam_role_arn(role_name: str, account_id: str, region_name: str) -> str:
         return role_name
     if re.match(f"{ARN_PARTITION_REGEX}:iam::", role_name):
         return role_name
-    return "arn:%s:iam::%s:role/%s" % (get_partition(region_name), account_id, role_name)
+    return f"arn:{get_partition(region_name)}:iam::{account_id}:role/{role_name}"
 
 
 def iam_resource_arn(resource: str, account_id: str, role: str = None) -> str:
@@ -180,13 +180,7 @@ def dynamodb_table_arn(table_name: str, account_id: str, region_name: str) -> st
 def dynamodb_stream_arn(
     table_name: str, latest_stream_label: str, account_id: str, region_name: str
 ) -> str:
-    return "arn:%s:dynamodb:%s:%s:table/%s/stream/%s" % (
-        get_partition(region_name),
-        region_name,
-        account_id,
-        table_name,
-        latest_stream_label,
-    )
+    return f"arn:{get_partition(region_name)}:dynamodb:{region_name}:{account_id}:table/{table_name}/stream/{latest_stream_label}"
 
 
 #
@@ -453,7 +447,7 @@ def s3_bucket_arn(bucket_name_or_arn: str, region="us-east-1") -> str:
 
 def sqs_queue_arn(queue_name: str, account_id: str, region_name: str) -> str:
     queue_name = queue_name.split("/")[-1]
-    return "arn:%s:sqs:%s:%s:%s" % (get_partition(region_name), region_name, account_id, queue_name)
+    return f"arn:{get_partition(region_name)}:sqs:{region_name}:{account_id}:{queue_name}"
 
 
 #
@@ -462,20 +456,13 @@ def sqs_queue_arn(queue_name: str, account_id: str, region_name: str) -> str:
 
 
 def apigateway_restapi_arn(api_id: str, account_id: str, region_name: str) -> str:
-    return "arn:%s:apigateway:%s:%s:/restapis/%s" % (
-        get_partition(region_name),
-        region_name,
-        account_id,
-        api_id,
+    return (
+        f"arn:{get_partition(region_name)}:apigateway:{region_name}:{account_id}:/restapis/{api_id}"
     )
 
 
 def apigateway_invocations_arn(lambda_uri: str, region_name: str) -> str:
-    return "arn:%s:apigateway:%s:lambda:path/2015-03-31/functions/%s/invocations" % (
-        get_partition(region_name),
-        region_name,
-        lambda_uri,
-    )
+    return f"arn:{get_partition(region_name)}:apigateway:{region_name}:lambda:path/2015-03-31/functions/{lambda_uri}/invocations"
 
 
 #
@@ -555,7 +542,7 @@ def lambda_function_name(name_or_arn: str) -> str:
     if ":" in name_or_arn:
         arn = parse_arn(name_or_arn)
         if arn["service"] != "lambda":
-            raise ValueError("arn is not a lambda arn %s" % name_or_arn)
+            raise ValueError(f"arn is not a lambda arn {name_or_arn}")
 
         return parse_arn(name_or_arn)["resource"].split(":")[1]
     else:

localstack/utils/aws/aws_responses.py

@@ -42,7 +42,7 @@ def requests_error_response_xml(
     xmlns: Optional[str] = None,
 ):
     response = RequestsResponse()
-    xmlns = xmlns or "http://%s.amazonaws.com/doc/2010-03-31/" % service
+    xmlns = xmlns or f"http://{service}.amazonaws.com/doc/2010-03-31/"
     response._content = f"""<ErrorResponse xmlns="{xmlns}"><Error>
         <Type>Sender</Type>
         <Code>{code_string}</Code>

localstack/utils/aws/dead_letter_queue.py

@@ -59,11 +59,7 @@ def _send_to_dead_letter_queue(source_arn: str, dlq_arn: str, event: dict, error
         except Exception as e:
             error = e
         if error or not result_code or result_code >= 400:
-            msg = "Unable to send message to dead letter queue %s (code %s): %s" % (
-                queue_url,
-                result_code,
-                error,
-            )
+            msg = f"Unable to send message to dead letter queue {queue_url} (code {result_code}): {error}"
             if "InvalidMessageContents" in str(error):
                 msg += f" - messages: {messages}"
             LOG.info(msg)

localstack/utils/aws/resources.py

@@ -86,7 +86,7 @@ def create_api_gateway(
     resources = resources or []
     stage_name = stage_name or "testing"
     usage_plan_name = usage_plan_name or "Basic Usage"
-    description = description or 'Test description for API "%s"' % name
+    description = description or f'Test description for API "{name}"'
 
     LOG.info('Creating API resources under API Gateway "%s".', name)
     api = client.create_rest_api(name=name, description=description)

localstack/utils/aws/templating.py

@@ -66,7 +66,7 @@ class VtlTemplate:
         empty_placeholder = " __pLaCe-HoLdEr__ "
         template = re.sub(
             r"([^\s]+)#\$({)?(.*)",
-            r"\1#%s$\2\3" % empty_placeholder,
+            rf"\1#{empty_placeholder}$\2\3",
             template,
             count=re.MULTILINE,
         )

localstack/utils/bootstrap.py

@@ -427,7 +427,7 @@ def validate_localstack_config(name: str):
 
     def port_exposed(port):
         for exposed in docker_ports:
-            if re.match(r"^([0-9]+-)?%s(-[0-9]+)?$" % port, exposed):
+            if re.match(rf"^([0-9]+-)?{port}(-[0-9]+)?$", exposed):
                 return True
 
     if not port_exposed(edge_port):
@@ -455,7 +455,7 @@ def get_docker_image_to_start():
 
 def extract_port_flags(user_flags, port_mappings: PortMappings):
     regex = r"-p\s+([0-9]+)(\-([0-9]+))?:([0-9]+)(\-([0-9]+))?"
-    matches = re.match(".*%s" % regex, user_flags)
+    matches = re.match(f".*{regex}", user_flags)
     if matches:
         for match in re.findall(regex, user_flags):
             start = int(match[0])
@@ -1115,7 +1115,7 @@ class LocalstackContainerServer(Server):
     def do_run(self):
         if self.is_container_running():
             raise ContainerExists(
-                'LocalStack container named "%s" is already running' % self.container.name
+                f'LocalStack container named "{self.container.name}" is already running'
             )
 
         config.dirs.mkdirs()
@@ -1156,7 +1156,7 @@ def prepare_docker_start():
     container_name = config.MAIN_CONTAINER_NAME
 
     if DOCKER_CLIENT.is_container_running(container_name):
-        raise ContainerExists('LocalStack container named "%s" is already running' % container_name)
+        raise ContainerExists(f'LocalStack container named "{container_name}" is already running')
 
     config.dirs.mkdirs()
 

localstack/utils/container_utils/docker_cmd_client.py

@@ -202,7 +202,7 @@ class CmdDockerClient(ContainerClient):
         except subprocess.CalledProcessError as e:
             self._check_and_raise_no_such_container_error(container_name, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def pause_container(self, container_name: str) -> None:
@@ -214,7 +214,7 @@ class CmdDockerClient(ContainerClient):
         except subprocess.CalledProcessError as e:
             self._check_and_raise_no_such_container_error(container_name, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def unpause_container(self, container_name: str) -> None:
@@ -226,7 +226,7 @@ class CmdDockerClient(ContainerClient):
         except subprocess.CalledProcessError as e:
             self._check_and_raise_no_such_container_error(container_name, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def remove_image(self, image: str, force: bool = True) -> None:
@@ -243,7 +243,7 @@ class CmdDockerClient(ContainerClient):
             if any(msg in to_str(e.stdout) for msg in error_messages):
                 raise NoSuchImage(image, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def commit(
@@ -262,7 +262,7 @@ class CmdDockerClient(ContainerClient):
         except subprocess.CalledProcessError as e:
             self._check_and_raise_no_such_container_error(container_name_or_id, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def remove_container(self, container_name: str, force=True, check_existence=False) -> None:
@@ -282,7 +282,7 @@ class CmdDockerClient(ContainerClient):
             if not force:
                 self._check_and_raise_no_such_container_error(container_name, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def list_containers(self, filter: Union[list[str], str, None] = None, all=True) -> list[dict]:
@@ -301,7 +301,7 @@ class CmdDockerClient(ContainerClient):
             cmd_result = run(cmd).strip()
         except subprocess.CalledProcessError as e:
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
         container_list = []
         if cmd_result:
@@ -355,7 +355,7 @@ class CmdDockerClient(ContainerClient):
             if re.match(".*container .+ does not exist", to_str(e.stdout)):
                 raise NoSuchContainer(container_name, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def pull_image(
@@ -384,7 +384,7 @@ class CmdDockerClient(ContainerClient):
             if "Trying to pull" in stdout_str and "access to the resource is denied" in stdout_str:
                 raise NoSuchImage(docker_image, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def push_image(self, docker_image: str) -> None:
@@ -478,7 +478,7 @@ class CmdDockerClient(ContainerClient):
                 return ""
             self._check_and_raise_no_such_container_error(container_name_or_id, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def stream_container_logs(self, container_name_or_id: str) -> CancellableStream:
@@ -503,7 +503,7 @@ class CmdDockerClient(ContainerClient):
             if "no such object" in to_str(e.stdout).lower():
                 raise NoSuchObject(object_name_or_id, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
         object_data = json.loads(cmd_result.strip())
         if isinstance(object_data, list):
@@ -556,7 +556,7 @@ class CmdDockerClient(ContainerClient):
             return run(cmd).strip()
         except subprocess.CalledProcessError as e:
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def delete_network(self, network_name: str) -> None:
@@ -570,7 +570,7 @@ class CmdDockerClient(ContainerClient):
                 raise NoSuchNetwork(network_name=network_name)
             else:
                 raise ContainerException(
-                    "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                    f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
                 ) from e
 
     def inspect_network(self, network_name: str) -> dict[str, Union[dict, str]]:
@@ -607,7 +607,7 @@ class CmdDockerClient(ContainerClient):
                 raise NoSuchNetwork(network_name=network_name)
             self._check_and_raise_no_such_container_error(container_name_or_id, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def disconnect_container_from_network(
@@ -625,7 +625,7 @@ class CmdDockerClient(ContainerClient):
                 raise NoSuchNetwork(network_name=network_name)
             self._check_and_raise_no_such_container_error(container_name_or_id, error=e)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def get_container_ip(self, container_name_or_id: str) -> str:
@@ -645,7 +645,7 @@ class CmdDockerClient(ContainerClient):
             if "no such object" in to_str(e.stdout).lower():
                 raise NoSuchContainer(container_name_or_id, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def login(self, username: str, password: str, registry: Optional[str] = None) -> None:
@@ -658,7 +658,7 @@ class CmdDockerClient(ContainerClient):
             run(cmd)
         except subprocess.CalledProcessError as e:
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     @functools.cache
@@ -684,7 +684,7 @@ class CmdDockerClient(ContainerClient):
             if any(msg in to_str(e.stdout) for msg in error_messages):
                 raise NoSuchImage(image_name, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
         finally:
             Util.rm_env_vars_file(env_file)
@@ -791,7 +791,7 @@ class CmdDockerClient(ContainerClient):
             if any(msg.lower() in to_str(e.stderr).lower() for msg in error_messages):
                 raise NoSuchContainer(container_name, stdout=e.stdout, stderr=e.stderr)
             raise ContainerException(
-                "Docker process returned with errorcode %s" % e.returncode, e.stdout, e.stderr
+                f"Docker process returned with errorcode {e.returncode}", e.stdout, e.stderr
             ) from e
 
     def _build_run_create_cmd(

localstack/utils/crypto.py

@@ -43,8 +43,8 @@ def generate_ssl_cert(
         return all(os.path.exists(f) for f in files)
 
     def store_cert_key_files(base_filename):
-        key_file_name = "%s.key" % base_filename
-        cert_file_name = "%s.crt" % base_filename
+        key_file_name = f"{base_filename}.key"
+        cert_file_name = f"{base_filename}.crt"
         # TODO: Cleaner code to load the cert dynamically
         # extract key and cert from target_file and store into separate files
         content = load_file(target_file)
@@ -74,9 +74,9 @@ def generate_ssl_cert(
             return target_file, cert_file_name, key_file_name
     if random and target_file:
         if "." in target_file:
-            target_file = target_file.replace(".", ".%s." % short_uid(), 1)
+            target_file = target_file.replace(".", f".{short_uid()}.", 1)
         else:
-            target_file = "%s.%s" % (target_file, short_uid())
+            target_file = f"{target_file}.{short_uid()}"
 
     # create a key pair
     k = crypto.PKey()
@@ -123,10 +123,10 @@ def generate_ssl_cert(
     key_file.write(to_str(crypto.dump_privatekey(crypto.FILETYPE_PEM, k)))
     cert_file_content = cert_file.getvalue().strip()
     key_file_content = key_file.getvalue().strip()
-    file_content = "%s\n%s" % (key_file_content, cert_file_content)
+    file_content = f"{key_file_content}\n{cert_file_content}"
     if target_file:
-        key_file_name = "%s.key" % target_file
-        cert_file_name = "%s.crt" % target_file
+        key_file_name = f"{target_file}.key"
+        cert_file_name = f"{target_file}.crt"
         # check existence to avoid permission denied issues:
         # https://github.com/localstack/localstack/issues/1607
         if not all_exist(target_file, key_file_name, cert_file_name):
@@ -145,9 +145,9 @@ def generate_ssl_cert(
                         e,
                     )
                     # Fix for https://github.com/localstack/localstack/issues/1743
-                    target_file = "%s.pem" % new_tmp_file()
-                    key_file_name = "%s.key" % target_file
-                    cert_file_name = "%s.crt" % target_file
+                    target_file = f"{new_tmp_file()}.pem"
+                    key_file_name = f"{target_file}.key"
+                    cert_file_name = f"{target_file}.crt"
             TMP_FILES.append(target_file)
             TMP_FILES.append(key_file_name)
             TMP_FILES.append(cert_file_name)

localstack/utils/diagnose.py

@@ -134,7 +134,7 @@ def traverse_file_tree(root: str) -> list[str]:
                 result.append(dirpath)
         return result
     except Exception as e:
-        return ["traversing files failed %s" % e]
+        return [f"traversing files failed {e}"]
 
 
 def get_docker_image_details() -> dict[str, str]:

localstack/utils/files.py

@@ -201,7 +201,7 @@ def rm_rf(path: str):
     # Running the native command can be an order of magnitude faster in Alpine on Travis-CI
     if is_debian():
         try:
-            return run('rm -rf "%s"' % path)
+            return run(f'rm -rf "{path}"')
         except Exception:
             pass
     # Make sure all files are writeable and dirs executable to remove
@@ -247,11 +247,7 @@ def cp_r(src: str, dst: str, rm_dest_on_conflict=False, ignore_copystat_errors=F
     except Exception as e:
 
         def _info(_path):
-            return "%s (file=%s, symlink=%s)" % (
-                _path,
-                os.path.isfile(_path),
-                os.path.islink(_path),
-            )
+            return f"{_path} (file={os.path.isfile(_path)}, symlink={os.path.islink(_path)})"
 
         LOG.debug("Error copying files from %s to %s: %s", _info(src), _info(dst), e)
         raise

localstack/utils/functions.py

@@ -32,7 +32,7 @@ def call_safe(
     :return: whatever the func returns
     """
     if exception_message is None:
-        exception_message = "error calling function %s" % func.__name__
+        exception_message = f"error calling function {func.__name__}"
     if args is None:
         args = ()
     if kwargs is None:

localstack/utils/http.py

@@ -43,12 +43,12 @@ def create_chunked_data(data, chunk_size: int = 80):
     dl = len(data)
     ret = ""
     for i in range(dl // chunk_size):
-        ret += "%s\r\n" % (hex(chunk_size)[2:])
-        ret += "%s\r\n\r\n" % (data[i * chunk_size : (i + 1) * chunk_size])
+        ret += f"{hex(chunk_size)[2:]}\r\n"
+        ret += f"{data[i * chunk_size : (i + 1) * chunk_size]}\r\n\r\n"
 
     if len(data) % chunk_size != 0:
-        ret += "%s\r\n" % (hex(len(data) % chunk_size)[2:])
-        ret += "%s\r\n" % (data[-(len(data) % chunk_size) :])
+        ret += f"{hex(len(data) % chunk_size)[2:]}\r\n"
+        ret += f"{data[-(len(data) % chunk_size) :]}\r\n"
 
     ret += "0\r\n\r\n"
     return ret
@@ -202,7 +202,7 @@ def download(
         r = s.get(url, stream=True, verify=_verify, timeout=timeout, headers=request_headers)
         # check status code before attempting to read body
         if not r.ok:
-            raise Exception("Failed to download %s, response code %s" % (url, r.status_code))
+            raise Exception(f"Failed to download {url}, response code {r.status_code}")
 
         total_size = 0
         if r.headers.get("Content-Length"):

localstack/utils/net.py

@@ -164,8 +164,9 @@ def wait_for_port_status(
         status = is_port_open(port, http_path=http_path, expect_success=expect_success)
         if bool(status) != (not expect_closed):
             raise Exception(
-                "Port %s (path: %s) was not %s"
-                % (port, http_path, "closed" if expect_closed else "open")
+                "Port {} (path: {}) was not {}".format(
+                    port, http_path, "closed" if expect_closed else "open"
+                )
             )
 
     return retry(check, sleep=sleep_time, retries=retries)

localstack/utils/objects.py

@@ -163,7 +163,7 @@ def keys_to(
     skip_children_of = ensure_list(skip_children_of or [])
 
     def fix_keys(o, path="", **kwargs):
-        if any(re.match(r"(^|.*\.)%s($|[.\[].*)" % k, path) for k in skip_children_of):
+        if any(re.match(rf"(^|.*\.){k}($|[.\[].*)", path) for k in skip_children_of):
             return o
         if isinstance(o, dict):
             for k, v in dict(o).items():

localstack/utils/run.py

@@ -114,7 +114,7 @@ def run(
         return process
     except subprocess.CalledProcessError as e:
         if print_error:
-            print("ERROR: '%s': exit code %s; output: %s" % (cmd, e.returncode, e.output))
+            print(f"ERROR: '{cmd}': exit code {e.returncode}; output: {e.output}")
             sys.stdout.flush()
         raise e
 
@@ -268,7 +268,7 @@ class ShellCommandThread(FuncThread):
             if self.strip_color:
                 # strip color codes
                 line = re.sub(r"\x1b(\[.*?[@-~]|\].*?(\x07|\x1b\\))", "", line)
-            return "%s\r\n" % line.strip()
+            return f"{line.strip()}\r\n"
 
         def filter_line(line):
             """Return True if this line should be filtered, i.e., not printed"""

localstack/utils/serving.py

@@ -44,7 +44,7 @@ class Server(abc.ABC):
 
     @property
     def url(self):
-        return "%s://%s:%s" % (self.protocol, self.host, self.port)
+        return f"{self.protocol}://{self.host}:{self.port}"
 
     def get_error(self) -> Optional[Exception]:
         """

localstack/utils/strings.py

@@ -42,7 +42,7 @@ def to_bytes(obj: Union[str, bytes], encoding: str = DEFAULT_ENCODING, errors="s
 
 def truncate(data: str, max_length: int = 100) -> str:
     data = str(data or "")
-    return ("%s..." % data[:max_length]) if len(data) > max_length else data
+    return (f"{data[:max_length]}...") if len(data) > max_length else data
 
 
 def is_string(s, include_unicode=True, exclude_binary=False):
@@ -104,11 +104,11 @@ def convert_to_printable_chars(value: Union[list, dict, str]) -> str:
 
 
 def first_char_to_lower(s: str) -> str:
-    return s and "%s%s" % (s[0].lower(), s[1:])
+    return s and f"{s[0].lower()}{s[1:]}"
 
 
 def first_char_to_upper(s: str) -> str:
-    return s and "%s%s" % (s[0].upper(), s[1:])
+    return s and f"{s[0].upper()}{s[1:]}"
 
 
 def str_to_bool(value):
@@ -121,13 +121,13 @@ def str_to_bool(value):
 
 def str_insert(string, index, content):
     """Insert a substring into an existing string at a certain index."""
-    return "%s%s%s" % (string[:index], content, string[index:])
+    return f"{string[:index]}{content}{string[index:]}"
 
 
 def str_remove(string, index, end_index=None):
     """Remove a substring from an existing string at a certain from-to index range."""
     end_index = end_index or (index + 1)
-    return "%s%s" % (string[:index], string[end_index:])
+    return f"{string[:index]}{string[end_index:]}"
 
 
 def str_startswith_ignore_case(value: str, prefix: str) -> bool:

localstack/utils/testutil.py

@@ -94,7 +94,7 @@ def create_lambda_archive(
         chmod_r(script_file, 0o777)
         # copy libs
         for lib in libs:
-            paths = [lib, "%s.py" % lib]
+            paths = [lib, f"{lib}.py"]
             try:
                 module = importlib.import_module(lib)
                 paths.append(module.__file__)
@@ -382,7 +382,7 @@ def assert_object(expected_object, all_objects):
         all_objects = [all_objects]
     found = find_object(expected_object, all_objects)
     if not found:
-        raise Exception("Expected object not found: %s in list %s" % (expected_object, all_objects))
+        raise Exception(f"Expected object not found: {expected_object} in list {all_objects}")
 
 
 def find_object(expected_object, object_list):
@@ -522,8 +522,7 @@ def check_expected_lambda_log_events_length(
     events = [line for line in events if line not in ["\x1b[0m", "\\x1b[0m"]]
     if len(events) != expected_length:
         print(
-            "Invalid # of Lambda %s log events: %s / %s: %s"
-            % (
+            "Invalid # of Lambda {} log events: {} / {}: {}".format(
                 function_name,
                 len(events),
                 expected_length,

localstack/utils/time.py

@@ -52,7 +52,7 @@ def parse_timestamp(ts_str: str) -> datetime:
             return datetime.strptime(ts_str, ts_format)
         except ValueError:
             pass
-    raise Exception("Unable to parse timestamp string with any known formats: %s" % ts_str)
+    raise Exception(f"Unable to parse timestamp string with any known formats: {ts_str}")
 
 
 def now(millis: bool = False, tz: Optional[tzinfo] = None) -> int:

localstack/utils/xray/traceid.py

@@ -29,7 +29,7 @@ class TraceId:
         """
         Convert TraceId object to a string.
         """
-        return "%s%s%s%s%s" % (
+        return "{}{}{}{}{}".format(
             TraceId.VERSION,
             TraceId.DELIMITER,
             format(self.start_time, "x"),

localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.7.1.dev96'
-__version_tuple__ = version_tuple = (4, 7, 1, 'dev96')
+__version__ = version = '4.7.1.dev97'
+__version_tuple__ = version_tuple = (4, 7, 1, 'dev97')
 
 __commit_id__ = commit_id = None

{localstack_core-4.7.1.dev96.dist-info → localstack_core-4.7.1.dev97.dist-info}/METADATA

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