Skip to content

Commit f0b005e

Browse files
authored
Merge branch 'main' into dependabot/pip/dot-github/requests-2.33.0
2 parents a5c6728 + 76cbf2b commit f0b005e

File tree

250 files changed

+61727
-18
lines changed

Some content is hidden

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

250 files changed

+61727
-18
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
/java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
1212
/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1313
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
14+
/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ jobs:
173173
|grep --invert-match 'java/com/google' \
174174
|grep --invert-match '/test/' \
175175
|grep --invert-match '/tests/' \
176+
|grep --invert-match '/javatests/' \
176177
|grep --invert-match samples \
177178
|grep --invert-match benchmark \
178179
|grep --invert-match grafeas \
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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: google-auth-library-java ci
22+
env:
23+
BUILD_SUBDIR: google-auth-library-java
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+
- 'google-auth-library-java/**'
37+
units-logging:
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+
BUILD_SUBDIR: google-auth-library-java
55+
JOB_TYPE: test
56+
SUREFIRE_JVM_OPT: "-P '!slf4j2x,slf4j2x-test'"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ jobs:
8484
run: |
8585
gh issue create \
8686
--title "Nightly-java8 build on ${{ matrix.os }} failed." \
87-
--body "The build has failed : https://github.com/googleapis/gapic-generator-java/actions/runs/${GITHUB_RUN_ID}"
87+
--body "The build has failed : https://github.com/googleapis/google-cloud-java/actions/runs/${GITHUB_RUN_ID}"

.kokoro/common.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ excluded_modules=(
3131
'sdk-platform-java/java-showcase-3.25.8'
3232
'java-spanner'
3333
'java-spanner-jdbc'
34+
'google-auth-library-java'
3435
)
3536

3637
function retry_with_backoff {
@@ -259,7 +260,7 @@ function generate_modified_modules_list() {
259260
modified_module_list=(${maven_modules[*]})
260261
echo "Testing the entire monorepo"
261262
else
262-
modules=$(echo "${modified_files}" | grep -E 'java-.*' || true)
263+
modules=$(echo "${modified_files}" | grep -E '(google-auth|java)-.*' || true)
263264
printf "Files in java modules:\n%s\n" "${modules}"
264265
if [[ -n $modules ]]; then
265266
modules=$(echo "${modules}" | cut -d '/' -f1 | sort -u)
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
build_file: "google-auth-library-java/.kokoro/build.sh"
4+
5+
env_vars: {
6+
key: "JOB_TYPE"
7+
value: "graalvm-single"
8+
}
9+
10+
# TODO: remove this after we've migrated all tests and scripts
11+
env_vars: {
12+
key: "GCLOUD_PROJECT"
13+
value: "gcloud-devel"
14+
}
15+
16+
env_vars: {
17+
key: "GOOGLE_CLOUD_PROJECT"
18+
value: "gcloud-devel"
19+
}
20+
21+
env_vars: {
22+
key: "GOOGLE_APPLICATION_CREDENTIALS"
23+
value: "secret_manager/java-it-service-account"
24+
}
25+
26+
env_vars: {
27+
key: "SECRET_MANAGER_KEYS"
28+
value: "java-it-service-account"
29+
}
30+
31+
env_vars: {
32+
key: "GCS_BUCKET"
33+
value: "byoid-it-bucket"
34+
}
35+
36+
env_vars: {
37+
key: "GOOGLE_EXTERNAL_ACCOUNT_ALLOW_EXECUTABLES"
38+
value: "1"
39+
}
40+
41+
env_vars: {
42+
key: "GOOGLE_CLOUD_QUOTA_PROJECT"
43+
value: "gcloud-devel"
44+
}
45+
46+
container_properties {
47+
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.17.0"
48+
}
49+
50+
51+
env_vars: {
52+
key: "BUILD_SUBDIR"
53+
value: "google-auth-library-java"
54+
}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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+
env_vars: {
36+
key: "GCS_BUCKET"
37+
value: "byoid-it-bucket"
38+
}
39+
40+
env_vars: {
41+
key: "GOOGLE_EXTERNAL_ACCOUNT_ALLOW_EXECUTABLES"
42+
value: "1"
43+
}
44+
45+
env_vars: {
46+
key: "GOOGLE_CLOUD_QUOTA_PROJECT"
47+
value: "gcloud-devel"
48+
}
49+
50+
env_vars: {
51+
key: "BUILD_SUBDIR"
52+
value: "google-auth-library-java"
53+
}

generation/check_non_release_please_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
1515
[[ "${pomFile}" =~ .*sdk-platform-java.* ]] || \
1616
[[ "${pomFile}" =~ .*java-spanner.* ]] || \
1717
[[ "${pomFile}" =~ .*java-spanner-jdbc.* ]] || \
18+
[[ "${pomFile}" =~ .*google-auth-library-java.* ]] || \
1819
[[ "${pomFile}" =~ .*.github*. ]]; then
1920
continue
2021
fi
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "1.43.0"
3+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"api_shortname": "google-auth-library",
3+
"name_pretty": "Google Auth Library",
4+
"client_documentation": "https://googleapis.dev/java/google-auth-library/latest/",
5+
"release_level": "stable",
6+
"language": "java",
7+
"repo": "googleapis/google-cloud-java",
8+
"repo_short": "google-cloud-java",
9+
"library_type": "AUTH",
10+
"distribution_name": "com.google.auth:google-auth-library",
11+
"codeowner_team": "@googleapis/cloud-sdk-auth-team"
12+
}

0 commit comments

Comments
 (0)