fix(build): support generating unversioned libraries in OwlBot config#13336
Merged
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces support for proto paths without versioning in the library generation process. It determines if a version is present in the proto path and passes a has_version flag to the postprocessing prerequisite file generation, which is then used in the owlbot.yaml.monorepo.j2 template to conditionally generate copy rules. The review feedback recommends consistently using the directly imported remove_version_from function in generate_composed_library.py instead of mixing it with util.remove_version_from to maintain consistency and adhere to PEP 8 guidelines.
Comment on lines
+76
to
84
| has_version = remove_version_from(gapic.proto_path) != gapic.proto_path | ||
| util.generate_postprocessing_prerequisite_files( | ||
| config=config, | ||
| library=library, | ||
| proto_path=util.remove_version_from(gapic.proto_path), | ||
| library_path=library_path, | ||
| transport=library.get_transport(gapic_inputs), | ||
| has_version=has_version, | ||
| ) |
Contributor
There was a problem hiding this comment.
To maintain consistency and adhere to PEP 8 guidelines regarding clean imports and usage, we should use the imported remove_version_from function consistently instead of mixing direct calls with util.remove_version_from on line 80.
Suggested change
| has_version = remove_version_from(gapic.proto_path) != gapic.proto_path | |
| util.generate_postprocessing_prerequisite_files( | |
| config=config, | |
| library=library, | |
| proto_path=util.remove_version_from(gapic.proto_path), | |
| library_path=library_path, | |
| transport=library.get_transport(gapic_inputs), | |
| has_version=has_version, | |
| ) | |
| has_version = remove_version_from(gapic.proto_path) != gapic.proto_path | |
| util.generate_postprocessing_prerequisite_files( | |
| config=config, | |
| library=library, | |
| proto_path=remove_version_from(gapic.proto_path), | |
| library_path=library_path, | |
| transport=library.get_transport(gapic_inputs), | |
| has_version=has_version, | |
| ) |
References
- PEP 8 recommends consistent import usage and avoiding redundant/mixed access patterns for the same imported module/function. (link)
|
|
Contributor
Author
|
FYI @zhumin8, we have to change the owlbot template but I know we are moving away from it. |
zhumin8
approved these changes
Jun 2, 2026
Contributor
zhumin8
left a comment
zhumin8
left a comment
There was a problem hiding this comment.
LGTM.
Thanks for the note, librarian already supports non-versioned paths from existing libraries.
diegomarquezp
approved these changes
Jun 2, 2026
This was referenced Jun 3, 2026
blakeli0
added a commit
that referenced
this pull request
Jun 3, 2026
🤖 I have created a release *beep* *boop* --- <details><summary>1.87.0</summary> ## [1.87.0](v1.86.0...v1.87.0) (2026-06-03) ### ⚠ BREAKING CHANGES * [container] remove image_family from * [saasservicemgmt] Changed field behavior for an existing field ### Features * [admanager] added new API dimension: ([39e93fe](39e93fe)) * [aiplatform] Release ([39e93fe](39e93fe)) * [aiplatform] Release ([39e93fe](39e93fe)) * [asset] add authentication scope for Policy Analyzer MCP tool ([9c90001](9c90001)) * [backstory] new module for backstory ([#13334](#13334)) ([fd8f666](fd8f666)) * [bigquerymigration] add support for assessment tasks in BigQuery ([9c90001](9c90001)) * [chat] Support force notify and silent notification option for ([39e93fe](39e93fe)) * [cloudsupport] v2 version for `GetComment` and `GetAttachment` ([39e93fe](39e93fe)) * [compute] Update Compute Engine v1 API to revision 20260422 ([9c90001](9c90001)) * [container] add confidential instance type and hyperdisk support ([39e93fe](39e93fe)) * [container] add confidential instance type and hyperdisk support ([39e93fe](39e93fe)) * [container] add custom node image configuration ([9c90001](9c90001)) * [databasecenter] add a AggregateQueryStats API ([9c90001](9c90001)) * [datalineage] A new method SearchLineageStreaming is added ([39e93fe](39e93fe)) * [datamanager] add encrypted_user_id.proto and the EncryptedUserId ([9c90001](9c90001)) * [datamanager] add the coupon_codes field to CartData to track ([9c90001](9c90001)) * [dataproc] add support for Cloud Resource Manager tags for ([39e93fe](39e93fe)) * [developerknowledge] new module for developerknowledge ([#13313](#13313)) ([502841b](502841b)) * [dlp] Supporting Conversation Content Type ([9c90001](9c90001)) * [health] Introduce Data Subscription Service for managing webhook ([9c90001](9c90001)) * [health] introduce MedicalDeviceInfo message for Software as ([9c90001](9c90001)) * [maps-places] add transit_station data to Places API (New) ([9c90001](9c90001)) * [network-management] add fields and messages for Cloud Run jobs ([9c90001](9c90001)) * [network-security] add networksecurity v1 client library ([9c90001](9c90001)) * [policy-troubleshooter] add authentication scope for ([9c90001](9c90001)) * [recommender] Support utilization insights and cloud hub ([9c90001](9c90001)) * [security-private-ca] add ([9c90001](9c90001)) * [storage] add support for GCS Storage Control Intelligence Finding ([9c90001](9c90001)) * add duration to health metrics ([#13181](#13181)) ([ae86384](ae86384)) * add periodic WARNING metrics to assist in debugging ([#12976](#12976)) ([c9e2e6d](c9e2e6d)) * add v1 version support for geminidataanalytics ([#13314](#13314)) ([946dfb4](946dfb4)) * **bigquery-jdbc:** implement JDBC getObject type coercion support ([#13257](#13257)) ([72d4ab6](72d4ab6)) * **bqjdbc:** Add custom logger to handle ResultSet logs ([#13034](#13034)) ([887c67f](887c67f)) * **bqjdbc:** implement Per connection logging with Context proxy ([#13001](#13001)) ([293f18f](293f18f)) * **dataplex:** Add `RequestDataProductAccess` method to request access ([9c90001](9c90001)) * migrate grpc-gcp to maven ([#237](#237)) ([d787372](d787372)) * **spanner:** add getIsolationLevel and getReadLockMode methods to CommitResponse ([#13004](#13004)) ([d5fc504](d5fc504)) * **spanner:** add option for auto-tagging transactions ([#13214](#13214)) ([c8234cf](c8234cf)) * **spanner:** add option for inline begin with multi-use read only txn ([#13233](#13233)) ([056abb6](056abb6)) ### Bug Fixes * [container] remove image_family from ([9c90001](9c90001)) * [saasservicemgmt] Changed field behavior for an existing field ([9c90001](9c90001)) * **bigquery-jdbc:** Add escape character support for pattern matching ([#13259](#13259)) ([af3b7c5](af3b7c5)) * **bigquery-jdbc:** configure logging early to capture URL parsing warnings and errors ([#13323](#13323)) ([98d8e69](98d8e69)) * **bigquery-jdbc:** fallback to standard precision and scale for numeric, integer, and temporal types ([#13321](#13321)) ([51ba902](51ba902)) * **bigquery-jdbc:** fix manual commit mode failure for non-US regions ([#13285](#13285)) ([d28436c](d28436c)) * **bigquery-jdbc:** handle EXPORT DATA, EXPORT MODEL, and LOAD DATA statements ([#13267](#13267)) ([5970866](5970866)) * **bigquery-jdbc:** implement JDBC wrapper interface methods ([#13322](#13322)) ([46d6a86](46d6a86)) * **bigquery:** prevent NullPointerException in OTel tracing when JobId is null ([#13301](#13301)) ([dcc2a68](dcc2a68)) * **bigtable:** Don't invoke unknown delegate code while holding a lock ([#13202](#13202)) ([a7e859e](a7e859e)) * **bigtable:** Ensure that FallbackChannelPool locks doesnt leak to alien listeners ([#13195](#13195)) ([c8e615e](c8e615e)) * **bigtable:** make heartbeat interval volatile ([#13217](#13217)) ([279918e](279918e)) * **bigtable:** make ignoreError volatile ([#13218](#13218)) ([e5e5f14](e5e5f14)) * **bigtable:** prune older AFEs first ([#13215](#13215)) ([114e77b](114e77b)) * **bigtable:** recycle channel on consecutive new stream failures ([#13245](#13245)) ([842f64e](842f64e)) * **bigtable:** resolve check-then-act race condition in VRpcImpl ([#13196](#13196)) ([9853dd5](9853dd5)) * **bigtable:** resolve deadlock in ClientConfigurationManager when notifying callbacks ([#13192](#13192)) ([c98e53d](c98e53d)) * **bqjdbc:** avoid reusing statement in DatabaseMetaData ([#13224](#13224)) ([b1279ab](b1279ab)) * **bqjdbc:** fallback to RestAPI if ReadAPI is not accessible ([#13018](#13018)) ([cb9bdc3](cb9bdc3)) * **bqjdbc:** fix BigDecimal usage in mocks ([#13207](#13207)) ([65674c2](65674c2)) * **bqjdbc:** fix Long to java.sql.Time coercion ([#13035](#13035)) ([8ab9799](8ab9799)) * **bqjdbc:** optimize meetsReadRatio latency to achieve faster page counting ([#13090](#13090)) ([36af3eb](36af3eb)) * **bqjdbc:** Pass connection ID to DataType class loggers ([#13197](#13197)) ([ce9c504](ce9c504)) * **bqjdbc:** resolve JDBC metadata compliance gaps for wrappers, searchability, and type mappings ([#13242](#13242)) ([5678fc2](5678fc2)) * **bqjdbc:** update metadata values for GEOGRAPHY/JSON/INTERVAL types ([#13223](#13223)) ([d08691a](d08691a)) * **bqjdbc:** update shading to be more targeted ([#13232](#13232)) ([cc691a8](cc691a8)) * **bqjdbc:** validate integer connection properties ([#13174](#13174)) ([875ff6a](875ff6a)) * **build:** support generating unversioned libraries in OwlBot config ([#13336](#13336)) ([90d6661](90d6661)) * **ci:** correct directory typo in shared-dependencies workflow ([#13225](#13225)) ([a327bf2](a327bf2)) * **firestore:** increase ITShutdownTest timeout to 50s ([#13199](#13199)) ([d432b35](d432b35)) * **gapic-generator:** allow non-versioned proto paths and correct help text ([#13329](#13329)) ([13717a2](13717a2)) * **generator:** align template and post-processor formatting ([#13028](#13028)) ([6a2307f](6a2307f)) * **hermetic_build:** add grpc-gcp-java to module allowlist in root pom generator ([#13211](#13211)) ([f7c8407](f7c8407)) * **hermetic_build:** restore Version.java after postprocessing entrypoint ([#13328](#13328)) ([ee3e9cd](ee3e9cd)) * **hermetic:** exclude showcase modules from versions.txt ([#13030](#13030)) ([6ce87b7](6ce87b7)) * **iam-admin:** remove redundant IAM project service to prevent state conflict ([#13016](#13016)) ([95cfd5e](95cfd5e)) * remove google-cloud-bigtable-deps-bom from gapic-libraries-bom ([#13209](#13209)) ([ce156f2](ce156f2)) * **spanner:** avoid double grpc-gcp wrapping for directpath fallback ([#13155](#13155)) ([fe608fe](fe608fe)) * **spanner:** cache auto-tagging options to avoid system property lock contention ([#13273](#13273)) ([dc2feed](dc2feed)) * **spanner:** derive built-in metrics project from database client ([#13262](#13262)) ([a577934](a577934)) ### Dependencies * update dependency com.google.cloud:sdk-platform-java-config to v3.62.0 ([#2379](#2379)) ([e9ec6e0](e9ec6e0)) * update dependency com.google.cloud:sdk-platform-java-config to v3.62.0 ([#2729](#2729)) ([af4893b](af4893b)) * update googleapis/google-cloud-java action to v1.86.0 ([#2377](#2377)) ([f2de1c3](f2de1c3)) * update googleapis/google-cloud-java action to v1.86.0 ([#2727](#2727)) ([d16eda9](d16eda9)) * update shared dependencies ([#2910](#2910)) ([8cc8ae0](8cc8ae0)) ### Documentation * add root-level development.md guide for scoped builds ([#13151](#13151)) ([bcec186](bcec186)) * **agents:** add API lifecycle and stability guidelines skill ([#13179](#13179)) ([9110ad6](9110ad6)) * Update gRPC spelling in READMEs ([#13264](#13264)) ([d6a93ee](d6a93ee)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: cloud-java-bot <cloud-java-bot@google.com> Co-authored-by: blakeli <blakeli@google.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds support for generating unversioned libraries (such as backstory) in the hermetic build OwlBot configuration. Historically, only versioned libraries (with v1, v1beta, etc. directories) were supported in deep-copy regex. For example, new library generation for backstory didn't trigger any code changes.
This PR checks if a version component is present and conditionally outputs versioned or unversioned copy patterns.