formatted

Author: suztomo

hermetic_build/library_generation/owlbot/src/fix_poms.py

@@ -619,10 +619,12 @@ def main(versions_file, monorepo):
         if dependency_module not in versions_txt_modules:
             # These should already be in existing_modules if loaded from versions.txt
             if dependency_module in existing_modules:
-                 versions_txt_modules[dependency_module] = existing_modules[dependency_module]
+                versions_txt_modules[dependency_module] = existing_modules[
+                    dependency_module
+                ]
             # This else block should ideally not be reached in the monorepo case.
             else:
-                 versions_txt_modules[dependency_module] = module.Module(
+                versions_txt_modules[dependency_module] = module.Module(
                     group_id=__proto_group_id(group_id),
                     artifact_id=dependency_module,
                     version=main_module.version,

hermetic_build/library_generation/tests/owlbot/fix_poms_unit_tests.py

@@ -32,7 +32,6 @@ def setUp(self):
     def tearDown(self):
         os.chdir(self.start_dir)
 
-
     def test_update_poms_group_id_does_not_start_with_google_correctly(self):
         ad_manager_resource = os.path.join(resources_dir, "java-admanager")
         versions_file = os.path.join(ad_manager_resource, "versions.txt")
@@ -46,7 +45,6 @@ def test_update_poms_group_id_does_not_start_with_google_correctly(self):
         for sub_dir in sub_dirs:
             self.__remove_file_in_subdir(ad_manager_resource, sub_dir)
 
-
     def test_add_new_library(self):
         # Setup test environment in a structure similar to a real repo
         repo_dir = os.path.join(self.temp_dir, "google-cloud-java")
@@ -56,13 +54,17 @@ def test_add_new_library(self):
         new_library_path = os.path.join(repo_dir, new_library_dir_name)
 
         # Copy test resources to the temporary directory
-        shutil.copytree(os.path.join(source_resource_dir, "java-newapi"), new_library_path)
+        shutil.copytree(
+            os.path.join(source_resource_dir, "java-newapi"), new_library_path
+        )
 
         # Modify the .repo-metadata.json in the temporary new library folder
         repo_metadata_path = os.path.join(new_library_path, ".repo-metadata.json")
         with open(repo_metadata_path, "r") as f:
             repo_metadata_content = f.read()
-        repo_metadata_content = repo_metadata_content.replace("google-cloud-newfolder", "google-cloud-newapi")
+        repo_metadata_content = repo_metadata_content.replace(
+            "google-cloud-newfolder", "google-cloud-newapi"
+        )
         with open(repo_metadata_path, "w") as f:
             f.write(repo_metadata_content)
 
@@ -78,7 +80,11 @@ def test_add_new_library(self):
 
         # Get initial state of versions.txt (excluding comments and empty lines)
         with open(dest_versions_file, "r") as f:
-            initial_active_lines = [line.strip() for line in f if line.strip() and not line.strip().startswith("#")]
+            initial_active_lines = [
+                line.strip()
+                for line in f
+                if line.strip() and not line.strip().startswith("#")
+            ]
 
         # Execute the main function from fix_poms.py
         main(dest_versions_file, "true")
@@ -87,20 +93,36 @@ def test_add_new_library(self):
         with open(dest_versions_file, "r") as f:
             updated_versions_content = f.readlines()
 
-        updated_active_lines = [line.strip() for line in updated_versions_content if line.strip() and not line.strip().startswith("#")]
+        updated_active_lines = [
+            line.strip()
+            for line in updated_versions_content
+            if line.strip() and not line.strip().startswith("#")
+        ]
 
-        self.assertEqual(len(initial_active_lines) + 1, len(updated_active_lines),
-                         "A single line should have been added to versions.txt")
+        self.assertEqual(
+            len(initial_active_lines) + 1,
+            len(updated_active_lines),
+            "A single line should have been added to versions.txt",
+        )
 
         expected_new_line = "newapi:0.0.0:0.0.1-SNAPSHOT"
-        self.assertTrue(any(expected_new_line in line for line in updated_active_lines),
-                      f"The new line '{expected_new_line}' was not found in versions.txt")
+        self.assertTrue(
+            any(expected_new_line in line for line in updated_active_lines),
+            f"The new line '{expected_new_line}' was not found in versions.txt",
+        )
 
-        filtered_updated_lines = [line for line in updated_active_lines if expected_new_line not in line]
-        self.assertCountEqual(initial_active_lines, filtered_updated_lines,
-                              "Existing lines in versions.txt should be unaffected.")
-        self.assertFalse(any("google-cloud-newapi" in line for line in updated_versions_content),
-                         "The artifactId 'google-cloud-newapi' should not be in versions.txt")
+        filtered_updated_lines = [
+            line for line in updated_active_lines if expected_new_line not in line
+        ]
+        self.assertCountEqual(
+            initial_active_lines,
+            filtered_updated_lines,
+            "Existing lines in versions.txt should be unaffected.",
+        )
+        self.assertFalse(
+            any("google-cloud-newapi" in line for line in updated_versions_content),
+            "The artifactId 'google-cloud-newapi' should not be in versions.txt",
+        )
 
         # --- Verify generated pom.xml files ---
         expected_poms = [
@@ -112,17 +134,26 @@ def test_add_new_library(self):
         ]
         for pom_path in expected_poms:
             full_pom_path = os.path.join(new_library_path, pom_path)
-            self.assertTrue(os.path.exists(full_pom_path), f"Expected POM file not found: {full_pom_path}")
+            self.assertTrue(
+                os.path.exists(full_pom_path),
+                f"Expected POM file not found: {full_pom_path}",
+            )
             with open(full_pom_path, "r") as f:
                 pom_content = f.read()
-            self.assertIn("<!-- {x-version-update:newapi:current} -->", pom_content,
-                          f"x-version-update tag in {pom_path} does not reference 'newapi'")
+            self.assertIn(
+                "<!-- {x-version-update:newapi:current} -->",
+                pom_content,
+                f"x-version-update tag in {pom_path} does not reference 'newapi'",
+            )
             # Ensure the artifactId is not changed to the release_please_key
             if pom_path == "google-cloud-newapi/pom.xml":
-                self.assertIn("<artifactId>google-cloud-newapi</artifactId>", pom_content)
+                self.assertIn(
+                    "<artifactId>google-cloud-newapi</artifactId>", pom_content
+                )
             if pom_path == "proto-google-cloud-newapi-v1/pom.xml":
-                self.assertIn("<artifactId>proto-google-cloud-newapi-v1</artifactId>", pom_content)
-
+                self.assertIn(
+                    "<artifactId>proto-google-cloud-newapi-v1</artifactId>", pom_content
+                )
 
     @classmethod
     def __copy__golden(cls, base_dir: str, subdir: str):