Skip to content

Commit 3b782f4

Browse files
authored
chore: migrate pubsub and pubsub/v2 to Librarian (googleapis#13008)
Note that the tag format for pubsub/v2 is hard-coded to use "pubsub/" as the prefix instead of "pubsub/v2". Towards googleapis/librarian#2419
1 parent 78f240f commit 3b782f4

25 files changed

+63
-30
lines changed

.github/.OwlBot.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ deep-remove-regex:
119119
- /internal/generated/snippets/monitoring/dashboard/apiv1/
120120
- /internal/generated/snippets/monitoring/metricsscope/apiv1/
121121
- /internal/generated/snippets/orgpolicy/apiv2/
122-
- /internal/generated/snippets/pubsub/apiv1/
123122
- /internal/generated/snippets/run/apiv2/
124123
- /internal/generated/snippets/servicecontrol/apiv1/
125124
- /internal/generated/snippets/servicemanagement/apiv1/
@@ -141,7 +140,6 @@ deep-remove-regex:
141140
- /monitoring/metricsscope/apiv1/
142141
- /orgpolicy/apiv1/
143142
- /orgpolicy/apiv2/
144-
- /pubsub/v2/apiv1/
145143
- /run/apiv2/
146144
- /servicecontrol/apiv1/
147145
- /servicemanagement/apiv1/
@@ -163,10 +161,6 @@ deep-preserve-regex:
163161
- /kms/apiv1/iam_example_test.go
164162
- /logging/apiv2/WriteLogEntries_smoke_test.go
165163
# TODO(#7336): Remove these networkconnectivity lines once breaking change is handled.
166-
# Preserve pubsub apiv1 until deprecation date in a year even though it's not generated.
167-
- /pubsub/apiv1/.*
168-
- /pubsub/v2/apiv1/iam.go
169-
- /pubsub/v2/apiv1/ListTopics_smoke_test.go
170164
- /spanner/admin/database/apiv1/backup.go
171165
- /spanner/admin/database/apiv1/backup_test.go
172166
- /spanner/admin/database/apiv1/database.go
@@ -316,8 +310,6 @@ deep-copy-regex:
316310
dest: /
317311
- source: /google/cloud/orgpolicy/v2/cloud.google.com/go
318312
dest: /
319-
- source: /google/pubsub/v1/cloud.google.com/go
320-
dest: /
321313
- source: /google/cloud/run/v2/cloud.google.com/go
322314
dest: /
323315
- source: /google/api/servicecontrol/v1/cloud.google.com/go

.librarian/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@ libraries:
1212
release_blocked: true
1313
- id: "longrunning"
1414
release_blocked: true
15+
- id: "pubsub"
16+
release_blocked: true
17+
- id: "pubsub/v2"
18+
release_blocked: true
1519
- id: "pubsublite"
1620
release_blocked: true

.librarian/generator-input/repo-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ modules:
5757
- path: google/monitoring/v3
5858
client_directory: apiv3/v2
5959

60-
- name: pubsub
60+
- name: pubsub/v2
6161
apis:
6262
- path: google/pubsub/v1
63-
client_directory: v2/apiv1
63+
client_directory: apiv1
6464

6565
- name: recaptchaenterprise
6666
module_path_version: v2

.librarian/state.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3077,6 +3077,53 @@ libraries:
30773077
release_exclude_paths:
30783078
- internal/generated/snippets/privilegedaccessmanager/
30793079
tag_format: '{id}/v{version}'
3080+
- id: pubsub
3081+
version: 1.50.1
3082+
last_generated_commit: a32b926f35bf473f7ba31383e5247175beccd576
3083+
apis: []
3084+
source_roots:
3085+
- pubsub
3086+
- internal/generated/snippets/pubsub
3087+
preserve_regex: []
3088+
remove_regex:
3089+
- ^internal/generated/snippets/pubsub/
3090+
- ^pubsub/apiv1/[^/]*_client\.go$
3091+
- ^pubsub/apiv1/[^/]*_client_example_go123_test\.go$
3092+
- ^pubsub/apiv1/[^/]*_client_example_test\.go$
3093+
- ^pubsub/apiv1/auxiliary\.go$
3094+
- ^pubsub/apiv1/auxiliary_go123\.go$
3095+
- ^pubsub/apiv1/doc\.go$
3096+
- ^pubsub/apiv1/gapic_metadata\.json$
3097+
- ^pubsub/apiv1/helpers\.go$
3098+
- ^pubsub/apiv1/pubsubpb/.*$
3099+
release_exclude_paths:
3100+
- pubsub/v2
3101+
- internal/generated/snippets/pubsub/
3102+
tag_format: '{id}/v{version}'
3103+
- id: pubsub/v2
3104+
version: 2.2.1
3105+
last_generated_commit: a32b926f35bf473f7ba31383e5247175beccd576
3106+
apis:
3107+
- path: google/pubsub/v1
3108+
service_config: ""
3109+
source_roots:
3110+
- pubsub/v2
3111+
- internal/generated/snippets/pubsub/v2
3112+
preserve_regex: []
3113+
remove_regex:
3114+
- ^internal/generated/snippets/pubsub/v2/
3115+
- ^pubsub/v2/apiv1/[^/]*_client\.go$
3116+
- ^pubsub/v2/apiv1/[^/]*_client_example_go123_test\.go$
3117+
- ^pubsub/v2/apiv1/[^/]*_client_example_test\.go$
3118+
- ^pubsub/v2/apiv1/auxiliary\.go$
3119+
- ^pubsub/v2/apiv1/auxiliary_go123\.go$
3120+
- ^pubsub/v2/apiv1/doc\.go$
3121+
- ^pubsub/v2/apiv1/gapic_metadata\.json$
3122+
- ^pubsub/v2/apiv1/helpers\.go$
3123+
- ^pubsub/v2/apiv1/v2pb/.*$
3124+
release_exclude_paths:
3125+
- internal/generated/snippets/pubsub/v2/
3126+
tag_format: pubsub/v{version}
30803127
- id: pubsublite
30813128
version: 1.8.2
30823129
last_generated_commit: a9ebc23947a515fab3de97ff326c86fc8f03fae1

.release-please-manifest-individual.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
"firestore": "1.19.0",
77
"logging": "1.13.0",
88
"profiler": "0.4.3",
9-
"pubsub": "1.50.1",
10-
"pubsub/v2": "2.2.1",
119
"spanner": "1.86.0",
1210
"storage": "1.57.0",
1311
"vertexai": "0.15.0"

internal/postprocessor/config.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ modules:
2929
- monitoring
3030
- orgpolicy
3131
- profiler
32-
- pubsub/v2
33-
- pubsub
3432
- run
3533
- servicecontrol
3634
- servicemanagement
@@ -372,9 +370,6 @@ service-configs:
372370
- input-directory: google/monitoring/v3
373371
service-config: monitoring.yaml
374372
import-path: cloud.google.com/go/monitoring/apiv3/v2
375-
- input-directory: google/pubsub/v1
376-
service-config: pubsub_v1.yaml
377-
import-path: cloud.google.com/go/pubsub/v2/apiv1
378373
- input-directory: google/spanner/adapter/v1
379374
service-config: spanner.yaml
380375
import-path: cloud.google.com/go/spanner/adapter/apiv1
@@ -548,6 +543,8 @@ skip-module-scan-paths:
548543
- dataproc
549544
- dlp
550545
- longrunning
546+
- pubsub/v2
547+
- pubsub
551548
# individually released modules
552549
- bigquery
553550
- bigquery/v2
@@ -557,8 +554,6 @@ skip-module-scan-paths:
557554
- firestore
558555
- logging
559556
- profiler
560-
- pubsub/v2
561-
- pubsub
562557
- spanner
563558
- storage
564559
- vertexai

pubsub/apiv1/auxiliary.go

100755100644
File mode changed.

pubsub/apiv1/auxiliary_go123.go

100755100644
File mode changed.

pubsub/apiv1/doc.go

100755100644
File mode changed.

pubsub/apiv1/helpers.go

100755100644
File mode changed.

0 commit comments

Comments
 (0)