Skip to content

Commit 2adb6f9

Browse files
quartzmoquartzmo
authored
fix(internal/librariangen): update source_paths to source_roots in generate-request.json (googleapis#12691)
closes: googleapis/librarian#1515
1 parent 1197ebc commit 2adb6f9

File tree

5 files changed

+30
-35
lines changed

5 files changed

+30
-35
lines changed

‎internal/librariangen/librariangen.log‎

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@ protoc-gen-go: protoc-gen-go v1.35.2
55
protoc-gen-go-grpc: protoc-gen-go-grpc 1.3.0
66
protoc-gen-go_gapic: v0.53.1
77
---------------------
8-
2025/07/28 18:51:48 INFO librariangen invoked args="[./librariangen --source=/Users/chrisdsmith/oss/googleapis --librarian=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.Zyyaol9spQ/librarian --output=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.Zyyaol9spQ/output generate]"
9-
2025/07/28 18:51:48 INFO processing api service_dir=/Users/chrisdsmith/oss/googleapis/google/cloud/chronicle/v1
10-
2025/07/28 18:51:48 INFO bazel config loaded conf="&{grpcServiceConfig:chronicle_v1_grpc_service_config.json gapicImportPath:cloud.google.com/go/chronicle/apiv1;chronicle metadata:true releaseLevel:beta restNumericEnums:true serviceYAML:chronicle_v1.yaml transport:grpc+rest diregapic:false hasGoGRPC:true}"
11-
2025/07/28 18:51:48 INFO using module path from final API importpath=cloud.google.com/go/chronicle/apiv1
12-
2025/07/28 18:51:48 INFO running goimports directory=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.Zyyaol9spQ/output/chronicle
13-
2025/07/28 18:51:48 INFO running go mod init directory=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.Zyyaol9spQ/output/chronicle modulePath=cloud.google.com/go/chronicle
14-
2025/07/28 18:51:48 INFO running go mod tidy directory=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.Zyyaol9spQ/output/chronicle
15-
2025/07/28 18:51:49 INFO librariangen finished successfully
8+
time=2025-08-11T14:19:31.871-06:00 level=INFO msg="librariangen: invoked" args="[./librariangen generate --source=/Users/chrisdsmith/oss/googleapis --librarian=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.GV67dGX3id/librarian --output=/var/folders/zk/_5rh6nq91db_fkzrcrh5v0w400xrml/T/tmp.XXXXXXXXXX.GV67dGX3id/output]"
9+
time=2025-08-11T14:19:31.872-06:00 level=INFO msg="processing api" service_dir=/Users/chrisdsmith/oss/googleapis/google/cloud/chronicle/v1
10+
time=2025-08-11T14:19:34.694-06:00 level=INFO msg="librariangen: finished successfully"
1611
--- Git Reset Summary ---
17-
HEAD is now at 7ce88633f9 chore(main): release storage 1.56.0 (#12394)
12+
HEAD is now at 1197ebcbca fix(auth): set Content-Type in userTokenProvider.exchangeToken (#12634)
1813
--- Git Status Summary ---
1914
On branch main
2015
Your branch is up to date with 'origin/main'.
@@ -39,7 +34,7 @@ Changes to be committed:
3934

4035
--- Diff for chronicle/go.mod ---
4136
diff --git a/chronicle/go.mod b/chronicle/go.mod
42-
index 612a62e4c5..9ff61ba224 100644
37+
index 0c45865e24..98a66fb9bc 100644
4338
--- a/chronicle/go.mod
4439
+++ b/chronicle/go.mod
4540
@@ -1,19 +1,19 @@
@@ -51,13 +46,13 @@ index 612a62e4c5..9ff61ba224 100644
5146
require (
5247
cloud.google.com/go/longrunning v0.6.7
5348
github.com/googleapis/gax-go/v2 v2.15.0
54-
google.golang.org/api v0.243.0
49+
google.golang.org/api v0.246.0
5550
- google.golang.org/genproto v0.0.0-20250603155806-513f23925822
56-
- google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074
57-
+ google.golang.org/genproto v0.0.0-20250728155136-f173205681a0
58-
+ google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0
51+
- google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b
52+
+ google.golang.org/genproto v0.0.0-20250811160224-6b04f9b4fc78
53+
+ google.golang.org/genproto/googleapis/api v0.0.0-20250811160224-6b04f9b4fc78
5954
google.golang.org/grpc v1.74.2
60-
google.golang.org/protobuf v1.36.6
55+
google.golang.org/protobuf v1.36.7
6156
)
6257

6358
require (
@@ -70,13 +65,13 @@ index 612a62e4c5..9ff61ba224 100644
7065
golang.org/x/sys v0.34.0 // indirect
7166
golang.org/x/text v0.27.0 // indirect
7267
golang.org/x/time v0.12.0 // indirect
73-
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
74-
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 // indirect
68+
- google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
69+
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
7570
)
7671

7772
--- Diff for chronicle/go.sum ---
7873
diff --git a/chronicle/go.sum b/chronicle/go.sum
79-
index b73656ebd1..c9adda91af 100644
74+
index f375558574..78c81e99ae 100644
8075
--- a/chronicle/go.sum
8176
+++ b/chronicle/go.sum
8277
@@ -1,5 +1,5 @@
@@ -89,22 +84,22 @@ index b73656ebd1..c9adda91af 100644
8984
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
9085
@@ -65,12 +65,12 @@ golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
9186
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
92-
google.golang.org/api v0.243.0 h1:sw+ESIJ4BVnlJcWu9S+p2Z6Qq1PjG77T8IJ1xtp4jZQ=
93-
google.golang.org/api v0.243.0/go.mod h1:GE4QtYfaybx1KmeHMdBnNnyLzBZCVihGBXAmJu/uUr8=
87+
google.golang.org/api v0.246.0 h1:H0ODDs5PnMZVZAEtdLMn2Ul2eQi7QNjqM2DIFp8TlTM=
88+
google.golang.org/api v0.246.0/go.mod h1:dMVhVcylamkirHdzEBAIQWUCgqY885ivNeZYd7VAVr8=
9489
-google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
9590
-google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
96-
-google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074 h1:mVXdvnmR3S3BQOqHECm9NGMjYiRtEvDYcqAqedTXY6s=
97-
-google.golang.org/genproto/googleapis/api v0.0.0-20250721164621-a45f3dfb1074/go.mod h1:vYFwMYFbmA8vl6Z/krj/h7+U/AqpHknwJX4Uqgfyc7I=
98-
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10=
99-
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
100-
+google.golang.org/genproto v0.0.0-20250728155136-f173205681a0 h1:btBcgujH2+KIWEfz0s7Cdtt9R7hpwM4SAEXAdXf/ddw=
101-
+google.golang.org/genproto v0.0.0-20250728155136-f173205681a0/go.mod h1:Q4yZQ3kmmIyg6HsMjCGx2vQ8gzN+dntaPmFWz6Zj0fo=
102-
+google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 h1:0UOBWO4dC+e51ui0NFKSPbkHHiQ4TmrEfEZMLDyRmY8=
103-
+google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0/go.mod h1:8ytArBbtOy2xfht+y2fqKd5DRDJRUQhqbyEnQ4bDChs=
104-
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074 h1:qJW29YvkiJmXOYMu5Tf8lyrTp3dOS+K4z6IixtLaCf8=
105-
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
91+
-google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b h1:ULiyYQ0FdsJhwwZUwbaXpZF5yUE3h+RA+gxvBu37ucc=
92+
-google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:oDOGiMSXHL4sDTJvFvIB9nRQCGdLP1o/iVaqQK8zB+M=
93+
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM=
94+
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
95+
+google.golang.org/genproto v0.0.0-20250811160224-6b04f9b4fc78 h1:gJsKZJtYXxYm8PaWpj12C4izFaUzuUS4yzzu9b/Sc5w=
96+
+google.golang.org/genproto v0.0.0-20250811160224-6b04f9b4fc78/go.mod h1:q9+ZJOXH/LcpbpkQSsvYReIH5lCcwvfc2xE8JBSER0Q=
97+
+google.golang.org/genproto/googleapis/api v0.0.0-20250811160224-6b04f9b4fc78 h1:jywZp58LPvDQySsCk1BlaMEhkAb1c57TOeT3v3NST/o=
98+
+google.golang.org/genproto/googleapis/api v0.0.0-20250811160224-6b04f9b4fc78/go.mod h1:y2yVLIE/CSMCPXaHnSKXxu1spLPnglFLegmgdY23uuE=
99+
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b h1:zPKJod4w6F1+nRGDI9ubnXYhU9NSWoFAijkHkUXeTK8=
100+
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
106101
google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
107102
google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
108-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
103+
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
109104

110105
--- Diff for chronicle/README.md ---

‎internal/librariangen/request/request.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type Request struct {
2828
APIs []API `json:"apis"`
2929
// SourcePaths are the directories to which librarian contributes code.
3030
// For Go, this is typically the Go module directory.
31-
SourcePaths []string `json:"source_paths"`
31+
SourcePaths []string `json:"source_roots"`
3232
// PreserveRegex are files/directories to leave untouched during generation.
3333
// This is useful for preserving handwritten helper files or customizations.
3434
PreserveRegex []string `json:"preserve_regex"`

‎internal/librariangen/request/request_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestParse(t *testing.T) {
4040
"service_config": "cloudasset_v1.yaml"
4141
}
4242
],
43-
"source_paths": ["asset/apiv1"],
43+
"source_roots": ["asset/apiv1"],
4444
"preserve_regex": ["asset/apiv1/foo.go"],
4545
"remove_regex": ["asset/apiv1/bar.go"]
4646
}`,

‎internal/librariangen/testdata/.librarian/state.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ libraries:
2121
- path: "google/cloud/secretmanager/v1beta2"
2222
service_config: "secretmanager_v1beta2.yaml"
2323
# Directories to which librarian contributes code to.
24-
source_paths:
24+
source_roots:
2525
- "secretmanager"
2626
- "internal/generated/snippets/secretmanager"
2727
# Directories files in the local repo to leave untouched during copy and remove.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"service_config": "chronicle_v1.yaml"
77
}
88
],
9-
"source_paths": [
9+
"source_roots": [
1010
"chronicle",
1111
"internal/generated/snippets/chronicle"
1212
],

0 commit comments

Comments
 (0)