Skip to content

Commit 4472d7b

Browse files
chore: Update generation configuration at Thu Apr 24 02:32:32 UTC 2025 (#2395)
* chore: Update generation configuration at Wed Apr 23 17:12:15 UTC 2025 * chore: generate libraries at Wed Apr 23 17:12:45 UTC 2025 * chore: Update generation configuration at Thu Apr 24 02:32:32 UTC 2025 * chore: manually update generation configuration * chore: generate libraries at Thu Apr 24 14:50:47 UTC 2025 * chore: manually update libraries bom version * chore: generate libraries at Thu Apr 24 14:59:23 UTC 2025 * chore: use spotify fmt plugin in build.sh * chore: remove old graalvm jobs --------- Co-authored-by: Diego Marquez <[email protected]>
1 parent f904786 commit 4472d7b

File tree

170 files changed

+4320
-527
lines changed

Some content is hidden

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

170 files changed

+4320
-527
lines changed

.github/generated-files-bot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ externalManifests:
66
file: '.github/readme/synth.metadata/synth.metadata'
77
jsonpath: '$.generatedFiles[*]'
88
ignoreAuthors:
9+
- 'cloud-java-bot'
910
- 'renovate-bot'
1011
- 'yoshi-automation'
1112
- 'release-please[bot]'

.github/scripts/update_generation_config.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,15 @@ set -e
1515
function get_latest_released_version() {
1616
local group_id=$1
1717
local artifact_id=$2
18-
latest=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json" | jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' | sort -V | tail -n 1)
19-
echo "${latest}"
18+
json_content=$(curl -s "https://search.maven.org/solrsearch/select?q=g:${group_id}+AND+a:${artifact_id}&core=gav&rows=500&wt=json")
19+
latest=$(jq -r '.response.docs[] | select(.v | test("^[0-9]+(\\.[0-9]+)*$")) | .v' <<< "${json_content}" | sort -V | tail -n 1)
20+
if [[ -z "${latest}" ]]; then
21+
echo "The latest version of ${group_id}:${artifact_id} is empty."
22+
echo "The returned json from maven.org is invalid: ${json_content}"
23+
exit 1
24+
else
25+
echo "${latest}"
26+
fi
2027
}
2128

2229
# Update a key to a new value in the generation config.

.github/sync-repo-settings.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ branchProtectionRules:
1515
- units (11)
1616
- 'Kokoro - Test: Integration'
1717
- cla/google
18-
- 'Kokoro - Test: Java GraalVM Native Image'
19-
- 'Kokoro - Test: Java 17 GraalVM Native Image'
18+
- 'Kokoro - Test: Java GraalVM Native Image A'
19+
- 'Kokoro - Test: Java GraalVM Native Image B'
20+
- 'Kokoro - Test: Java GraalVM Native Image C'
2021
- javadoc
2122
- library_generation
2223
- unmanaged_dependency_check

.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

.github/workflows/hermetic_library_generation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.55.1
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.56.2
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

.github/workflows/renovate_config_check.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
renovate_bot_config_validation:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111

1212
steps:
1313
- name: Checkout code
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Node.js
1717
uses: actions/setup-node@v4
1818
with:
19-
node-version: '20'
19+
node-version: '22'
2020

2121
- name: Install Renovate and Config Validator
2222
run: |

.github/workflows/update_generation_config.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
31+
fetch-depth: 0
3132
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
3233
- name: Update params in generation config to latest
3334
shell: bash
@@ -36,7 +37,8 @@ jobs:
3637
[ -z "$(git config user.email)" ] && git config --global user.email "[email protected]"
3738
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
3839
bash .github/scripts/update_generation_config.sh \
39-
--base_branch "${base_branch}"\
40+
--base_branch "${base_branch}" \
4041
--repo ${{ github.repository }}
4142
env:
4243
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
44+

.kokoro/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ test)
5252
RETURN_CODE=$?
5353
;;
5454
lint)
55-
mvn com.coveo:fmt-maven-plugin:check
55+
mvn com.spotify.fmt:fmt-maven-plugin:check
5656
RETURN_CODE=$?
5757
;;
5858
javadoc)

.kokoro/presubmit/graalvm-native.cfg renamed to .kokoro/presubmit/graalvm-native-a.cfg

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {
@@ -31,3 +31,8 @@ env_vars: {
3131
key: "SECRET_MANAGER_KEYS"
3232
value: "java-it-service-account"
3333
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
38+
}

.kokoro/presubmit/graalvm-native-17.cfg renamed to .kokoro/presubmit/graalvm-native-b.cfg

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.45.1"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {
1010
key: "JOB_TYPE"
11-
value: "graalvm17"
11+
value: "graalvm"
1212
}
1313

1414
# TODO: remove this after we've migrated all tests and scripts
@@ -30,4 +30,9 @@ env_vars: {
3030
env_vars: {
3131
key: "SECRET_MANAGER_KEYS"
3232
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
3338
}
+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
38+
}

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Code in this repo is formatted with
8484
[google-java-format](https://github.com/google/google-java-format).
8585
To run formatting on your project, you can run:
8686
```
87-
mvn com.coveo:fmt-maven-plugin:format
87+
mvn com.spotify.fmt:fmt-maven-plugin:format
8888
```
8989

9090
[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If you are using Maven without the BOM, add this to your dependencies:
5151
If you are using Gradle 5.x or later, add this to your dependencies:
5252

5353
```Groovy
54-
implementation platform('com.google.cloud:libraries-bom:26.58.0')
54+
implementation platform('com.google.cloud:libraries-bom:26.59.0')
5555
5656
implementation 'com.google.cloud:google-cloud-pubsub'
5757
```

generation_config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.55.1
2-
googleapis_commitish: 2b63b9276dca4d5046470fe5e1022bd982629f62
3-
libraries_bom_version: 26.58.0
1+
gapic_generator_version: 2.56.2
2+
googleapis_commitish: 261895f1d8ced9564f4cf872f7f4f9a1f4c615d3
3+
libraries_bom_version: 26.59.0
44
libraries:
55
- api_shortname: pubsub
66
name_pretty: Cloud Pub/Sub

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumerWithResponse.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
* processing code is idempotent, as you may receive any given message more than once.
3535
*/
3636
@BetaApi(
37-
"This is a preview feature. For more details, see https://cloud.google.com/pubsub/docs/exactly-once-delivery.")
37+
"This is a preview feature. For more details, see"
38+
+ " https://cloud.google.com/pubsub/docs/exactly-once-delivery.")
3839
public interface AckReplyConsumerWithResponse {
3940
/**
4041
* Acknowledges that the message has been successfully processed. The service will not send the

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,7 @@ private Subscriber(Builder builder) {
185185

186186
flowController =
187187
new FlowController(
188-
builder
189-
.flowControlSettings
190-
.toBuilder()
188+
builder.flowControlSettings.toBuilder()
191189
.setLimitExceededBehavior(LimitExceededBehavior.Block)
192190
.build());
193191

google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/stub/HttpJsonSubscriberStub.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,8 @@ public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
12231223
public BidiStreamingCallable<StreamingPullRequest, StreamingPullResponse>
12241224
streamingPullCallable() {
12251225
throw new UnsupportedOperationException(
1226-
"Not implemented: streamingPullCallable(). REST transport is not implemented for this method yet.");
1226+
"Not implemented: streamingPullCallable(). REST transport is not implemented for this"
1227+
+ " method yet.");
12271228
}
12281229

12291230
@Override

google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,8 @@ public void listTopicSubscriptions(
189189
responseObserver.onError(
190190
new IllegalArgumentException(
191191
String.format(
192-
"Unrecognized response type %s for method ListTopicSubscriptions, expected %s or %s",
192+
"Unrecognized response type %s for method ListTopicSubscriptions, expected %s or"
193+
+ " %s",
193194
response == null ? "null" : response.getClass().getName(),
194195
ListTopicSubscriptionsResponse.class.getName(),
195196
Exception.class.getName())));

google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ public void deleteSchemaRevision(
212212
responseObserver.onError(
213213
new IllegalArgumentException(
214214
String.format(
215-
"Unrecognized response type %s for method DeleteSchemaRevision, expected %s or %s",
215+
"Unrecognized response type %s for method DeleteSchemaRevision, expected %s or"
216+
+ " %s",
216217
response == null ? "null" : response.getClass().getName(),
217218
Schema.class.getName(),
218219
Exception.class.getName())));

google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ public void onNext(StreamingPullRequest value) {
265265
responseObserver.onError(
266266
new IllegalArgumentException(
267267
String.format(
268-
"Unrecognized response type %s for method StreamingPull, expected %s or %s",
268+
"Unrecognized response type %s for method StreamingPull, expected %s or"
269+
+ " %s",
269270
response == null ? "null" : response.getClass().getName(),
270271
StreamingPullResponse.class.getName(),
271272
Exception.class.getName())));

0 commit comments

Comments
 (0)