Skip to content

Commit 9a4cb31

Browse files
authored
chore: migrate Spanner to Librarian (googleapis#13184)
Fixes googleapis/librarian#2422 - see that issue for more details. From this merge point: - Generation of API changes will still be automatic, via Librarian instead of OwlBot - Releases will be manually initiated: @quartzmo and I will be happy to pair with the Spanner team for the first release or two
1 parent 9023934 commit 9a4cb31

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+139
-125
lines changed

.github/.OwlBot.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,9 @@ deep-remove-regex:
5050
- /internal/generated/snippets//devicestreaming/apiv1/
5151
# - /internal/generated/snippets/errorreporting/apiv1beta1/
5252
- /internal/generated/snippets/logging/apiv2/
53-
- /internal/generated/snippets/spanner/adapter/apiv1/
54-
- /internal/generated/snippets/spanner/admin/database/apiv1/
55-
- /internal/generated/snippets/spanner/admin/instance/apiv1/
56-
- /internal/generated/snippets/spanner/apiv1/
5753
- /internal/generated/snippets/storage/control/apiv2/
5854
# END snippets
5955
- /logging/apiv2/
60-
- /spanner/adapter/apiv1/
61-
- /spanner/admin/database/apiv1/
62-
- /spanner/admin/instance/apiv1/
63-
- /spanner/apiv1/
64-
- /spanner/executor/apiv1/
6556
- /storage/control/apiv2/
6657
- /storage/internal/apiv2/
6758

@@ -71,14 +62,6 @@ deep-preserve-regex:
7162
- /.*/version.go
7263
- /logging/apiv2/WriteLogEntries_smoke_test.go
7364
# TODO(#7336): Remove these networkconnectivity lines once breaking change is handled.
74-
- /spanner/admin/database/apiv1/backup.go
75-
- /spanner/admin/database/apiv1/backup_test.go
76-
- /spanner/admin/database/apiv1/database.go
77-
- /spanner/admin/database/apiv1/database_test.go
78-
- /spanner/admin/database/apiv1/init.go
79-
- /spanner/admin/database/apiv1/mock_test.go
80-
- /spanner/admin/instance/apiv1/init.go
81-
- /spanner/apiv1/spanner_client_options.go
8265
- /storage/internal/apiv2/metadata.go
8366
# Must preserve these even though they aren't generated anymore
8467

@@ -130,16 +113,6 @@ deep-copy-regex:
130113
dest: /
131114
- source: /google/logging/v2/cloud.google.com/go
132115
dest: /
133-
- source: /google/spanner/adapter/v1/cloud.google.com/go
134-
dest: /
135-
- source: /google/spanner/admin/database/v1/cloud.google.com/go
136-
dest: /
137-
- source: /google/spanner/admin/instance/v1/cloud.google.com/go
138-
dest: /
139-
- source: /google/spanner/v1/cloud.google.com/go
140-
dest: /
141-
- source: /google/spanner/executor/v1/cloud.google.com/go
142-
dest: /
143116
- source: /google/storage/control/v2/cloud.google.com/go/
144117
dest: /
145118
- source: /google/storage/v2/cloud.google.com/go/storage/internal/apiv2

.librarian/state.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4896,6 +4896,81 @@ libraries:
48964896
release_exclude_paths:
48974897
- internal/generated/snippets/shopping/
48984898
tag_format: '{id}/v{version}'
4899+
- id: spanner
4900+
version: 1.86.1
4901+
last_generated_commit: c288189b43c016dd3cf1ec73ce3cadee8b732f07
4902+
apis:
4903+
- path: google/spanner/adapter/v1
4904+
service_config: spanner.yaml
4905+
- path: google/spanner/admin/database/v1
4906+
service_config: spanner.yaml
4907+
- path: google/spanner/admin/instance/v1
4908+
service_config: spanner.yaml
4909+
- path: google/spanner/v1
4910+
service_config: spanner.yaml
4911+
- path: google/spanner/executor/v1
4912+
service_config: spanner_cloud_executor.yaml
4913+
source_roots:
4914+
- spanner
4915+
- internal/generated/snippets/spanner
4916+
preserve_regex: []
4917+
remove_regex:
4918+
- ^internal/generated/snippets/spanner/
4919+
- ^spanner/adapter/apiv1/[^/]*_client\.go$
4920+
- ^spanner/adapter/apiv1/[^/]*_client_example_go123_test\.go$
4921+
- ^spanner/adapter/apiv1/[^/]*_client_example_test\.go$
4922+
- ^spanner/adapter/apiv1/auxiliary\.go$
4923+
- ^spanner/adapter/apiv1/auxiliary_go123\.go$
4924+
- ^spanner/adapter/apiv1/doc\.go$
4925+
- ^spanner/adapter/apiv1/gapic_metadata\.json$
4926+
- ^spanner/adapter/apiv1/helpers\.go$
4927+
- ^spanner/adapter/apiv1/adapterpb/.*$
4928+
- ^spanner/admin/database/apiv1/[^/]*_client\.go$
4929+
- ^spanner/admin/database/apiv1/[^/]*_client_example_go123_test\.go$
4930+
- ^spanner/admin/database/apiv1/[^/]*_client_example_test\.go$
4931+
- ^spanner/admin/database/apiv1/auxiliary\.go$
4932+
- ^spanner/admin/database/apiv1/auxiliary_go123\.go$
4933+
- ^spanner/admin/database/apiv1/doc\.go$
4934+
- ^spanner/admin/database/apiv1/gapic_metadata\.json$
4935+
- ^spanner/admin/database/apiv1/helpers\.go$
4936+
- ^spanner/admin/database/apiv1/databasepb/.*$
4937+
- ^spanner/admin/instance/apiv1/[^/]*_client\.go$
4938+
- ^spanner/admin/instance/apiv1/[^/]*_client_example_go123_test\.go$
4939+
- ^spanner/admin/instance/apiv1/[^/]*_client_example_test\.go$
4940+
- ^spanner/admin/instance/apiv1/auxiliary\.go$
4941+
- ^spanner/admin/instance/apiv1/auxiliary_go123\.go$
4942+
- ^spanner/admin/instance/apiv1/doc\.go$
4943+
- ^spanner/admin/instance/apiv1/gapic_metadata\.json$
4944+
- ^spanner/admin/instance/apiv1/helpers\.go$
4945+
- ^spanner/admin/instance/apiv1/instancepb/.*$
4946+
- ^spanner/apiv1/[^/]*_client\.go$
4947+
- ^spanner/apiv1/[^/]*_client_example_go123_test\.go$
4948+
- ^spanner/apiv1/[^/]*_client_example_test\.go$
4949+
- ^spanner/apiv1/auxiliary\.go$
4950+
- ^spanner/apiv1/auxiliary_go123\.go$
4951+
- ^spanner/apiv1/doc\.go$
4952+
- ^spanner/apiv1/gapic_metadata\.json$
4953+
- ^spanner/apiv1/helpers\.go$
4954+
- ^spanner/apiv1/spannerpb/.*$
4955+
- ^spanner/executor/apiv1/[^/]*_client\.go$
4956+
- ^spanner/executor/apiv1/[^/]*_client_example_go123_test\.go$
4957+
- ^spanner/executor/apiv1/[^/]*_client_example_test\.go$
4958+
- ^spanner/executor/apiv1/auxiliary\.go$
4959+
- ^spanner/executor/apiv1/auxiliary_go123\.go$
4960+
- ^spanner/executor/apiv1/doc\.go$
4961+
- ^spanner/executor/apiv1/gapic_metadata\.json$
4962+
- ^spanner/executor/apiv1/helpers\.go$
4963+
- ^spanner/executor/apiv1/executorpb/.*$
4964+
release_exclude_paths:
4965+
- internal/generated/snippets/spanner/
4966+
- spanner/benchmarks
4967+
- spanner/internal/benchwrapper
4968+
- spanner/internal/testutil
4969+
- spanner/kokoro
4970+
- spanner/spannertest
4971+
- spanner/test
4972+
- spanner/testdata
4973+
tag_format: '{id}/v{version}'
48994974
- id: speech
49004975
version: 1.28.1
49014976
last_generated_commit: c288189b43c016dd3cf1ec73ce3cadee8b732f07

.release-please-manifest-individual.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"errorreporting": "0.3.2",
55
"logging": "1.13.0",
66
"profiler": "0.4.3",
7-
"spanner": "1.86.1",
87
"storage": "1.57.0",
98
"vertexai": "0.15.0"
109
}

internal/postprocessor/config.yaml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ modules:
88
- errorreporting
99
- logging
1010
- profiler
11-
- spanner
1211
- storage
1312

1413
manual-clients:
@@ -208,21 +207,6 @@ service-configs:
208207
- input-directory: google/logging/v2
209208
service-config: logging_v2.yaml
210209
import-path: cloud.google.com/go/logging/apiv2
211-
- input-directory: google/spanner/adapter/v1
212-
service-config: spanner.yaml
213-
import-path: cloud.google.com/go/spanner/adapter/apiv1
214-
- input-directory: google/spanner/admin/database/v1
215-
service-config: spanner.yaml
216-
import-path: cloud.google.com/go/spanner/admin/database/apiv1
217-
- input-directory: google/spanner/admin/instance/v1
218-
service-config: spanner.yaml
219-
import-path: cloud.google.com/go/spanner/admin/instance/apiv1
220-
- input-directory: google/spanner/v1
221-
service-config: spanner.yaml
222-
import-path: cloud.google.com/go/spanner/apiv1
223-
- input-directory: google/spanner/executor/v1
224-
service-config: spanner_cloud_executor.yaml
225-
import-path: cloud.google.com/go/spanner/executor/apiv1
226210
- input-directory: google/storage/control/v2
227211
service-config: storage_v2.yaml
228212
import-path: cloud.google.com/go/storage/control/apiv2
@@ -234,6 +218,7 @@ skip-module-scan-paths:
234218
# ignore the root module
235219
- .
236220
# Librarian released modules
221+
- spanner
237222
- datastore
238223
- firestore
239224
- containeranalysis
@@ -410,7 +395,6 @@ skip-module-scan-paths:
410395
- errorreporting
411396
- logging
412397
- profiler
413-
- spanner
414398
- storage
415399
- vertexai
416400
# unreleased modules

release-please-config-individual.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
"profiler": {
2222
"component": "profiler"
2323
},
24-
"spanner": {
25-
"component": "spanner"
26-
},
2724
"storage": {
2825
"component": "storage"
2926
},

spanner/adapter/apiv1/adapter_client.go

100755100644
File mode changed.

spanner/adapter/apiv1/adapterpb/adapter.pb.go

100755100644
Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spanner/adapter/apiv1/adapterpb/adapter_grpc.pb.go

100755100644
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spanner/adapter/apiv1/auxiliary.go

100755100644
File mode changed.

spanner/adapter/apiv1/auxiliary_go123.go

100755100644
File mode changed.

0 commit comments

Comments
 (0)