Skip to content

Commit cac7241

Browse files
committed
Merge branch 'main' into PR #2227 to update
2 parents 67a730d + 1f66dca commit cac7241

File tree

6 files changed

+27
-2299
lines changed

6 files changed

+27
-2299
lines changed

.repo-metadata.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
"codeowner_team": "@googleapis/api-firestore @googleapis/firestore-dpe",
1717
"excluded_poms": "google-cloud-firestore,google-cloud-firestore-bom",
1818
"issue_tracker": "https://issuetracker.google.com/savedsearches/5337669",
19-
"recommended_package": "com.google.cloud.firestore"
20-
}
19+
"recommended_package": "com.google.cloud.firestore",
20+
"library_path_overrides": {
21+
"FirestoreAdminClient": "google-cloud-firestore-admin"
22+
}
23+
}

owlbot.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
"""This script is used to synthesize generated parts of this library."""
1616

17+
import json
1718
import synthtool as s
1819
import synthtool.gcp as gcp
1920
import synthtool.languages.java as java
@@ -97,3 +98,24 @@
9798
'.github/workflows/samples.yaml',
9899
'renovate.json'
99100
])
101+
102+
# Fix for b/442875200: Inject library_path_overrides for FirestoreAdminClient
103+
# This ensures the doclet links to the correct source directory (google-cloud-firestore-admin)
104+
# instead of the default artifactId (google-cloud-firestore).
105+
metadata_path = ".repo-metadata.json"
106+
try:
107+
with open(metadata_path, "r") as f:
108+
metadata = json.load(f)
109+
110+
# Add the override map if it doesn't exist or update it
111+
if "library_path_overrides" not in metadata:
112+
metadata["library_path_overrides"] = {}
113+
114+
metadata["library_path_overrides"]["FirestoreAdminClient"] = "google-cloud-firestore-admin"
115+
116+
# Write the updated metadata back to the file
117+
with open(metadata_path, "w") as f:
118+
json.dump(metadata, f, indent=2)
119+
f.write("\n")
120+
except Exception as e:
121+
print(f"Failed to update .repo-metadata.json: {e}")

tools/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)