Skip to content

Commit 7ce3328

Browse files
committed
Merge remote-tracking branch 'fork/bump-firestore-3.43.1' into bump-firestore-3.43.1
2 parents 8d08e44 + e58b0c9 commit 7ce3328

616 files changed

Lines changed: 301971 additions & 8848 deletions

File tree

Some content is hidden

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

.github/workflows/librarian_generation_check.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@ jobs:
6565
librarian generate --all
6666
- name: Check for generated code changes
6767
run: |
68-
git diff --exit-code
68+
if [ -n "$(git status --porcelain)" ]; then
69+
git status
70+
echo "Regeneration produced code changes! Please run 'librarian generate --all' to update the generated files."
71+
exit 1
72+
fi

DEVELOPMENT.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Monorepo Scoped Development Guide
22

3-
This document outlines development workflows and build strategies when working with specific client libraries or modules in the `google-cloud-java` monorepo.
3+
This document outlines development workflows, build strategies, and code generation processes when working with or managing client libraries in the `google-cloud-java` monorepo.
44

55
---
66

@@ -51,3 +51,20 @@ mvn compile
5151
```
5252

5353
Your IDE such as Intellij should also be able to import all the upstream dependencies at this moment. You can perform the same operations as you would in a normal project such as running unit tests, debugging and so on.
54+
55+
---
56+
57+
## 3. Code Generation (Librarian)
58+
59+
This repository uses **[Librarian](https://github.com/googleapis/librarian)** to generate code from API specifications.
60+
61+
The configuration for Librarian in this repository is defined in the [librarian.yaml](librarian.yaml) file at the root.
62+
63+
### Documentation & Guides
64+
65+
For more information on how to use Librarian, configure generation, or troubleshoot issues, refer to the following guides:
66+
67+
* **[Librarian GitHub Repository](https://github.com/googleapis/librarian)**: The main repository for the Librarian tool.
68+
* **[Librarian Command Reference](https://pkg.go.dev/github.com/googleapis/librarian/cmd/librarian)**: Detailed documentation of `librarian` CLI commands.
69+
* **[Librarian Configuration Schema](https://github.com/googleapis/librarian/blob/main/doc/config-schema.md)**: Guide to the structure and options available in `librarian.yaml`.
70+
* **[go/g3doc-sdk-librarian](https://go/g3doc-sdk-librarian)** (Internal): Internal documentation for code generation schedules and local development workflows.

generation_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
googleapis_commitish: ff15be54722218705740b9fc6223d264c4cdb6dd
1+
googleapis_commitish: 00bb3db8a8cc88f0755e872856462b902d6dd8c4
22
libraries_bom_version: 26.83.0
33
is_monorepo: true
44
libraries:

google-cloud-jar-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>com.google.apis</groupId>
144144
<artifactId>google-api-services-bigquery</artifactId>
145-
<version>v2-rev20251012-2.0.0</version>
145+
<version>v2-rev20260429-2.0.0</version>
146146
</dependency>
147147

148148
</dependencies>

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/Cluster.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6627,7 +6627,7 @@ public com.google.cloud.alloydb.v1.Cluster.NetworkConfigOrBuilder getNetworkConf
66276627
* </code>
66286628
*
66296629
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
6630-
* google/cloud/alloydb/v1/resources.proto;l=682
6630+
* google/cloud/alloydb/v1/resources.proto;l=687
66316631
* @return The network.
66326632
*/
66336633
@java.lang.Override
@@ -6660,7 +6660,7 @@ public java.lang.String getNetwork() {
66606660
* </code>
66616661
*
66626662
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
6663-
* google/cloud/alloydb/v1/resources.proto;l=682
6663+
* google/cloud/alloydb/v1/resources.proto;l=687
66646664
* @return The bytes for network.
66656665
*/
66666666
@java.lang.Override
@@ -7016,7 +7016,7 @@ public com.google.cloud.alloydb.v1.AutomatedBackupPolicy getAutomatedBackupPolic
70167016
* <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
70177017
*
70187018
* @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
7019-
* google/cloud/alloydb/v1/resources.proto;l=717
7019+
* google/cloud/alloydb/v1/resources.proto;l=722
70207020
* @return Whether the sslConfig field is set.
70217021
*/
70227022
@java.lang.Override
@@ -7035,7 +7035,7 @@ public boolean hasSslConfig() {
70357035
* <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
70367036
*
70377037
* @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
7038-
* google/cloud/alloydb/v1/resources.proto;l=717
7038+
* google/cloud/alloydb/v1/resources.proto;l=722
70397039
* @return The sslConfig.
70407040
*/
70417041
@java.lang.Override
@@ -11812,7 +11812,7 @@ public com.google.cloud.alloydb.v1.Cluster.NetworkConfigOrBuilder getNetworkConf
1181211812
* </code>
1181311813
*
1181411814
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
11815-
* google/cloud/alloydb/v1/resources.proto;l=682
11815+
* google/cloud/alloydb/v1/resources.proto;l=687
1181611816
* @return The network.
1181711817
*/
1181811818
@java.lang.Deprecated
@@ -11844,7 +11844,7 @@ public java.lang.String getNetwork() {
1184411844
* </code>
1184511845
*
1184611846
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
11847-
* google/cloud/alloydb/v1/resources.proto;l=682
11847+
* google/cloud/alloydb/v1/resources.proto;l=687
1184811848
* @return The bytes for network.
1184911849
*/
1185011850
@java.lang.Deprecated
@@ -11876,7 +11876,7 @@ public com.google.protobuf.ByteString getNetworkBytes() {
1187611876
* </code>
1187711877
*
1187811878
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
11879-
* google/cloud/alloydb/v1/resources.proto;l=682
11879+
* google/cloud/alloydb/v1/resources.proto;l=687
1188011880
* @param value The network to set.
1188111881
* @return This builder for chaining.
1188211882
*/
@@ -11907,7 +11907,7 @@ public Builder setNetwork(java.lang.String value) {
1190711907
* </code>
1190811908
*
1190911909
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
11910-
* google/cloud/alloydb/v1/resources.proto;l=682
11910+
* google/cloud/alloydb/v1/resources.proto;l=687
1191111911
* @return This builder for chaining.
1191211912
*/
1191311913
@java.lang.Deprecated
@@ -11934,7 +11934,7 @@ public Builder clearNetwork() {
1193411934
* </code>
1193511935
*
1193611936
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
11937-
* google/cloud/alloydb/v1/resources.proto;l=682
11937+
* google/cloud/alloydb/v1/resources.proto;l=687
1193811938
* @param value The bytes for network to set.
1193911939
* @return This builder for chaining.
1194011940
*/
@@ -12811,7 +12811,7 @@ public Builder clearAutomatedBackupPolicy() {
1281112811
* <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
1281212812
*
1281312813
* @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
12814-
* google/cloud/alloydb/v1/resources.proto;l=717
12814+
* google/cloud/alloydb/v1/resources.proto;l=722
1281512815
* @return Whether the sslConfig field is set.
1281612816
*/
1281712817
@java.lang.Deprecated
@@ -12829,7 +12829,7 @@ public boolean hasSslConfig() {
1282912829
* <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
1283012830
*
1283112831
* @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
12832-
* google/cloud/alloydb/v1/resources.proto;l=717
12832+
* google/cloud/alloydb/v1/resources.proto;l=722
1283312833
* @return The sslConfig.
1283412834
*/
1283512835
@java.lang.Deprecated

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/ClusterOrBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ java.lang.String getLabelsOrDefault(
572572
* </code>
573573
*
574574
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
575-
* google/cloud/alloydb/v1/resources.proto;l=682
575+
* google/cloud/alloydb/v1/resources.proto;l=687
576576
* @return The network.
577577
*/
578578
@java.lang.Deprecated
@@ -594,7 +594,7 @@ java.lang.String getLabelsOrDefault(
594594
* </code>
595595
*
596596
* @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
597-
* google/cloud/alloydb/v1/resources.proto;l=682
597+
* google/cloud/alloydb/v1/resources.proto;l=687
598598
* @return The bytes for network.
599599
*/
600600
@java.lang.Deprecated
@@ -827,7 +827,7 @@ java.lang.String getAnnotationsOrDefault(
827827
* <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
828828
*
829829
* @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
830-
* google/cloud/alloydb/v1/resources.proto;l=717
830+
* google/cloud/alloydb/v1/resources.proto;l=722
831831
* @return Whether the sslConfig field is set.
832832
*/
833833
@java.lang.Deprecated
@@ -843,7 +843,7 @@ java.lang.String getAnnotationsOrDefault(
843843
* <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
844844
*
845845
* @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
846-
* google/cloud/alloydb/v1/resources.proto;l=717
846+
* google/cloud/alloydb/v1/resources.proto;l=722
847847
* @return The sslConfig.
848848
*/
849849
@java.lang.Deprecated

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/DatabaseVersion.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ public enum DatabaseVersion implements com.google.protobuf.ProtocolMessageEnum {
9292
* <code>POSTGRES_17 = 5;</code>
9393
*/
9494
POSTGRES_17(5),
95+
/**
96+
*
97+
*
98+
* <pre>
99+
* The database version is Postgres 18.
100+
* </pre>
101+
*
102+
* <code>POSTGRES_18 = 6;</code>
103+
*/
104+
POSTGRES_18(6),
95105
UNRECOGNIZED(-1),
96106
;
97107

@@ -171,6 +181,17 @@ public enum DatabaseVersion implements com.google.protobuf.ProtocolMessageEnum {
171181
*/
172182
public static final int POSTGRES_17_VALUE = 5;
173183

184+
/**
185+
*
186+
*
187+
* <pre>
188+
* The database version is Postgres 18.
189+
* </pre>
190+
*
191+
* <code>POSTGRES_18 = 6;</code>
192+
*/
193+
public static final int POSTGRES_18_VALUE = 6;
194+
174195
public final int getNumber() {
175196
if (this == UNRECOGNIZED) {
176197
throw new java.lang.IllegalArgumentException(
@@ -207,6 +228,8 @@ public static DatabaseVersion forNumber(int value) {
207228
return POSTGRES_16;
208229
case 5:
209230
return POSTGRES_17;
231+
case 6:
232+
return POSTGRES_18;
210233
default:
211234
return null;
212235
}

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/ResourcesProto.java

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -793,34 +793,36 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
793793
+ "\013ClusterView\022\034\n"
794794
+ "\030CLUSTER_VIEW_UNSPECIFIED\020\000\022\026\n"
795795
+ "\022CLUSTER_VIEW_BASIC\020\001\022\"\n"
796-
+ "\036CLUSTER_VIEW_CONTINUOUS_BACKUP\020\002*\214\001\n"
796+
+ "\036CLUSTER_VIEW_CONTINUOUS_BACKUP\020\002*\235\001\n"
797797
+ "\017DatabaseVersion\022 \n"
798798
+ "\034DATABASE_VERSION_UNSPECIFIED\020\000\022\023\n"
799799
+ "\013POSTGRES_13\020\001\032\002\010\001\022\017\n"
800800
+ "\013POSTGRES_14\020\002\022\017\n"
801801
+ "\013POSTGRES_15\020\003\022\017\n"
802802
+ "\013POSTGRES_16\020\004\022\017\n"
803-
+ "\013POSTGRES_17\020\005*N\n"
803+
+ "\013POSTGRES_17\020\005\022\017\n"
804+
+ "\013POSTGRES_18\020\006*N\n"
804805
+ "\020SubscriptionType\022!\n"
805806
+ "\035SUBSCRIPTION_TYPE_UNSPECIFIED\020\000\022\014\n"
806807
+ "\010STANDARD\020\001\022\t\n"
807808
+ "\005TRIAL\020\002B\247\005\n"
808-
+ "\033com.google.cloud.alloydb.v1B\016ResourcesProtoP\001Z5cloud.google.com/go/allo"
809-
+ "ydb/apiv1/alloydbpb;alloydbpb\252\002\027Google.C"
810-
+ "loud.AlloyDb.V1\312\002\027Google\\Cloud\\AlloyDb\\V1\352\002\032Google::Cloud::AlloyDB::V1\352A\246\001\n"
811-
+ "(cloudkms.googleapis.com/CryptoKeyVersion\022zpr",
812-
"ojects/{project}/locations/{location}/ke"
813-
+ "yRings/{key_ring}/cryptoKeys/{crypto_key"
814-
+ "}/cryptoKeyVersions/{crypto_key_version}"
815-
+ "\352AN\n\036compute.googleapis.com/Network\022,pro"
816-
+ "jects/{project}/global/networks/{network"
817-
+ "}\352Ax\n!cloudkms.googleapis.com/CryptoKey\022"
818-
+ "Sprojects/{project}/locations/{location}"
819-
+ "/keyRings/{key_ring}/cryptoKeys/{crypto_"
820-
+ "key}\352Aw\n(compute.googleapis.com/ServiceA"
821-
+ "ttachment\022Kprojects/{project}/regions/{r"
822-
+ "egion}/serviceAttachments/{service_attac"
823-
+ "hment}b\006proto3"
809+
+ "\033com.google.cloud.alloydb.v1B\016ResourcesProtoP\001Z5cloud.g"
810+
+ "oogle.com/go/alloydb/apiv1/alloydbpb;all"
811+
+ "oydbpb\252\002\027Google.Cloud.AlloyDb.V1\312\002\027Googl"
812+
+ "e\\Cloud\\AlloyDb\\V1\352\002\032Google::Cloud::AlloyDB::V1\352A\246\001\n"
813+
+ "(cloudkms.googleapis.com/Cry",
814+
"ptoKeyVersion\022zprojects/{project}/locati"
815+
+ "ons/{location}/keyRings/{key_ring}/crypt"
816+
+ "oKeys/{crypto_key}/cryptoKeyVersions/{cr"
817+
+ "ypto_key_version}\352AN\n\036compute.googleapis"
818+
+ ".com/Network\022,projects/{project}/global/"
819+
+ "networks/{network}\352Ax\n!cloudkms.googleap"
820+
+ "is.com/CryptoKey\022Sprojects/{project}/loc"
821+
+ "ations/{location}/keyRings/{key_ring}/cr"
822+
+ "yptoKeys/{crypto_key}\352Aw\n(compute.google"
823+
+ "apis.com/ServiceAttachment\022Kprojects/{pr"
824+
+ "oject}/regions/{region}/serviceAttachmen"
825+
+ "ts/{service_attachment}b\006proto3"
824826
};
825827
descriptor =
826828
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

java-alloydb/proto-google-cloud-alloydb-v1/src/main/proto/google/cloud/alloydb/v1/resources.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14+
// LINT: LEGACY_NAMES
1415

1516
syntax = "proto3";
1617

@@ -103,6 +104,10 @@ enum DatabaseVersion {
103104

104105
// The database version is Postgres 17.
105106
POSTGRES_17 = 5;
107+
108+
// The database version is Postgres 18.
109+
POSTGRES_18 = 6;
110+
106111
}
107112

108113
// Subscription_type added to distinguish between Standard and Trial

java-bigquery-jdbc/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ target-it/**
77
tools/**/*.class
88
tools/**/drivers/**
99
tools/**/logs/**
10-
tools/**/*.jfr
10+
tools/**/*.jfr
11+
12+
# Gemini/Jetski agent custom skills
13+
.agents/

0 commit comments

Comments
 (0)