Fix: Not loosing the access token when calling UserCredentials#ToBuil… #993

qcastel · 2022-09-07T13:05:18Z

Fixes #992 ☕️

…als#ToBuilder()

conventional-commit-lint-gcf · 2022-09-07T13:05:22Z

🤖 I detect that the PR title and the commit message differ and there's only one commit. To use the PR title for the commit history, you can use Github's automerge feature with squashing, or use automerge label. Good luck human!

-- conventional-commit-lint bot
https://conventionalcommits.org/

TimurSadykov

Thanks for the contribution! Few minor comments.

oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java

…were missing

qcastel · 2022-09-08T06:29:13Z

@TimurSadykov As I was making the test a little bit more generic than just checking the access token, I found out that two methods of the builders were missing.
The test is now covering that every attributes of the credentials are copied over correctly during the ToBuilder()

qcastel · 2022-10-24T07:57:27Z

@TimurSadykov any news on this one?

TimurSadykov

Sorry for a delay.

LGTM, i will merge once the last nit is fixed.

TimurSadykov · 2022-10-26T10:52:13Z

oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java

@@ -830,6 +833,25 @@ public void IdTokenCredentials_NoUserEmailScope_throws() throws IOException {
    }
  }

+  @Test
+  public void UserCredentials_ToBuilder_CopyEveryAttributes() {


nit, every part has to stat with lowercase, like this and a typo fix: userCredentials_toBuilder_copyEveryAttribute

oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java

…st.java

TimurSadykov

LGTM

### What changes were proposed in this pull request? This PR aims to upgrade gcs-connector to 2.2.17. ### Why are the changes needed? To have the latest auth updates, - https://github.com/GoogleCloudDataproc/hadoop-connectors/releases/tag/v2.2.17 (2023-08-15) - GoogleCloudDataproc/hadoop-connectors#1041 ```xml - <google.auth.version>1.12.1</google.auth.version> + <google.auth.version>1.14.0</google.auth.version> - <google.cloud-storage.bom.version>2.23.0</google.cloud-storage.bom.version> + <google.cloud-storage.bom.version>2.25.0</google.cloud-storage.bom.version> ``` - https://github.com/googleapis/google-auth-library-java/releases/tag/v1.14.0 (2022-12-06) - googleapis/google-auth-library-java#1100 - googleapis/google-auth-library-java#993 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs and manual tests. **BUILD** ``` dev/make-distribution.sh -Phadoop-cloud ``` **TEST** ``` $ cd dist $ export KEYFILE=~/.ssh/apache-spark-k8s-54ccbe6102d9.json $ export EMAIL=$(jq -r '.client_email' < $KEYFILE) $ export PRIVATE_KEY_ID=$(jq -r '.private_key_id' < $KEYFILE) $ export PRIVATE_KEY="$(jq -r '.private_key' < $KEYFILE)" $ bin/spark-shell \ -c spark.hadoop.fs.gs.auth.service.account.email=$EMAIL \ -c spark.hadoop.fs.gs.auth.service.account.private.key.id=$PRIVATE_KEY_ID \ -c spark.hadoop.fs.gs.auth.service.account.private.key="$PRIVATE_KEY" Setting default log level to "WARN". To adjust logging level use sc.setLogLevel(newLevel). For SparkR, use setLogLevel(newLevel). 23/08/21 12:17:20 WARN NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable Spark context Web UI available at http://localhost:4040 Spark context available as 'sc' (master = local[*], app id = local-1692645442153). Spark session available as 'spark'. Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ /___/ .__/\_,_/_/ /_/\_\ version 4.0.0-SNAPSHOT /_/ Using Scala version 2.12.18 (OpenJDK 64-Bit Server VM, Java 1.8.0_312) Type in expressions to have them evaluated. Type :help for more information. scala> spark.read.text("gs://apache-spark-bucket/README.md").count() res0: Long = 124 scala> spark.read.orc("examples/src/main/resources/users.orc").write.mode("overwrite").orc("gs://apache-spark-bucket/users.orc") scala> spark.read.orc("gs://apache-spark-bucket/users.orc").show() +------+--------------+----------------+ | name|favorite_color|favorite_numbers| +------+--------------+----------------+ |Alyssa| NULL| [3, 9, 15, 20]| | Ben| red| []| +------+--------------+----------------+ ``` ### Was this patch authored or co-authored using generative AI tooling? No. Closes #42588 from dongjoon-hyun/SPARK-44898. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>

### What changes were proposed in this pull request? This PR aims to upgrade gcs-connector to 2.2.17. ### Why are the changes needed? To have the latest auth updates, - https://github.com/GoogleCloudDataproc/hadoop-connectors/releases/tag/v2.2.17 (2023-08-15) - GoogleCloudDataproc/hadoop-connectors#1041 ```xml - <google.auth.version>1.12.1</google.auth.version> + <google.auth.version>1.14.0</google.auth.version> - <google.cloud-storage.bom.version>2.23.0</google.cloud-storage.bom.version> + <google.cloud-storage.bom.version>2.25.0</google.cloud-storage.bom.version> ``` - https://github.com/googleapis/google-auth-library-java/releases/tag/v1.14.0 (2022-12-06) - googleapis/google-auth-library-java#1100 - googleapis/google-auth-library-java#993 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs and manual tests. **BUILD** ``` dev/make-distribution.sh -Phadoop-cloud ``` **TEST** ``` $ cd dist $ export KEYFILE=~/.ssh/apache-spark-k8s-54ccbe6102d9.json $ export EMAIL=$(jq -r '.client_email' < $KEYFILE) $ export PRIVATE_KEY_ID=$(jq -r '.private_key_id' < $KEYFILE) $ export PRIVATE_KEY="$(jq -r '.private_key' < $KEYFILE)" $ bin/spark-shell \ -c spark.hadoop.fs.gs.auth.service.account.email=$EMAIL \ -c spark.hadoop.fs.gs.auth.service.account.private.key.id=$PRIVATE_KEY_ID \ -c spark.hadoop.fs.gs.auth.service.account.private.key="$PRIVATE_KEY" Setting default log level to "WARN". To adjust logging level use sc.setLogLevel(newLevel). For SparkR, use setLogLevel(newLevel). 23/08/21 12:17:20 WARN NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable Spark context Web UI available at http://localhost:4040 Spark context available as 'sc' (master = local[*], app id = local-1692645442153). Spark session available as 'spark'. Welcome to ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ /___/ .__/\_,_/_/ /_/\_\ version 4.0.0-SNAPSHOT /_/ Using Scala version 2.12.18 (OpenJDK 64-Bit Server VM, Java 1.8.0_312) Type in expressions to have them evaluated. Type :help for more information. scala> spark.read.text("gs://apache-spark-bucket/README.md").count() res0: Long = 124 scala> spark.read.orc("examples/src/main/resources/users.orc").write.mode("overwrite").orc("gs://apache-spark-bucket/users.orc") scala> spark.read.orc("gs://apache-spark-bucket/users.orc").show() +------+--------------+----------------+ | name|favorite_color|favorite_numbers| +------+--------------+----------------+ |Alyssa| NULL| [3, 9, 15, 20]| | Ben| red| []| +------+--------------+----------------+ ``` ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#42588 from dongjoon-hyun/SPARK-44898. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>

googleapis#992 Not loosing the access token when calling UserCredenti…

7783d1a

…als#ToBuilder()

qcastel requested a review from a team as a code owner September 7, 2022 13:05

product-auto-label bot added the size: s Pull request size is small. label Sep 7, 2022

qcastel mentioned this pull request Sep 7, 2022

Support existing access token when using UserCredentials auth type GoogleCloudDataproc/hadoop-connectors#870

Closed

TimurSadykov changed the title ~~#992 Not loosing the access token when calling UserCredentials#ToBuil…~~ #992 Fix: Not loosing the access token when calling UserCredentials#ToBuil… Sep 8, 2022

TimurSadykov changed the title ~~#992 Fix: Not loosing the access token when calling UserCredentials#ToBuil…~~ Fix: Not loosing the access token when calling UserCredentials#ToBuil… Sep 8, 2022

TimurSadykov requested changes Sep 8, 2022

View reviewed changes

googleapis#992 Implement comments and add some builder setters which …

be45e01

…were missing

qcastel requested a review from TimurSadykov September 8, 2022 06:28

TimurSadykov approved these changes Oct 26, 2022

View reviewed changes

qcastel commented Oct 28, 2022

View reviewed changes

oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java Outdated Show resolved Hide resolved

qcastel and others added 3 commits October 28, 2022 16:59

Update oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTe…

ce81cb0

…st.java

Merge branch 'main' into bugfix/992-fix-usercredentials-builder

166c0e6

Merge branch 'main' into bugfix/992-fix-usercredentials-builder

6a4ab31

TimurSadykov approved these changes Dec 2, 2022

View reviewed changes

lint fixes

50b593e

TimurSadykov merged commit 84afdb8 into googleapis:main Dec 2, 2022

release-please bot mentioned this pull request Dec 2, 2022

chore(main): release 1.14.0 #1096

Merged

qcastel deleted the bugfix/992-fix-usercredentials-builder branch December 2, 2022 09:08

dongjoon-hyun mentioned this pull request Aug 21, 2023

[SPARK-44898][BUILD] Upgrade gcs-connector to 2.2.17 apache/spark#42588

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Not loosing the access token when calling UserCredentials#ToBuil… #993

Fix: Not loosing the access token when calling UserCredentials#ToBuil… #993

qcastel commented Sep 7, 2022

conventional-commit-lint-gcf bot commented Sep 7, 2022 •

edited

TimurSadykov left a comment

qcastel commented Sep 8, 2022

qcastel commented Oct 24, 2022

TimurSadykov left a comment

TimurSadykov Oct 26, 2022

TimurSadykov left a comment

Fix: Not loosing the access token when calling UserCredentials#ToBuil… #993

Fix: Not loosing the access token when calling UserCredentials#ToBuil… #993

Conversation

qcastel commented Sep 7, 2022

conventional-commit-lint-gcf bot commented Sep 7, 2022 • edited

TimurSadykov left a comment

Choose a reason for hiding this comment

qcastel commented Sep 8, 2022

qcastel commented Oct 24, 2022

TimurSadykov left a comment

Choose a reason for hiding this comment

TimurSadykov Oct 26, 2022

Choose a reason for hiding this comment

TimurSadykov left a comment

Choose a reason for hiding this comment

conventional-commit-lint-gcf bot commented Sep 7, 2022 •

edited