@@ -27,15 +27,15 @@ import (
2727
2828 "cloud.google.com/java/internal/librariangen/bazel"
2929 "cloud.google.com/java/internal/librariangen/execv"
30+ "cloud.google.com/java/internal/librariangen/message"
3031 "cloud.google.com/java/internal/librariangen/protoc"
31- "cloud.google.com/java/internal/librariangen/request"
3232)
3333
3434// Test substitution vars.
3535var (
3636 bazelParse = bazel .Parse
3737 execvRun = execv .Run
38- requestParse = request .ParseLibrary
38+ requestParse = message .ParseLibrary
3939 protocBuild = protoc .Build
4040)
4141
@@ -113,7 +113,7 @@ func Generate(ctx context.Context, cfg *Config) error {
113113// invokeProtoc handles the protoc GAPIC generation logic for the 'generate' CLI command.
114114// It reads a request file, and for each API specified, it invokes protoc
115115// to generate the client library. It returns the module path and the path to the service YAML.
116- func invokeProtoc (ctx context.Context , cfg * Config , generateReq * request .Library ) error {
116+ func invokeProtoc (ctx context.Context , cfg * Config , generateReq * message .Library ) error {
117117 for _ , api := range generateReq .APIs {
118118 apiServiceDir := filepath .Join (cfg .SourceDir , api .Path )
119119 slog .Info ("processing api" , "service_dir" , apiServiceDir )
@@ -135,7 +135,7 @@ func invokeProtoc(ctx context.Context, cfg *Config, generateReq *request.Library
135135// readGenerateReq reads generate-request.json from the librarian-tool input directory.
136136// The request file tells librariangen which library and APIs to generate.
137137// It is prepared by the Librarian tool and mounted at /librarian.
138- func readGenerateReq (librarianDir string ) (* request .Library , error ) {
138+ func readGenerateReq (librarianDir string ) (* message .Library , error ) {
139139 reqPath := filepath .Join (librarianDir , "generate-request.json" )
140140 slog .Debug ("librariangen: reading generate request" , "path" , reqPath )
141141
@@ -264,4 +264,4 @@ func unzip(src, dest string) error {
264264 }
265265 }
266266 return nil
267- }
267+ }
0 commit comments