Skip to content

Commit 3a90191

Browse files
nbayatinbayati
committed
Merge branch 'main' into new-branch-name
# Conflicts: # oauth2_http/java/com/google/auth/oauth2/OAuth2Utils.java # pom.xml
2 parents 5573169 + b4254fa commit 3a90191

35 files changed

+740
-220
lines changed

‎.github/workflows/members.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[
2+
{"login":"renovate-bot"},
3+
{"login":"release-please"},
4+
{"login":"suztomo"},
5+
{"login":"dangazineu"},
6+
{"login":"ldetmer"},
7+
{"login":"zhumin8"},
8+
{"login":"blakeli0"},
9+
{"login":"lqiu96"},
10+
{"login":"jinseopkim0"},
11+
{"login":"meltsufin"},
12+
{"login":"diegomarquezp"},
13+
{"login":"burkedavison"},
14+
{"login":"mpeddada1"},
15+
{"login":"JoeWang1127"},
16+
{"login":"kmaydeo"},
17+
{"login":"lsirac"},
18+
{"login":"aeitzman"}
19+
]

‎.github/workflows/multi_approvers.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: 'multi-approvers'
2+
3+
on:
4+
pull_request:
5+
types:
6+
- 'opened'
7+
- 'edited'
8+
- 'reopened'
9+
- 'synchronize'
10+
- 'ready_for_review'
11+
- 'review_requested'
12+
- 'review_request_removed'
13+
pull_request_review:
14+
types:
15+
- 'submitted'
16+
- 'dismissed'
17+
18+
permissions:
19+
actions: 'write'
20+
contents: 'read'
21+
pull-requests: 'read'
22+
23+
concurrency:
24+
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
25+
cancel-in-progress: true
26+
27+
jobs:
28+
multi-approvers:
29+
uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@main'
30+
with:
31+
org-members-path: '.github/workflows/members.json'

‎.github/workflows/sonar.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
build:
1010
name: Build
1111
runs-on: ubuntu-22.04
12+
# Sonar Token can't be passed to PRs from forks. Disable Sonar workflow unless PR is from a branch.
13+
if: github.event.pull_request.head.repo.full_name == github.repository
1214
steps:
1315
- uses: actions/checkout@v4
1416
with:
@@ -39,7 +41,6 @@ jobs:
3941
-DenableFullTestCoverage \
4042
-Dsonar.coverage.jacoco.xmlReportPaths=oauth2_http/target/site/jacoco/jacoco.xml \
4143
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
42-
-Pcoverage \
4344
-Dsonar.projectKey=googleapis_google-auth-library-java \
4445
-Dsonar.organization=googleapis \
45-
-Dsonar.host.url=https://sonarcloud.io
46+
-Dsonar.host.url=https://sonarcloud.io

‎.kokoro/build.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,15 @@ integration)
7272
;;
7373
graalvmA)
7474
# Run Unit and Integration Tests with Native Image
75+
bash .kokoro/populate-secrets.sh
76+
export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
7577
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
7678
RETURN_CODE=$?
7779
;;
7880
graalvmB)
7981
# Run Unit and Integration Tests with Native Image
82+
bash .kokoro/populate-secrets.sh
83+
export GOOGLE_APPLICATION_CREDENTIALS="${KOKORO_GFILE_DIR}/secret_manager/java-it-service-account"
8084
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Pnative-test test -pl 'oauth2_http'
8185
RETURN_CODE=$?
8286
;;

‎.kokoro/populate-secrets.sh‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,19 @@ mkdir -p ${SECRET_LOCATION}
2828
for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
2929
do
3030
msg "Retrieving secret ${key}"
31-
docker run --entrypoint=gcloud \
32-
--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
33-
gcr.io/google.com/cloudsdktool/cloud-sdk \
34-
secrets versions access latest \
31+
if [[ "${JOB_TYPE}" == *"graalvm"* ]]; then
32+
gcloud secrets versions access latest \
3533
--project cloud-devrel-kokoro-resources \
36-
--secret ${key} > \
37-
"${SECRET_LOCATION}/${key}"
34+
--secret ${key} > "${SECRET_LOCATION}/${key}"
35+
else
36+
docker run --entrypoint=gcloud \
37+
--volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
38+
gcr.io/google.com/cloudsdktool/cloud-sdk \
39+
secrets versions access latest \
40+
--project cloud-devrel-kokoro-resources \
41+
--secret ${key} > \
42+
"${SECRET_LOCATION}/${key}"
43+
fi
3844
if [[ $? == 0 ]]; then
3945
msg "Secret written to ${SECRET_LOCATION}/${key}"
4046
else

‎.kokoro/presubmit/common.cfg‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ env_vars: {
2323
key: "JOB_TYPE"
2424
value: "test"
2525
}
26-
27-
before_action {
28-
fetch_keystore {
29-
keystore_resource {
30-
keystore_config_id: 73713
31-
keyname: "dpebot_codecov_token"
32-
}
33-
}
34-
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
# Configure the docker image for kokoro-trampoline.
4-
env_vars: {
5-
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.11.3"
7-
}
3+
build_file: "google-auth-library-java/.kokoro/build.sh"
84

95
env_vars: {
106
key: "JOB_TYPE"
@@ -47,3 +43,7 @@ env_vars: {
4743
value: "gcloud-devel"
4844
}
4945

46+
container_properties {
47+
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.13.0"
48+
}
49+

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Format: //devtools/kokoro/config/proto/build.proto
22

3-
# Configure the docker image for kokoro-trampoline.
4-
env_vars: {
5-
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.11.3"
7-
}
3+
build_file: "google-auth-library-java/.kokoro/build.sh"
84

95
env_vars: {
106
key: "JOB_TYPE"
@@ -46,3 +42,7 @@ env_vars: {
4642
key: "GOOGLE_CLOUD_QUOTA_PROJECT"
4743
value: "gcloud-devel"
4844
}
45+
46+
container_properties {
47+
docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.13.0"
48+
}

‎.release-please-manifest.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "1.30.1"
3+
}

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## [1.30.1](https://github.com/googleapis/google-auth-library-java/compare/v1.30.0...v1.30.1) (2024-12-11)
4+
5+
6+
### Bug Fixes
7+
8+
* JSON parsing of S2A addresses. ([#1589](https://github.com/googleapis/google-auth-library-java/issues/1589)) ([9d5ebfe](https://github.com/googleapis/google-auth-library-java/commit/9d5ebfe8870a11d27af3a7c7f3fd9930ab207162))
9+
10+
## [1.30.0](https://github.com/googleapis/google-auth-library-java/compare/v1.29.0...v1.30.0) (2024-11-08)
11+
12+
13+
### Features
14+
15+
* Support querying S2A Addresses from MDS ([#1400](https://github.com/googleapis/google-auth-library-java/issues/1400)) ([df06bd1](https://github.com/googleapis/google-auth-library-java/commit/df06bd1f94d03c4f8807c2adf42d25d29b731531))
16+
17+
18+
### Bug Fixes
19+
20+
* Make it explicit that there is a network call to MDS to get SecureSessionAgentConfig ([#1573](https://github.com/googleapis/google-auth-library-java/issues/1573)) ([18020fe](https://github.com/googleapis/google-auth-library-java/commit/18020fedb855742ee27b6558f5de58d3818c6b48))
21+
322
## [1.29.0](https://github.com/googleapis/google-auth-library-java/compare/v1.28.0...v1.29.0) (2024-10-22)
423

524

0 commit comments

Comments
 (0)