Skip to content

Commit 1ed6236

Browse files
logachevlogachev
authored
Merge branch 'main' into kirl/parser_no_error
2 parents 53dd6c8 + 4e18407 commit 1ed6236

File tree

228 files changed

+64862
-1540
lines changed

Some content is hidden

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

228 files changed

+64862
-1540
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1414
/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team
1515
/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team
16+
/java-storage-nio/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team

‎.github/header-checker-lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
allowedCopyrightHolders:
22
- 'Google LLC'
3+
- 'Google Inc'
34
- 'The Grafeas Authors'

‎.github/workflows/ci.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,9 @@ jobs:
220220
cache: maven
221221
- run: java -version
222222
- name: Install Maven modules to local Maven repository
223-
run: |
224-
mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip
223+
run: .kokoro/build.sh
224+
env:
225+
JOB_TYPE: install
225226
- run: java -version
226227
- run: mvn -B -ntp enforcer:enforce@enforce -T 1C
227228
gapic-libraries-bom:
@@ -234,8 +235,9 @@ jobs:
234235
distribution: temurin
235236
cache: maven
236237
- name: Install Maven modules to local Maven repository
237-
run: |
238-
mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
238+
run: .kokoro/build.sh
239+
env:
240+
JOB_TYPE: install
239241
- name: Validate gapic-libraries-bom
240242
uses: googleapis/java-cloud-bom/tests/validate-bom@v26.79.0
241243
with:

‎.github/workflows/java-storage-nio-ci.yaml‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
# Copyright 2022 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# Github action job to test core java library features on
15+
# downstream client libraries before they are released.
16+
on:
17+
push:
18+
branches:
19+
- main
20+
pull_request:
21+
name: java-storage-nio ci
22+
env:
23+
BUILD_SUBDIR: java-storage-nio
24+
jobs:
25+
filter:
26+
runs-on: ubuntu-latest
27+
outputs:
28+
library: ${{ steps.filter.outputs.library }}
29+
steps:
30+
- uses: actions/checkout@v4
31+
- uses: dorny/paths-filter@v3
32+
id: filter
33+
with:
34+
filters: |
35+
library:
36+
- 'java-storage-nio/**'
37+
units:
38+
needs: filter
39+
if: ${{ needs.filter.outputs.library == 'true' }}
40+
runs-on: ubuntu-latest
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
java: [11, 17, 21, 25]
45+
steps:
46+
- uses: actions/checkout@v4
47+
- uses: actions/setup-java@v4
48+
with:
49+
distribution: temurin
50+
java-version: ${{matrix.java}}
51+
- run: java -version
52+
- run: .kokoro/build.sh
53+
env:
54+
JOB_TYPE: test
55+
units-java8:
56+
needs: filter
57+
if: ${{ needs.filter.outputs.library == 'true' }}
58+
# Building using Java 17 and run the tests with Java 8 runtime
59+
name: "units (8)"
60+
runs-on: ubuntu-latest
61+
steps:
62+
- uses: actions/checkout@v4
63+
- uses: actions/setup-java@v4
64+
with:
65+
java-version: 8
66+
distribution: temurin
67+
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
68+
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
69+
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
70+
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java -P !java17" >> $GITHUB_ENV
71+
shell: bash
72+
- uses: actions/setup-java@v4
73+
with:
74+
java-version: 17
75+
distribution: temurin
76+
- run: .kokoro/build.sh
77+
env:
78+
JOB_TYPE: test
79+
windows:
80+
needs: filter
81+
if: ${{ needs.filter.outputs.library == 'true' }}
82+
runs-on: windows-latest
83+
steps:
84+
- name: Support longpaths
85+
run: git config --system core.longpaths true
86+
- name: Support longpaths
87+
run: git config --system core.longpaths true
88+
- uses: actions/checkout@v4
89+
- uses: actions/setup-java@v4
90+
with:
91+
distribution: temurin
92+
java-version: 8
93+
- run: java -version
94+
- run: .kokoro/build.sh
95+
env:
96+
JOB_TYPE: test
97+
dependencies:
98+
needs: filter
99+
if: ${{ needs.filter.outputs.library == 'true' }}
100+
runs-on: ubuntu-latest
101+
strategy:
102+
matrix:
103+
java: [17]
104+
steps:
105+
- uses: actions/checkout@v4
106+
- uses: actions/setup-java@v4
107+
with:
108+
distribution: temurin
109+
java-version: ${{matrix.java}}
110+
- run: java -version
111+
- run: .kokoro/dependencies.sh
112+
javadoc:
113+
needs: filter
114+
if: ${{ needs.filter.outputs.library == 'true' }}
115+
runs-on: ubuntu-latest
116+
steps:
117+
- uses: actions/checkout@v4
118+
- uses: actions/setup-java@v4
119+
with:
120+
distribution: temurin
121+
java-version: 17
122+
- run: java -version
123+
- run: .kokoro/build.sh
124+
env:
125+
JOB_TYPE: javadoc
126+
lint:
127+
needs: filter
128+
if: ${{ needs.filter.outputs.library == 'true' }}
129+
runs-on: ubuntu-latest
130+
steps:
131+
- uses: actions/checkout@v4
132+
with:
133+
fetch-depth: 0
134+
- uses: actions/setup-java@v4
135+
with:
136+
distribution: temurin
137+
java-version: 17
138+
- run: java -version
139+
- run: .kokoro/build.sh
140+
env:
141+
JOB_TYPE: lint
142+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
143+
BASE_SHA: ${{ github.event.pull_request.base.sha }}

‎.github/workflows/sdk-platform-java-nightly.yaml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,8 @@ on:
66
defaults:
77
run:
88
shell: bash
9-
env:
10-
BUILD_SUBDIR: sdk-platform-java
119
jobs:
12-
filter:
13-
runs-on: ubuntu-latest
14-
outputs:
15-
library: ${{ steps.filter.outputs.library }}
16-
steps:
17-
- uses: actions/checkout@v4
18-
- uses: dorny/paths-filter@v3
19-
id: filter
20-
with:
21-
filters: |
22-
library:
23-
- 'sdk-platform-java/**'
2410
nightly:
25-
needs: filter
26-
if: ${{ needs.filter.outputs.library == 'true' }}
2711
strategy:
2812
fail-fast: false
2913
matrix:
@@ -39,8 +23,15 @@ jobs:
3923
distribution: temurin
4024
cache: maven
4125
- run: mvn -version
26+
- name: Install all modules first
27+
shell: bash
28+
run: .kokoro/build.sh
29+
env:
30+
BUILD_SUBDIR: sdk-platform-java
31+
JOB_TYPE: install
4232
- name: Install
4333
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -Dfmt.skip
34+
working-directory: sdk-platform-java
4435
- name: Create issue if previous step fails
4536
if: ${{ failure() }}
4637
env:
@@ -50,8 +41,6 @@ jobs:
5041
--title "Nightly build for Java ${{ matrix.java }} on ${{ matrix.os }} failed." \
5142
--body "The build has failed : https://github.com/googleapis/google-cloud-java/actions/runs/${GITHUB_RUN_ID}"
5243
nightly-java8: # Compile with JDK 11. Run tests with JDK 8.
53-
needs: filter
54-
if: ${{ needs.filter.outputs.library == 'true' }}
5544
strategy:
5645
fail-fast: false
5746
matrix:
@@ -66,9 +55,12 @@ jobs:
6655
distribution: temurin
6756
cache: maven
6857
- run: mvn -version
69-
- name: Install with Java 11
70-
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests -Dfmt.skip
71-
58+
- name: Install all modules first
59+
shell: bash
60+
run: .kokoro/build.sh
61+
env:
62+
BUILD_SUBDIR: sdk-platform-java
63+
JOB_TYPE: install
7264
- uses: actions/setup-java@v5
7365
with:
7466
java-version: 8
@@ -77,6 +69,7 @@ jobs:
7769
- name: Test with Java 8
7870
# Direct goal invocation ("surefire:test") prevents recompiling tests
7971
run: mvn surefire:test --errors --batch-mode --no-transfer-progress -Dfmt.skip
72+
working-directory: sdk-platform-java
8073
- name: Create issue if previous step fails
8174
if: ${{ failure() }}
8275
env:

‎.kokoro/common.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ excluded_modules=(
3333
'java-spanner-jdbc'
3434
'google-auth-library-java'
3535
'java-storage'
36+
'java-storage-nio'
3637
)
3738

3839
function retry_with_backoff {
@@ -422,6 +423,16 @@ function install_modules() {
422423
'sdk-platform-java/java-shared-dependencies/first-party-dependencies'
423424
'sdk-platform-java/java-shared-dependencies/third-party-dependencies'
424425
'sdk-platform-java/gapic-generator-java-bom'
426+
'sdk-platform-java/java-iam/grpc-google-iam-v1'
427+
'sdk-platform-java/java-iam/grpc-google-iam-v2'
428+
'sdk-platform-java/java-iam/grpc-google-iam-v2beta'
429+
'sdk-platform-java/java-iam/grpc-google-iam-v3'
430+
'sdk-platform-java/java-iam/grpc-google-iam-v3beta'
431+
'sdk-platform-java/java-iam/proto-google-iam-v1'
432+
'sdk-platform-java/java-iam/proto-google-iam-v2'
433+
'sdk-platform-java/java-iam/proto-google-iam-v2beta'
434+
'sdk-platform-java/java-iam/proto-google-iam-v3'
435+
'sdk-platform-java/java-iam/proto-google-iam-v3beta'
425436
'sdk-platform-java/java-core/google-cloud-core-bom'
426437
'sdk-platform-java/java-core/google-cloud-core'
427438
'sdk-platform-java/java-core/google-cloud-core-grpc'

‎.kokoro/presubmit/storage-nio-graalvm-native-presubmit.cfg‎

Lines changed: 38 additions & 0 deletions
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_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm-single"
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: "BUILD_SUBDIR"
37+
value: "java-storage-nio"
38+
}

‎.kokoro/presubmit/storage-nio-integration.cfg‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
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+
36+
env_vars: {
37+
key: "BUILD_SUBDIR"
38+
value: "java-storage-nio"
39+
}

‎gapic-libraries-bom/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,13 @@
957957
<type>pom</type>
958958
<scope>import</scope>
959959
</dependency>
960+
<dependency>
961+
<groupId>com.google.cloud</groupId>
962+
<artifactId>google-cloud-nio-bom</artifactId>
963+
<version>0.128.15-SNAPSHOT</version><!-- {x-version-update:google-cloud-nio:current} -->
964+
<type>pom</type>
965+
<scope>import</scope>
966+
</dependency>
960967
<dependency>
961968
<groupId>com.google.cloud</groupId>
962969
<artifactId>google-cloud-notebooks-bom</artifactId>

‎generation/check_non_release_please_versions.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
1717
[[ "${pomFile}" =~ .*java-spanner-jdbc.* ]] || \
1818
[[ "${pomFile}" =~ .*google-auth-library-java.* ]] || \
1919
[[ "${pomFile}" =~ .*java-storage.* ]] || \
20+
[[ "${pomFile}" =~ .*java-storage-nio.* ]] || \
2021
[[ "${pomFile}" =~ .*.github*. ]]; then
2122
continue
2223
fi

0 commit comments

Comments
 (0)