Merge branch 'main' into onboard-google-cloud-gke-hub

Author: parthea

.generator/cli.py

@@ -228,6 +228,7 @@ def handle_configure(
     source: str = SOURCE_DIR,
     repo: str = REPO_DIR,
     input: str = INPUT_DIR,
+    output: str = OUTPUT_DIR
 ):
     """Onboards a new library by completing its configuration.
 
@@ -248,6 +249,8 @@ def handle_configure(
             the config.yaml.
         input(str): The path to the directory in the container
             which contains additional generator input.
+        output(str): Path to the directory in the container where code
+            should be generated.
 
     Raises:
         ValueError: If configuring a new library fails.
@@ -256,6 +259,12 @@ def handle_configure(
         # configure-request.json contains the library definitions.
         request_data = _read_json_file(f"{librarian}/{CONFIGURE_REQUEST_FILE}")
         new_library_config = _get_new_library_config(request_data)
+        
+        _update_global_changelog(
+            f"{repo}/CHANGELOG.md",
+            f"{output}/CHANGELOG.md",
+            [new_library_config],
+        )
         prepared_config = _prepare_new_library_config(new_library_config)
 
         # Write the new library configuration to configure-response.json.
@@ -1207,7 +1216,7 @@ def _process_changelog(
 
     # Group changes by type (e.g., feat, fix, docs)
     type_key = "type"
-    source_commit_hash_key = "source_commit_hash"
+    commit_hash_key = "commit_hash"
     subject_key = "subject"
     body_key = "body"
     library_changes.sort(key=lambda x: x[type_key])
@@ -1224,7 +1233,7 @@ def _process_changelog(
         if adjusted_change_type in change_type_map:
             entry_parts.append(f"\n\n### {change_type_map[adjusted_change_type]}\n")
             for change in library_changes:
-                commit_link = f"([{change[source_commit_hash_key]}]({_REPO_URL}/commit/{change[source_commit_hash_key]}))"
+                commit_link = f"([{change[commit_hash_key]}]({_REPO_URL}/commit/{change[commit_hash_key]}))"
                 entry_parts.append(
                     f"* {change[subject_key]} {change[body_key]} {commit_link}"
                 )
@@ -1418,6 +1427,7 @@ def handle_release_init(
             source=args.source,
             repo=args.repo,
             input=args.input,
+            output=args.output,
         )
     elif args.command == "generate":
         args.func(

.generator/test_cli.py

@@ -83,28 +83,28 @@
         "subject": "add new UpdateRepository API",
         "body": "This adds the ability to update a repository's properties.",
         "piper_cl_number": "786353207",
-        "source_commit_hash": "9461532e7d19c8d71709ec3b502e5d81340fb661",
+        "commit_hash": "9461532e7d19c8d71709ec3b502e5d81340fb661",
     },
     {
         "type": "fix",
         "subject": "some fix",
         "body": "some body",
         "piper_cl_number": "786353208",
-        "source_commit_hash": "1231532e7d19c8d71709ec3b502e5d81340fb661",
+        "commit_hash": "1231532e7d19c8d71709ec3b502e5d81340fb661",
     },
     {
         "type": "fix",
         "subject": "another fix",
         "body": "",
         "piper_cl_number": "786353209",
-        "source_commit_hash": "1241532e7d19c8d71709ec3b502e5d81340fb661",
+        "commit_hash": "1241532e7d19c8d71709ec3b502e5d81340fb661",
     },
     {
         "type": "docs",
         "subject": "fix typo in BranchRule comment",
         "body": "",
         "piper_cl_number": "786353210",
-        "source_commit_hash": "9461532e7d19c8d71709ec3b502e5d81340fb661",
+        "commit_hash": "9461532e7d19c8d71709ec3b502e5d81340fb661",
     },
 ]
 
@@ -287,6 +287,7 @@ def mock_state_file(tmp_path, monkeypatch):
 
 def test_handle_configure_success(mock_configure_request_file, mocker):
     """Tests the successful execution path of handle_configure."""
+    mocker.patch("cli._update_global_changelog", return_value=None)
     mock_write_json = mocker.patch("cli._write_json_file")
     mock_prepare_config = mocker.patch(
         "cli._prepare_new_library_config", return_value={"id": "prepared"}

.librarian/generator-input/client-post-processing/remove-erroneous-client.yaml

@@ -112,7 +112,7 @@ libraries:
     last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1
     apis:
       - path: google/apps/card/v1
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-apps-card
     preserve_regex:
@@ -271,7 +271,7 @@ libraries:
       - path: google/identity/accesscontextmanager/v1
         service_config: accesscontextmanager_v1.yaml
       - path: google/identity/accesscontextmanager/type
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-cloud-access-context-manager
     preserve_regex: []
@@ -463,7 +463,7 @@ libraries:
     last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1
     apis:
       - path: google/appengine/logging/v1
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-cloud-appengine-logging
     preserve_regex:
@@ -883,7 +883,7 @@ libraries:
     last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1
     apis:
       - path: google/cloud/bigquery/logging/v1
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-cloud-bigquery-logging
     preserve_regex:
@@ -2013,7 +2013,7 @@ libraries:
     last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1
     apis:
       - path: google/iam/v1/logging
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-cloud-iam-logging
     preserve_regex:
@@ -3228,7 +3228,7 @@ libraries:
     last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1
     apis:
       - path: google/devtools/source/v1
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-cloud-source-context
     preserve_regex:
@@ -4312,7 +4312,7 @@ libraries:
     last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1
     apis:
       - path: google/shopping/type
-        service_config: ""
+        service_config: ''
     source_roots:
       - packages/google-shopping-type
     preserve_regex:
@@ -4336,11 +4336,11 @@ libraries:
       - path: google/cloud/location
         service_config: cloud.yaml
       - path: google/logging/type
-        service_config: ""
+        service_config: ''
       - path: google/rpc
         service_config: rpc_publish.yaml
       - path: google/rpc/context
-        service_config: ""
+        service_config: ''
       - path: google/type
         service_config: type.yaml
     source_roots:
@@ -4390,6 +4390,26 @@ libraries:
     remove_regex:
       - packages/google-cloud-gke-hub
     tag_format: '{id}-v{version}'
+- id: google-cloud-monitoring-dashboards
+    version: 2.19.0
+    last_generated_commit: d300b151a973ce0425ae4ad07b3de957ca31bec6
+    apis:
+      - path: google/monitoring/dashboard/v1
+    source_roots:
+      - packages/google-cloud-monitoring-dashboards
+    preserve_regex:
+      - packages/google-cloud-monitoring-dashboards/CHANGELOG.md
+      - docs/CHANGELOG.md
+      - docs/README.rst
+      - samples/README.txt
+      - scripts/client-post-processing
+      - samples/snippets/README.rst
+      - tests/system
+      - packages/google-cloud-monitoring-dashboards/google/monitoring
+      - tests/unit/gapic/dashboard_v1
+    remove_regex:
+      - packages/google-cloud-monitoring-dashboards
+    tag_format: '{id}-v{version}'    
   - id: google-cloud-gke-multicloud
     version: 0.6.22
     last_generated_commit: d300b151a973ce0425ae4ad07b3de957ca31bec6

.librarian/state.yaml

@@ -2,7 +2,6 @@
     "packages/google-cloud-bigquery-storage": "2.33.1",
     "packages/google-cloud-dialogflow-cx": "2.0.0",
     "packages/google-cloud-gke-hub": "1.19.0",
-    "packages/google-cloud-iam": "2.20.0",
     "packages/google-cloud-monitoring-dashboards": "2.19.0",
     "packages/google-cloud-org-policy": "1.14.0",
     "packages/grpc-google-iam-v1": "0.14.3"

.release-please-manifest.json

@@ -61,7 +61,7 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7
+Python >= 3.7, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches

packages/google-ads-admanager/README.rst

@@ -61,7 +61,7 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7
+Python >= 3.7, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches

packages/google-ads-marketingplatform-admin/README.rst

@@ -61,7 +61,7 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7
+Python >= 3.7, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches

packages/google-ai-generativelanguage/README.rst

@@ -61,7 +61,7 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7
+Python >= 3.7, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches

packages/google-analytics-admin/README.rst

@@ -61,7 +61,7 @@ Supported Python Versions
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
 Python.
 
-Python >= 3.7
+Python >= 3.7, including 3.14
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches