Skip to content

Commit f454b5e

Browse files
nidhiii-27nidhiii-27
authored
Merge branch 'googleapis:main' into encryption-config-samples
2 parents 406dc67 + 8b6e3b6 commit f454b5e

340 files changed

Lines changed: 21410 additions & 16653 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/CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# For syntax help see:
55
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
66

7-
# The @googleapis/gcs-sdk-team is the default owner for changes in this repo
8-
* @googleapis/yoshi-java @googleapis/gcs-sdk-team
7+
# The @googleapis/gcs-team is the default owner for changes in this repo
8+
* @googleapis/cloud-sdk-java-team @googleapis/gcs-team
99

1010
# for handwritten libraries, keep codeowner_team in .repo-metadata.json as owner
11-
**/*.java @googleapis/gcs-sdk-team
11+
**/*.java @googleapis/gcs-team
1212

1313

1414
# The java-samples-reviewers team is the default owner for samples changes
1515
samples/**/*.java @googleapis/java-samples-reviewers
1616

1717
# Generated snippets should not be owned by samples reviewers
18-
samples/snippets/generated/ @googleapis/yoshi-java
18+
samples/snippets/generated/ @googleapis/cloud-sdk-java-team

‎.github/release-please.yml‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,32 @@ extraFiles:
55
- README.md
66
- .readme-partials.yaml
77
branches:
8-
- bumpMinorPreMajor: true
9-
handleGHRelease: true
8+
- branch: 1.113.14-sp
109
releaseType: java-lts
11-
branch: 1.113.14-sp
12-
- bumpMinorPreMajor: true
13-
handleGHRelease: true
14-
releaseType: java-yoshi
15-
branch: 1.106.1-patch
16-
- bumpMinorPreMajor: true
17-
handleGHRelease: true
18-
releaseType: java-yoshi
19-
branch: 1.111.3-patch
20-
- bumpMinorPreMajor: true
21-
handleGHRelease: true
22-
releaseType: java-yoshi
23-
branch: java7
24-
- bumpMinorPreMajor: true
25-
handleGHRelease: true
26-
releaseType: java-yoshi
27-
branch: 2.1.x
28-
- bumpMinorPreMajor: true
29-
handleGHRelease: true
10+
- branch: 1.106.1-patch
11+
- branch: 1.111.3-patch
12+
- branch: java7
13+
- branch: 2.1.x
14+
- branch: 2.6.x
3015
releaseType: java-backport
31-
branch: 2.6.x
32-
- bumpMinorPreMajor: true
33-
handleGHRelease: true
16+
- branch: 2.15.x
3417
releaseType: java-backport
35-
branch: 2.15.x
36-
- bumpMinorPreMajor: true
37-
handleGHRelease: true
18+
- branch: 2.22.x
3819
releaseType: java-backport
39-
extraFiles:
40-
- README.md
41-
branch: 2.22.x
42-
- bumpMinorPreMajor: true
43-
handleGHRelease: true
20+
- branch: 2.30.x
4421
releaseType: java-backport
45-
extraFiles:
46-
- README.md
47-
branch: 2.30.x
48-
- bumpMinorPreMajor: true
49-
handleGHRelease: true
22+
- branch: 2.38.x
5023
releaseType: java-backport
51-
extraFiles:
52-
- README.md
53-
- .readme-partials.yaml
54-
branch: 2.38.x
55-
- bumpMinorPreMajor: true
56-
handleGHRelease: true
24+
- branch: 2.47.x
5725
releaseType: java-backport
58-
extraFiles:
59-
- README.md
60-
- .readme-partials.yaml
61-
branch: 2.47.x
26+
- branch: 2.49.x
27+
releaseType: java-backport
28+
- branch: protobuf-4.x-rc
29+
manifest: true
6230
- bumpMinorPreMajor: true
6331
handleGHRelease: true
6432
releaseType: java-backport
6533
extraFiles:
6634
- README.md
6735
- .readme-partials.yaml
68-
branch: 2.49.x
36+
branch: 2.62.x

‎.github/scripts/update_generation_config.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,17 @@ function get_latest_released_version() {
1818
group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
1919
url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
2020
xml_content=$(curl -s --fail "${url}")
21-
latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
21+
22+
# 1. Extract all version tags
23+
# 2. Strip the XML tags to leave just the version numbers
24+
# 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
25+
# 4. Sort by version (V) and take the last one (tail -n 1)
26+
latest=$(echo "${xml_content}" \
27+
| grep -oE '<version>[0-9]+\.[0-9]+\.[0-9]+</version>' \
28+
| sed -E 's/<[^>]+>//g' \
29+
| sort -V \
30+
| tail -n 1)
31+
2232
if [[ -z "${latest}" ]]; then
2333
echo "The latest version of ${group_id}:${artifact_id} is empty."
2434
echo "The returned json from maven.org is invalid: ${json_content}"

‎.github/sync-repo-settings.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,27 @@ branchProtectionRules:
197197
- 'Kokoro - Test: Java 17 GraalVM Native Image'
198198
- javadoc
199199
- unmanaged_dependency_check
200+
- pattern: 2.62.x
201+
isAdminEnforced: true
202+
requiredApprovingReviewCount: 1
203+
requiresCodeOwnerReviews: true
204+
requiresStrictStatusChecks: false
205+
requiredStatusCheckContexts:
206+
- dependencies (17)
207+
- lint
208+
- clirr
209+
- units (8)
210+
- units (11)
211+
- 'Kokoro - Test: Integration'
212+
- cla/google
213+
- 'Kokoro - Test: Java GraalVM Native Image'
214+
- 'Kokoro - Test: Java 17 GraalVM Native Image'
215+
- javadoc
216+
- unmanaged_dependency_check
200217
permissionRules:
201218
- team: yoshi-admins
202219
permission: admin
203220
- team: yoshi-java-admins
204221
permission: admin
205-
- team: yoshi-java
222+
- team: cloud-sdk-java-team
206223
permission: push

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
name: Hermetic library generation upon generation config change through pull requests
1717
on:
1818
pull_request:
19-
paths:
20-
- 'generation_config.yaml'
21-
- '.readme-partials.yaml'
22-
- 'owlbot.py'
23-
- 'versions.txt'
24-
- '.github/.OwlBot-hermetic.yaml'
2519

2620
env:
2721
REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
@@ -38,14 +32,55 @@ jobs:
3832
else
3933
echo "SHOULD_RUN=true" >> $GITHUB_ENV
4034
fi
41-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
4236
if: env.SHOULD_RUN == 'true'
4337
with:
4438
fetch-depth: 0
45-
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
46-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.64.0
39+
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
40+
- name: is applicable
41+
if: env.SHOULD_RUN == 'true'
42+
env:
43+
# set our branch names to be the names in the "origin" remote since we aren't actually checking these branches out
44+
base_ref: origin/${{ github.base_ref }}
45+
head_ref: origin/${{ github.head_ref }}
46+
run: |
47+
#!/bin/bash -x
48+
49+
# verify we have refs so error messages are clearer
50+
git rev-parse --verify "$base_ref"
51+
git rev-parse --verify "$head_ref"
52+
53+
# list all paths that are changed between before and after
54+
changed_paths=$(git diff --name-only "$base_ref" "$head_ref")
55+
56+
# define our array of paths that are included
57+
include_list=()
58+
59+
# push our include regex values onto the array
60+
include_list+=("^.github/workflows/hermetic_library_generation.yaml$")
61+
include_list+=("^generation_config.yaml$")
62+
include_list+=("^.readme-partials.yaml$")
63+
include_list+=("^owlbot.py$")
64+
include_list+=("^versions.txt$")
65+
include_list+=("^.github/.OwlBot-hermetic.yaml$")
66+
67+
# join all the paths into a single regex
68+
pattern="$(IFS=$'|' ; echo "${include_list[*]}")"
69+
70+
# check if we have any paths that match our include list
71+
match=0
72+
echo -e "${changed_paths}" | grep -E "${pattern}" 2>&1 || match=1
73+
74+
if [[ $match == 0 ]]; then
75+
echo "SHOULD_RUN=true" >> $GITHUB_ENV
76+
else
77+
echo "This PR does not match the include list"
78+
echo "SHOULD_RUN=false" >> $GITHUB_ENV
79+
fi
80+
81+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.67.0
4782
if: env.SHOULD_RUN == 'true'
4883
with:
4984
base_ref: ${{ github.base_ref }}
5085
head_ref: ${{ github.head_ref }}
51-
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
86+
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
unmanaged_dependency_check:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v5
8+
- uses: actions/checkout@v6
99
- uses: actions/setup-java@v3
1010
with:
1111
distribution: temurin
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.53.0
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.57.0
2121
with:
2222
bom-path: google-cloud-storage-bom/pom.xml

‎.github/workflows/update_generation_config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
32-
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
32+
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
3333
- name: Install Dependencies
3434
shell: bash
3535
run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -43,5 +43,5 @@ jobs:
4343
--base_branch "${base_branch}" \
4444
--repo ${{ github.repository }}
4545
env:
46-
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
46+
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
4747

‎.kokoro/presubmit/graalvm-native-a.cfg‎

Lines changed: 1 addition & 1 deletion
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.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-b.cfg‎

Lines changed: 1 addition & 1 deletion
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_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-c.cfg‎

Lines changed: 1 addition & 1 deletion
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_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

0 commit comments

Comments
 (0)