feat: add support to release handwritten clients

Author: ohmayr

.generator/cli.py

@@ -1109,7 +1109,9 @@ def _process_version_file(content, version, version_path) -> str:
 
     Returns: A string with the modified content.
     """
-    if version_path.name.endswith("gapic_version.py"):
+    if version_path.name.endswith("gapic_version.py") or version_path.name.endswith(
+        "version.py"
+    ):
         pattern = r"(__version__\s*=\s*[\"'])([^\"']+)([\"'].*)"
     else:
         pattern = r"(version\s*=\s*[\"'])([^\"']+)([\"'].*)"
@@ -1125,7 +1127,7 @@ def _process_version_file(content, version, version_path) -> str:
 def _update_version_for_library(
     repo: str, output: str, path_to_library: str, version: str
 ):
-    """Updates the version string in `**/gapic_version.py`, `setup.py`,
+    """Updates the version string in `**/gapic_version.py`, `**/version.py`, `setup.py`,
         `pyproject.toml` and `samples/**/snippet_metadata.json` for a
         given library, if applicable.
 
@@ -1139,12 +1141,15 @@ def _update_version_for_library(
         version(str): The new version of the library
 
     Raises: `ValueError` if a version string could not be located in `**/gapic_version.py`
-        within the given library.
+        or `**/version.py` within the given library.
     """
 
-    # Find and update gapic_version.py files
-    version_files = list(Path(f"{repo}/{path_to_library}").rglob("**/gapic_version.py"))
-    if len(version_files) == 0:
+    # Find and update version.py or gapic_version.py files
+    search_base = Path(f"{repo}/{path_to_library}")
+    version_files = list(search_base.rglob("**/gapic_version.py"))
+    version_files.extend(list(search_base.glob("google/**/version.py")))
+
+    if not version_files:
         # Fallback to `pyproject.toml`` or `setup.py``. Proto-only libraries have
         # version information in `setup.py` or `pyproject.toml` instead of `gapic_version.py`.
         pyproject_toml = Path(f"{repo}/{path_to_library}/pyproject.toml")
@@ -1160,7 +1165,7 @@ def _update_version_for_library(
 
     # Find and update snippet_metadata.json files
     snippet_metadata_files = Path(f"{repo}/{path_to_library}").rglob(
-        "samples/**/*.json"
+        "samples/**/*snippet*.json"
     )
     for metadata_file in snippet_metadata_files:
         output_path = f"{output}/{metadata_file.relative_to(repo)}"
@@ -1300,6 +1305,7 @@ def _update_changelog_for_library(
     version: str,
     previous_version: str,
     library_id: str,
+    relative_path: str,
 ):
     """Prepends a new release entry with multiple, grouped changes, to a changelog.
 
@@ -1316,8 +1322,6 @@ def _update_changelog_for_library(
         library_id(str): The id of the library where the changelog should
             be updated.
     """
-
-    relative_path = f"packages/{library_id}/CHANGELOG.md"
     changelog_src = f"{repo}/{relative_path}"
     changelog_dest = f"{output}/{relative_path}"
     updated_content = _process_changelog(
@@ -1357,27 +1361,28 @@ def handle_release_init(
             `release-init-request.json` file in the given
             librarian directory cannot be read.
     """
-
     try:
+        is_generated = Path(f"{repo}/packages").exists()
+
         # Read a release-init-request.json file
         request_data = _read_json_file(f"{librarian}/{RELEASE_INIT_REQUEST_FILE}")
         libraries_to_prep_for_release = _get_libraries_to_prepare_for_release(
             request_data
         )
 
-        _update_global_changelog(
-            f"{repo}/CHANGELOG.md",
-            f"{output}/CHANGELOG.md",
-            libraries_to_prep_for_release,
-        )
+        if is_generated:
+            _update_global_changelog(
+                f"{repo}/CHANGELOG.md",
+                f"{output}/CHANGELOG.md",
+                libraries_to_prep_for_release,
+            )
 
         # Prepare the release for each library by updating the
         # library specific version files and library specific changelog.
         for library_release_data in libraries_to_prep_for_release:
             version = library_release_data["version"]
             library_id = library_release_data["id"]
             library_changes = library_release_data["changes"]
-            path_to_library = f"packages/{library_id}"
 
             # Get previous version from state.yaml
             previous_version = _get_previous_version(library_id, librarian)
@@ -1387,6 +1392,13 @@ def handle_release_init(
                     f"{library_id} version: {previous_version}\n"
                 )
 
+            if is_generated:
+                path_to_library = f"packages/{library_id}"
+                changelog_relative_path = f"packages/{library_id}/CHANGELOG.md"
+            else:
+                path_to_library = "."
+                changelog_relative_path = "CHANGELOG.md"
+
             _update_version_for_library(repo, output, path_to_library, version)
             _update_changelog_for_library(
                 repo,
@@ -1395,6 +1407,7 @@ def handle_release_init(
                 version,
                 previous_version,
                 library_id,
+                relative_path=changelog_relative_path,
             )
 
     except Exception as e:

.generator/test_cli.py

@@ -1108,6 +1108,7 @@ def test_update_changelog_for_library_success(mocker):
             "1.2.3",
             "1.2.2",
             "google-cloud-language",
+            "CHANGELOG.md",
         )
 
 
@@ -1157,6 +1158,7 @@ def test_update_changelog_for_library_failure(mocker):
                 "1.2.3",
                 "1.2.2",
                 "google-cloud-language",
+                "CHANGELOG.md",
             )