Skip to content

Commit caf879c

Browse files
cloud-java-botJoeWang1127
cloud-java-bot
and
JoeWang1127
authored
chore: Update generation configuration at Wed Oct 2 02:24:58 UTC 2024 (#2342)
* chore: Update generation configuration at Tue Sep 17 02:09:48 UTC 2024 * chore: generate libraries at Tue Sep 17 02:10:14 UTC 2024 * chore: Update generation configuration at Wed Sep 18 02:21:49 UTC 2024 * chore: Update generation configuration at Thu Sep 19 02:23:21 UTC 2024 * chore: generate libraries at Thu Sep 19 02:23:39 UTC 2024 * chore: Update generation configuration at Fri Sep 20 02:23:12 UTC 2024 * chore: generate libraries at Fri Sep 20 02:24:35 UTC 2024 * chore: Update generation configuration at Sat Sep 21 02:21:35 UTC 2024 * chore: generate libraries at Sat Sep 21 02:21:56 UTC 2024 * chore: Update generation configuration at Tue Sep 24 02:25:16 UTC 2024 * chore: Update generation configuration at Wed Sep 25 02:25:52 UTC 2024 * update gen script * chore: generate libraries at Wed Sep 25 23:25:38 UTC 2024 * chore: Update generation configuration at Thu Sep 26 02:24:53 UTC 2024 * chore: Update generation configuration at Fri Sep 27 02:25:30 UTC 2024 * chore: Update generation configuration at Sat Sep 28 02:24:04 UTC 2024 * chore: Update generation configuration at Tue Oct 1 02:28:51 UTC 2024 * chore: Update generation configuration at Wed Oct 2 02:24:58 UTC 2024 --------- Co-authored-by: Joe Wang <[email protected]>
1 parent a341eb8 commit caf879c

File tree

302 files changed

+826
-427
lines changed

Some content is hidden

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

302 files changed

+826
-427
lines changed

‎.github/scripts/hermetic_library_generation.sh‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,24 @@ message="chore: generate libraries at $(date)"
6767

6868
git checkout "${target_branch}"
6969
git checkout "${current_branch}"
70-
# if the last commit doesn't contain changes to generation configuration,
71-
# do not generate again as the result will be the same.
72-
change_of_last_commit="$(git diff-tree --no-commit-id --name-only HEAD~1..HEAD -r)"
73-
if [[ ! ("${change_of_last_commit}" == *"${generation_config}"*) ]]; then
74-
echo "The last commit doesn't contain any changes to the generation_config.yaml, skipping the whole generation process." || true
75-
exit 0
76-
fi
70+
7771
# copy generation configuration from target branch to current branch.
7872
git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}"
79-
config_diff=$(diff "${generation_config}" "${baseline_generation_config}" || true)
8073

8174
# parse image tag from the generation configuration.
8275
image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs)
8376

77+
repo_root_dir=$(pwd)
78+
mkdir -p "${repo_root_dir}/output"
79+
# download api definitions from googleapis repository
80+
googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs)
81+
api_def_dir=$(mktemp -d)
82+
git clone https://github.com/googleapis/googleapis.git "${api_def_dir}"
83+
pushd "${api_def_dir}"
84+
git checkout "${googleapis_commitish}"
85+
cp -r google/ grafeas/ "${repo_root_dir}/output"
86+
popd
87+
8488
# run hermetic code generation docker image.
8589
docker run \
8690
--rm \
@@ -90,26 +94,21 @@ docker run \
9094
--baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
9195
--current-generation-config-path="${workspace_name}/${generation_config}"
9296

97+
# remove api definitions after generation
98+
rm -rf "${api_def_dir}"
9399

94100
# commit the change to the pull request.
95-
if [[ $(basename $(pwd)) == "google-cloud-java" ]]; then
96-
git add java-* pom.xml gapic-libraries-bom/pom.xml versions.txt
97-
else
98-
# The image leaves intermediate folders and files it works with. Here we remove them
99-
rm -rdf output googleapis "${baseline_generation_config}"
100-
git add --all -- ':!pr_description.txt'
101-
fi
101+
rm -rdf output googleapis "${baseline_generation_config}"
102+
git add --all -- ':!pr_description.txt' ':!hermetic_library_generation.sh'
102103
changed_files=$(git diff --cached --name-only)
103-
if [[ "${changed_files}" == "" ]]; then
104-
echo "There is no generated code change with the generation config change ${config_diff}."
105-
echo "Skip committing to the pull request."
106-
exit 0
104+
if [[ "${changed_files}" != "" ]]; then
105+
echo "Commit changes..."
106+
git commit -m "${message}"
107+
git push
108+
else
109+
echo "There is no generated code change, skip commit."
107110
fi
108111

109-
echo "Configuration diff:"
110-
echo "${config_diff}"
111-
git commit -m "${message}"
112-
git push
113112
# set pr body if pr_description.txt is generated.
114113
if [[ -f "pr_description.txt" ]]; then
115114
pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
5050
If you are using Gradle 5.x or later, add this to your dependencies:
5151

5252
```Groovy
53-
implementation platform('com.google.cloud:libraries-bom:26.45.0')
53+
implementation platform('com.google.cloud:libraries-bom:26.47.0')
5454
5555
implementation 'com.google.cloud:google-cloud-bigtable'
5656
```
5757
If you are using Gradle without BOM, add this to your dependencies:
5858

5959
```Groovy
60-
implementation 'com.google.cloud:google-cloud-bigtable:2.43.0'
60+
implementation 'com.google.cloud:google-cloud-bigtable:2.44.0'
6161
```
6262

6363
If you are using SBT, add this to your dependencies:
6464

6565
```Scala
66-
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.43.0"
66+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.44.0"
6767
```
6868
<!-- {x-version-update-end} -->
6969

@@ -545,7 +545,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
545545
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html
546546
[stability-image]: https://img.shields.io/badge/stability-stable-green
547547
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg
548-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.43.0
548+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.44.0
549549
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
550550
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
551551
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.45.0
2-
googleapis_commitish: 65306b92f03408d6de03589bdf970b78f2e4055c
3-
libraries_bom_version: 26.45.0
1+
gapic_generator_version: 2.46.1
2+
googleapis_commitish: 16a1580c06b3b32e8ab33c39d846bba7e21bfae3
3+
libraries_bom_version: 26.47.0
44
template_excludes:
55
- .gitignore
66
- .kokoro/presubmit/integration.cfg

‎google-cloud-bigtable/src/main/resources/META-INF/native-image/com.google.cloud.bigtable.admin.v2/reflect-config.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,15 @@
800800
"allDeclaredClasses": true,
801801
"allPublicClasses": true
802802
},
803+
{
804+
"name": "com.google.bigtable.admin.v2.Cluster$NodeScalingFactor",
805+
"queryAllDeclaredConstructors": true,
806+
"queryAllPublicConstructors": true,
807+
"queryAllDeclaredMethods": true,
808+
"allPublicMethods": true,
809+
"allDeclaredClasses": true,
810+
"allPublicClasses": true
811+
},
803812
{
804813
"name": "com.google.bigtable.admin.v2.Cluster$State",
805814
"queryAllDeclaredConstructors": true,

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ public void updateClusterTest() throws Exception {
911911
Assert.assertEquals(request.getLocation(), actualRequest.getLocation());
912912
Assert.assertEquals(request.getState(), actualRequest.getState());
913913
Assert.assertEquals(request.getServeNodes(), actualRequest.getServeNodes());
914+
Assert.assertEquals(request.getNodeScalingFactor(), actualRequest.getNodeScalingFactor());
914915
Assert.assertEquals(request.getClusterConfig(), actualRequest.getClusterConfig());
915916
Assert.assertEquals(request.getDefaultStorageType(), actualRequest.getDefaultStorageType());
916917
Assert.assertEquals(request.getEncryptionConfig(), actualRequest.getEncryptionConfig());

‎proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/bigtable/admin/v2/instance.proto
1818

19-
// Protobuf Java Version: 3.25.4
19+
// Protobuf Java Version: 3.25.5
2020
package com.google.bigtable.admin.v2;
2121

2222
/**
@@ -4624,7 +4624,7 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting getSingleClu
46244624
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
46254625
*
46264626
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
4627-
* google/bigtable/admin/v2/instance.proto;l=386
4627+
* google/bigtable/admin/v2/instance.proto;l=405
46284628
* @return Whether the priority field is set.
46294629
*/
46304630
@java.lang.Deprecated
@@ -4644,7 +4644,7 @@ public boolean hasPriority() {
46444644
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
46454645
*
46464646
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
4647-
* google/bigtable/admin/v2/instance.proto;l=386
4647+
* google/bigtable/admin/v2/instance.proto;l=405
46484648
* @return The enum numeric value on the wire for priority.
46494649
*/
46504650
@java.lang.Deprecated
@@ -4667,7 +4667,7 @@ public int getPriorityValue() {
46674667
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
46684668
*
46694669
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
4670-
* google/bigtable/admin/v2/instance.proto;l=386
4670+
* google/bigtable/admin/v2/instance.proto;l=405
46714671
* @return The priority.
46724672
*/
46734673
@java.lang.Deprecated
@@ -6261,7 +6261,7 @@ public Builder clearSingleClusterRouting() {
62616261
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
62626262
*
62636263
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
6264-
* google/bigtable/admin/v2/instance.proto;l=386
6264+
* google/bigtable/admin/v2/instance.proto;l=405
62656265
* @return Whether the priority field is set.
62666266
*/
62676267
@java.lang.Override
@@ -6282,7 +6282,7 @@ public boolean hasPriority() {
62826282
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
62836283
*
62846284
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
6285-
* google/bigtable/admin/v2/instance.proto;l=386
6285+
* google/bigtable/admin/v2/instance.proto;l=405
62866286
* @return The enum numeric value on the wire for priority.
62876287
*/
62886288
@java.lang.Override
@@ -6306,7 +6306,7 @@ public int getPriorityValue() {
63066306
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
63076307
*
63086308
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
6309-
* google/bigtable/admin/v2/instance.proto;l=386
6309+
* google/bigtable/admin/v2/instance.proto;l=405
63106310
* @param value The enum numeric value on the wire for priority to set.
63116311
* @return This builder for chaining.
63126312
*/
@@ -6330,7 +6330,7 @@ public Builder setPriorityValue(int value) {
63306330
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
63316331
*
63326332
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
6333-
* google/bigtable/admin/v2/instance.proto;l=386
6333+
* google/bigtable/admin/v2/instance.proto;l=405
63346334
* @return The priority.
63356335
*/
63366336
@java.lang.Override
@@ -6359,7 +6359,7 @@ public com.google.bigtable.admin.v2.AppProfile.Priority getPriority() {
63596359
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
63606360
*
63616361
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
6362-
* google/bigtable/admin/v2/instance.proto;l=386
6362+
* google/bigtable/admin/v2/instance.proto;l=405
63636363
* @param value The priority to set.
63646364
* @return This builder for chaining.
63656365
*/
@@ -6386,7 +6386,7 @@ public Builder setPriority(com.google.bigtable.admin.v2.AppProfile.Priority valu
63866386
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
63876387
*
63886388
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
6389-
* google/bigtable/admin/v2/instance.proto;l=386
6389+
* google/bigtable/admin/v2/instance.proto;l=405
63906390
* @return This builder for chaining.
63916391
*/
63926392
@java.lang.Deprecated

‎proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileOrBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/bigtable/admin/v2/instance.proto
1818

19-
// Protobuf Java Version: 3.25.4
19+
// Protobuf Java Version: 3.25.5
2020
package com.google.bigtable.admin.v2;
2121

2222
public interface AppProfileOrBuilder
@@ -209,7 +209,7 @@ public interface AppProfileOrBuilder
209209
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
210210
*
211211
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
212-
* google/bigtable/admin/v2/instance.proto;l=386
212+
* google/bigtable/admin/v2/instance.proto;l=405
213213
* @return Whether the priority field is set.
214214
*/
215215
@java.lang.Deprecated
@@ -227,7 +227,7 @@ public interface AppProfileOrBuilder
227227
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
228228
*
229229
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
230-
* google/bigtable/admin/v2/instance.proto;l=386
230+
* google/bigtable/admin/v2/instance.proto;l=405
231231
* @return The enum numeric value on the wire for priority.
232232
*/
233233
@java.lang.Deprecated
@@ -245,7 +245,7 @@ public interface AppProfileOrBuilder
245245
* <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
246246
*
247247
* @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
248-
* google/bigtable/admin/v2/instance.proto;l=386
248+
* google/bigtable/admin/v2/instance.proto;l=405
249249
* @return The priority.
250250
*/
251251
@java.lang.Deprecated

‎proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AuthorizedView.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/bigtable/admin/v2/table.proto
1818

19-
// Protobuf Java Version: 3.25.4
19+
// Protobuf Java Version: 3.25.5
2020
package com.google.bigtable.admin.v2;
2121

2222
/**

‎proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AuthorizedViewOrBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/bigtable/admin/v2/table.proto
1818

19-
// Protobuf Java Version: 3.25.4
19+
// Protobuf Java Version: 3.25.5
2020
package com.google.bigtable.admin.v2;
2121

2222
public interface AuthorizedViewOrBuilder

‎proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AutoscalingLimits.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/bigtable/admin/v2/instance.proto
1818

19-
// Protobuf Java Version: 3.25.4
19+
// Protobuf Java Version: 3.25.5
2020
package com.google.bigtable.admin.v2;
2121

2222
/**

0 commit comments

Comments
 (0)