Light, fluffy, and always free - The AWS Local Emulator alternative
chore(rename): rewrite the Quarkus env-var form of the package (#6773)
Hector Ventura02cc40bb4003
diff --git a/tools/rename/rename_package.py b/tools/rename/rename_package.pyindex 88f4cdef33..26bb7397e2 100755--- a/tools/rename/rename_package.py+++ b/tools/rename/rename_package.py@@ -46,11 +46,17 @@ def _path_form(package: str) -> str:return package.replace(".", "/")+def _env_form(package: str) -> str:+ """How Quarkus spells a log category in an environment variable: QUARKUS_LOG_CATEGORY__IO_..."""+ return package.upper().replace(".", "_")++# Text rewrites, applied in order to every tracked text file outside EXCLUDED. The package forms# go first so the groupId rule below only ever sees what is left of the old group.REWRITES: list[tuple[str, str]] = [(OLD_PACKAGE, NEW_PACKAGE),(_path_form(OLD_PACKAGE), _path_form(NEW_PACKAGE)),+ (_env_form(OLD_PACKAGE), _env_form(NEW_PACKAGE)),# META-INF/native-image/<groupId>/<artifactId>: the artifactId stays floci.(f"native-image/{OLD_GROUP}/floci", f"native-image/{NEW_GROUP}/floci"),(f"<groupId>{OLD_GROUP}</groupId>", f"<groupId>{NEW_GROUP}</groupId>"),@@ -80,7 +86,9 @@ CATEGORY_HELP = {# Longest form first: an alternation takes the first alternative that matches at a position, so a# package reference is one hit, never also a group hit.OCCURRENCE = re.compile(- "|".join(re.escape(form) for form in (OLD_PACKAGE, _path_form(OLD_PACKAGE), OLD_GROUP, _path_form(OLD_GROUP))))+ "|".join(re.escape(form) for form in (+ OLD_PACKAGE, _path_form(OLD_PACKAGE), _env_form(OLD_PACKAGE),+ OLD_GROUP, _path_form(OLD_GROUP), _env_form(OLD_GROUP))))@dataclass(frozen=True)diff --git a/tools/rename/test_rename_package.py b/tools/rename/test_rename_package.pyindex d877e7836a..3e5a7cbd7f 100644--- a/tools/rename/test_rename_package.py+++ b/tools/rename/test_rename_package.py@@ -78,6 +78,14 @@ def test_non_java_files_count_rewritten_forms_and_flag_the_rest():assert Counter(h.category for h in r.classify_other("README.md", readme)) == Counter({"other": 2})+def test_quarkus_env_var_form_is_rewritten_and_its_group_alone_is_flagged():+ docs = (+ "QUARKUS_LOG_CATEGORY__IO_GITHUB_HECTORVENT_FLOCI_SERVICES_SQS__LEVEL=TRACE\n"+ "QUARKUS_LOG_CATEGORY__IO_GITHUB_HECTORVENT_OTHER__LEVEL=TRACE\n"+ )+ assert [(h.line, h.category) for h in r.classify_other("docs/a.md", docs)] == [(1, "non-java"), (2, "other")]++def test_old_group_alone_in_java_is_other():assert categories('String g = "io.github.hectorvent";\n') == Counter({"other": 1})@@ -120,6 +128,7 @@ FIXTURE = {f"<x>{OLD}.arn.fail-on-blank-region</x></project>\n"),"tools/docs/services.yaml": f"path: src/main/java/{OLD_PATH}/services/sqs/SqsService.java\n",+ "docs/logging.md": "QUARKUS_LOG_CATEGORY__IO_GITHUB_HECTORVENT_FLOCI_SERVICES_SQS__LEVEL=TRACE\n","CHANGELOG.md": f"- moved {OLD}\n","tools/rename/notes.txt": f"the old package is {OLD}\n","src/main/java/com/floci/test/Untouched.java": "package com.floci.test;\n",@@ -146,7 +155,7 @@ def repo(tmp_path: Path) -> Path:def test_report_counts_the_fixture(repo: Path, capsys):hits = r.scan(repo)assert Counter(hit.category for hit in hits) == Counter(- {"package": 4, "import": 1, "code": 1, "string": 2, "comment": 1, "non-java": 5})+ {"package": 4, "import": 1, "code": 1, "string": 2, "comment": 1, "non-java": 6})assert all(not hit.path.startswith(("CHANGELOG.md", "tools/rename/")) for hit in hits)r.main(["--root", str(repo), "report", "--files", "3"])out = capsys.readouterr().out@@ -167,7 +176,7 @@ def test_moves_only_renames_without_touching_content(repo: Path):def test_full_apply_leaves_only_the_excluded_files(repo: Path):r.main(["--root", str(repo), "apply"])assert r.scan(repo) == []- leftovers = git(repo, "grep", "-l", "-e", "io.github.hectorvent", "-e", "io/github/hectorvent").split()+ leftovers = git(repo, "grep", "-il", "-e", "io.github.hectorvent", "-e", "io/github/hectorvent").split()assert sorted(leftovers) == ["CHANGELOG.md", "tools/rename/notes.txt"]service = (repo / "src/main/java/io/floci/aws/services/sqs/SqsService.java").read_text()assert service.startswith("package io.floci.aws.services.sqs;\n\nimport io.floci.aws.core.common.AwsException;")@@ -175,6 +184,7 @@ def test_full_apply_leaves_only_the_excluded_files(repo: Path):assert "<groupId>io.floci</groupId><artifactId>floci</artifactId>" in (repo / "pom.xml").read_text()assert "io.floci.aws.arn.fail-on-blank-region" in (repo / "pom.xml").read_text()assert "src/main/java/io/floci/aws/services/sqs" in (repo / "tools/docs/services.yaml").read_text()+ assert (repo / "docs/logging.md").read_text() == "QUARKUS_LOG_CATEGORY__IO_FLOCI_AWS_SERVICES_SQS__LEVEL=TRACE\n"assert (repo / "src/main/java/com/floci/test/Untouched.java").read_text() == "package com.floci.test;\n"