Merge branch 'main' into fix-dashboard-parallelism

Author: diegomarquezp

.github/workflows/codegen.yaml

@@ -10,7 +10,7 @@ jobs:
     # As of November 2023, it returns 269 service names.
     uses: googleapis/discovery-artifact-manager/.github/workflows/list-services.yml@master
   total_service_size_check:
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-24.04'
     needs: discovery
     steps:
       - uses: actions/github-script@v5
@@ -24,7 +24,7 @@ jobs:
               throw new Error(`Total services (${services.length}) exceed limit of ${MAX_SERVICE_SIZE}`)
             }
   batch:
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-24.04'
     needs: discovery
     outputs:
       # As of November 2023, the output of batch job is a 3-element array, which contains a chunk of 100 service names

.github/workflows/generate.yaml

@@ -15,7 +15,7 @@ on:
 name: generate
 jobs:
   generate_one:
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-24.04'
     strategy:
       fail-fast: false
       max-parallel: 4

.github/workflows/requirements.in

@@ -2,3 +2,4 @@ absl-py==2.1.0
 gitdb==4.0.11
 GitPython==3.1.43
 smmap==5.0.1
+lxml==5.3.1

.github/workflows/requirements.txt

@@ -1,26 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
-#
-#    pip-compile --generate-hashes
-#
-absl-py==2.1.0 \
-    --hash=sha256:526a04eadab8b4ee719ce68f204172ead1027549089702d99b9059f129ff1308 \
-    --hash=sha256:7820790efbb316739cde8b4e19357243fc3608a152024288513dd968d7d959ff
-    # via -r requirements.in
-gitdb==4.0.11 \
-    --hash=sha256:81a3407ddd2ee8df444cbacea00e2d038e40150acfa3001696fe0dcf1d3adfa4 \
-    --hash=sha256:bf5421126136d6d0af55bc1e7c1af1c397a34f5b7bd79e776cd3e89785c2b04b
-    # via
-    #   -r requirements.in
-    #   gitpython
-gitpython==3.1.43 \
-    --hash=sha256:35f314a9f878467f5453cc1fee295c3e18e52f1b99f10f6cf5b1682e968a9e7c \
-    --hash=sha256:eec7ec56b92aad751f9912a73404bc02ba212a23adb2c7098ee668417051a1ff
-    # via -r requirements.in
-smmap==5.0.1 \
-    --hash=sha256:dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62 \
-    --hash=sha256:e6d8668fa5f93e706934a62d7b4db19c8d9eb8cf2adbb75ef1b675aa332b69da
-    # via
-    #   -r requirements.in
-    #   gitdb

.github/workflows/update-root-readme.py

@@ -24,13 +24,15 @@
 import json
 from git import Repo
 import shutil
+from lxml import etree
 
 
 # global vars
 VERSION_REGEX = r"([^\.]*)\.(.+)\.json$"
 SCRIPT_DIR = Path(path.dirname(path.realpath(__file__)))
 REPO_DIR = Path(str(SCRIPT_DIR / '..' / '..'))
 DISCOVERY_REPO_PATH = Path(path.abspath(path.join(getcwd(), './discovery-artifact-manager')))
+LATEST_VERSION = '2.0.0'
 _discovery_repo = None
 
 
@@ -134,6 +136,31 @@ def all_services():
 
     return services
 
+def maven_metadata(pom_file: str):
+    if not path.isfile(pom_file):
+        print(f'skipping {pom_file} because it doesn\'t exist')
+        return None
+    tree = etree.parse(pom_file)
+    root = tree.getroot()
+    version = root.find("{http://maven.apache.org/POM/4.0.0}version").text
+    group_id = root.find("{http://maven.apache.org/POM/4.0.0}groupId").text
+    artifact_id = root.find("{http://maven.apache.org/POM/4.0.0}artifactId").text
+    return {"groupId": group_id, "artifactId": artifact_id, "version": version}
+
+def write_metadata_file(name: str, version: str, metadata: dict):
+    metadata_file = path.join(REPO_DIR, "clients", name, f'{version}.metadata.json')
+    print(f"Writing json metadata to {metadata_file}")
+    metadata = {"maven": metadata}
+    with open(metadata_file, "w+") as outfile:
+        json.dump(metadata, outfile, indent=2)
+
+def generate_metadata_file(service: list[Service]):
+    library_name = f'google-api-services-{service.id}'
+    metadata = maven_metadata(
+        path.join(REPO_DIR, "clients", library_name, service.version, LATEST_VERSION, "pom.xml")
+    )
+    if metadata is not None:
+        write_metadata_file(library_name, service.version, metadata)
 
 def main(argv: List[str]) -> None:
     if len(argv) > 1:
@@ -142,6 +169,8 @@ def main(argv: List[str]) -> None:
     clone_discovery_repo()
     services = all_services()
     generate_service_list(services)
+    for service in services:
+        generate_metadata_file(service)
     remove_discovery_repo()
 
 

.github/workflows/update-root-readme.yaml

@@ -7,7 +7,7 @@ on:
 name: update root README.md
 jobs:
   update:
-    runs-on: ubuntu-20.04
+    runs-on: 'ubuntu-24.04'
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/verify.yaml

@@ -10,7 +10,7 @@ on:
 name: Verify libraries compilation
 jobs:
   verify:
-    runs-on: ubuntu-24.04
+    runs-on: 'ubuntu-24.04'
     strategy:
       matrix:
         variant: [ 1.26.0, 1.27.0, 1.28.0, 1.29.2, 1.30.1, 1.31.0, 2.0.0 ]

clients/google-api-services-abusiveexperiencereport/v1.metadata.json

@@ -2,6 +2,6 @@
   "maven": {
     "groupId": "com.google.apis",
     "artifactId": "google-api-services-abusiveexperiencereport",
-    "version": "v1-rev20200803-1.32.1"
+    "version": "v1-rev20200803-2.0.0"
   }
 }

clients/google-api-services-acceleratedmobilepageurl/v1.metadata.json

@@ -2,6 +2,6 @@
   "maven": {
     "groupId": "com.google.apis",
     "artifactId": "google-api-services-acceleratedmobilepageurl",
-    "version": "v1-rev20200916-1.32.1"
+    "version": "v1-rev20230701-2.0.0"
   }
 }

clients/google-api-services-accessapproval/v1.metadata.json

@@ -2,6 +2,6 @@
   "maven": {
     "groupId": "com.google.apis",
     "artifactId": "google-api-services-accessapproval",
-    "version": "v1-rev20211130-1.32.1"
+    "version": "v1-rev20250206-2.0.0"
   }
 }