feat(librariangen): add protoc package #3935

meltsufin · 2025-10-11T03:21:31Z

This will be used for constructing the protoc command for generating Java GAPICs.

Based on https://github.com/googleapis/google-cloud-go/tree/main/internal/librariangen/protoc with the following important changes:

The Build function in protoc.go is updated to construct the protoc command with the correct arguments for Java GAPIC generation.
The tests in protoc_test.go are updated to reflect the changes in protoc.go.
The gapicImportPath is removed from the test configuration, as it is not relevant for Java.'
The testdata is included with modifications for Java.

This will be used for constructing the protoc command for generating Java GAPICs. Based on https://github.com/googleapis/google-cloud-go/tree/main/internal/librariangen/protoc with the following important changes: * The `Build` function in `protoc.go` is updated to construct the `protoc` command with the correct arguments for Java GAPIC generation. * The tests in `protoc_test.go` are updated to reflect the changes in `protoc.go`. * The `gapicImportPath` is removed from the test configuration, as it is not relevant for Java.'

suztomo · 2025-10-13T14:36:35Z

internal/librariangen/testdata/generate/librarian/generate-request.json

@@ -0,0 +1,22 @@
+{


Is this used?

Good catch. It will be used in the next PR. I'll remove it.

codecov · 2025-10-13T14:50:20Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 94.02%. Comparing base (f32325e) to head (ec1e063).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3935      +/-   ##
==========================================
- Coverage   97.53%   94.02%   -3.51%     
==========================================
  Files           3        4       +1     
  Lines          81      134      +53     
==========================================
+ Hits           79      126      +47     
- Misses          2        6       +4     
- Partials        0        2       +2

Flag	Coverage Δ
librariangen	`94.02% <ø> (-3.51%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

meltsufin · 2025-10-13T15:08:32Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces a new protoc package for constructing protoc commands to generate Java GAPICs. The implementation is clean and well-tested. I've identified a couple of areas for improvement related to unused code, which will enhance clarity and maintainability. My suggestions involve removing unused function parameters and test struct fields, along with updating the corresponding call sites.

internal/librariangen/protoc/protoc.go

internal/librariangen/protoc/protoc_test.go

blakeli0 · 2025-10-13T15:35:50Z

internal/librariangen/protoc/protoc.go

Is this rewriting part of generate_library.sh in go? If yes, there are some special cases need to be handled. cc: @JoeWang1127

This is just scaffolding for now. Yes, we'll be rewriting the needed logic in Go.

meltsufin · 2025-10-13T16:34:40Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces a new protoc package for constructing protoc commands, specifically for Java GAPIC generation. The changes include the core logic in protoc.go, comprehensive tests in protoc_test.go, and necessary test data. The code is well-structured and the approach of using a ConfigProvider interface is good for decoupling. I have a couple of suggestions to improve code clarity and maintainability.

gemini-code-assist · 2025-10-13T16:36:56Z

internal/librariangen/protoc/protoc.go

+	if config.HasGAPIC() {
+		if config.ServiceYAML() != "" {
+			gapicOpts = append(gapicOpts, fmt.Sprintf("api-service-config=%s", filepath.Join(apiServiceDir, config.ServiceYAML())))
+		}
+		if config.GapicYAML() != "" {
+			gapicOpts = append(gapicOpts, fmt.Sprintf("gapic-config=%s", filepath.Join(apiServiceDir, config.GapicYAML())))
+		}
+		if config.GRPCServiceConfig() != "" {
+			gapicOpts = append(gapicOpts, fmt.Sprintf("grpc-service-config=%s", filepath.Join(apiServiceDir, config.GRPCServiceConfig())))
+		}
+		if config.Transport() != "" {
+			gapicOpts = append(gapicOpts, fmt.Sprintf("transport=%s", config.Transport()))
+		}
+		if config.HasRESTNumericEnums() {
+			gapicOpts = append(gapicOpts, "rest-numeric-enums")
+		}
+	}


This block has some repetition when constructing gapicOpts. You can refactor this to be more data-driven for the file-based options, which improves readability and makes it easier to add more options in the future.

Suggested change

if config.HasGAPIC() {

if config.ServiceYAML() != "" {

gapicOpts = append(gapicOpts, fmt.Sprintf("api-service-config=%s", filepath.Join(apiServiceDir, config.ServiceYAML())))

}

if config.GapicYAML() != "" {

gapicOpts = append(gapicOpts, fmt.Sprintf("gapic-config=%s", filepath.Join(apiServiceDir, config.GapicYAML())))

}

if config.GRPCServiceConfig() != "" {

gapicOpts = append(gapicOpts, fmt.Sprintf("grpc-service-config=%s", filepath.Join(apiServiceDir, config.GRPCServiceConfig())))

}

if config.Transport() != "" {

gapicOpts = append(gapicOpts, fmt.Sprintf("transport=%s", config.Transport()))

}

if config.HasRESTNumericEnums() {

gapicOpts = append(gapicOpts, "rest-numeric-enums")

}

}

if config.HasGAPIC() {

fileOpts := []struct{ key, val string }{

{"api-service-config", config.ServiceYAML()},

{"gapic-config", config.GapicYAML()},

{"grpc-service-config", config.GRPCServiceConfig()},

}

for _, opt := range fileOpts {

if opt.val != "" {

gapicOpts = append(gapicOpts, fmt.Sprintf("%s=%s", opt.key, filepath.Join(apiServiceDir, opt.val)))

}

}

if config.Transport() != "" {

gapicOpts = append(gapicOpts, fmt.Sprintf("transport=%s", config.Transport()))

}

if config.HasRESTNumericEnums() {

gapicOpts = append(gapicOpts, "rest-numeric-enums")

}

}

gemini-code-assist · 2025-10-13T16:36:56Z

internal/librariangen/protoc/protoc_test.go

+	tests := []struct {
+		name          string
+		apiPath       string
+		reqID         string


The reqID field is unused in the test logic. Please remove it from the struct definition. The Go compiler will then flag the now-unused values in the test cases, which should also be removed.

sonarqubecloud · 2025-10-13T16:52:56Z

Quality Gate passed for 'gapic-generator-java-root'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

sonarqubecloud · 2025-10-13T16:56:36Z

Quality Gate passed for 'java_showcase_integration_tests'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

🤖 I have created a release *beep* *boop* --- <details><summary>2.63.0</summary> ## [2.63.0](v2.62.3...v2.63.0) (2025-10-16) ### Features * **librariangen:** add bazel package ([#3940](#3940)) ([feabef3](feabef3)) * **librariangen:** add execv package ([#3932](#3932)) ([f6b0b47](f6b0b47)) * **librariangen:** add protoc package ([#3935](#3935)) ([598de06](598de06)) * **librariangen:** add request package ([#3933](#3933)) ([fe44aed](fe44aed)) * **librariangen:** scaffold Java language container for Librarian ([#3926](#3926)) ([29d188d](29d188d)) ### Dependencies * Bump errorprone-annotations to v2.42.0 ([8d6c1f9](8d6c1f9)) * Bump guava to v33.5.0 ([8d6c1f9](8d6c1f9)) * Bump j2objc-annotations to v3.1 ([8d6c1f9](8d6c1f9)) * update google auth library dependencies to v1.40.0 ([#3945](#3945)) ([1d74663](1d74663)) * Upgrade Google Http Java Client to v2.0.2 ([#3946](#3946)) ([7fb4f15](7fb4f15)) </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>

This reverts commit 598de06.

product-auto-label bot added the size: l Pull request size is large. label Oct 11, 2025

meltsufin requested a review from suztomo October 11, 2025 03:21

suztomo previously approved these changes Oct 13, 2025

View reviewed changes

suztomo reviewed Oct 13, 2025

View reviewed changes

remove generate-request.json

e7c57b5

meltsufin dismissed suztomo’s stale review via e7c57b5 October 13, 2025 14:49

Merge branch 'main' into librariangen-protoc

353e7a0

suztomo previously approved these changes Oct 13, 2025

View reviewed changes

gemini-code-assist bot reviewed Oct 13, 2025

View reviewed changes

internal/librariangen/protoc/protoc.go Outdated Show resolved Hide resolved

internal/librariangen/protoc/protoc_test.go Outdated Show resolved Hide resolved

internal/librariangen/protoc/protoc_test.go Outdated Show resolved Hide resolved

blakeli0 reviewed Oct 13, 2025

View reviewed changes

chore: respond to GCA findings

7093602

meltsufin dismissed suztomo’s stale review via 7093602 October 13, 2025 16:04

gemini-code-assist bot reviewed Oct 13, 2025

View reviewed changes

remove unused reqID

ec1e063

suztomo approved these changes Oct 13, 2025

View reviewed changes

meltsufin merged commit 598de06 into main Oct 13, 2025
48 of 49 checks passed

meltsufin deleted the librariangen-protoc branch October 13, 2025 17:37

release-please bot mentioned this pull request Oct 13, 2025

chore(main): release 2.63.0 #3927

Merged

meltsufin added a commit that referenced this pull request Oct 24, 2025

Revert "feat(librariangen): add protoc package (#3935)"

3d7dd82

This reverts commit 598de06.

Uh oh!

feat(librariangen): add protoc package #3935

feat(librariangen): add protoc package #3935

Uh oh!

Conversation

meltsufin commented Oct 11, 2025

Uh oh!

suztomo Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

meltsufin Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

meltsufin commented Oct 13, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blakeli0 Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

meltsufin Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

meltsufin commented Oct 13, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Oct 13, 2025

Quality Gate passed for 'gapic-generator-java-root'

Uh oh!

sonarqubecloud bot commented Oct 13, 2025

Quality Gate passed for 'java_showcase_integration_tests'

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Oct 13, 2025 •

edited

Loading