jerqi commented on code in PR #9618:
URL: https://github.com/apache/gravitino/pull/9618#discussion_r2660555589
##########
flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/GravitinoCatalogManager.java:
##########
@@ -247,14 +245,19 @@ private static GravitinoAdminClient buildOAuthClient(
String credential =
config.get(GravitinoCatalogStoreFactoryOptions.OAUTH2_CREDENTIAL);
String path =
config.get(GravitinoCatalogStoreFactoryOptions.OAUTH2_TOKEN_PATH);
String scope =
config.get(GravitinoCatalogStoreFactoryOptions.OAUTH2_SCOPE);
- Preconditions.checkArgument(
- StringUtils.isNoneBlank(serverUri, credential, path, scope),
- String.format(
- "OAuth2 authentication requires: %s, %s, %s, and %s",
+
+ // Remove OAuth config from client config map, Because
+ // GravitinoAdminClient.builder().withClientConfig() does not recognize
these keys.
+ Set<String> oauthConfigKeys =
+ Sets.newHashSet(
+ GravitinoCatalogStoreFactoryOptions.AUTH_TYPE,
GravitinoCatalogStoreFactoryOptions.OAUTH2_SERVER_URI,
GravitinoCatalogStoreFactoryOptions.OAUTH2_CREDENTIAL,
GravitinoCatalogStoreFactoryOptions.OAUTH2_TOKEN_PATH,
- GravitinoCatalogStoreFactoryOptions.OAUTH2_SCOPE));
+ GravitinoCatalogStoreFactoryOptions.OAUTH2_SCOPE);
+ for (String key : oauthConfigKeys) {
+ config.remove(key);
+ }
Review Comment:
It's hard to add tests. I test it by hand.
##########
flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/catalog/GravitinoCatalogManager.java:
##########
@@ -247,14 +245,19 @@ private static GravitinoAdminClient buildOAuthClient(
String credential =
config.get(GravitinoCatalogStoreFactoryOptions.OAUTH2_CREDENTIAL);
String path =
config.get(GravitinoCatalogStoreFactoryOptions.OAUTH2_TOKEN_PATH);
String scope =
config.get(GravitinoCatalogStoreFactoryOptions.OAUTH2_SCOPE);
- Preconditions.checkArgument(
- StringUtils.isNoneBlank(serverUri, credential, path, scope),
- String.format(
- "OAuth2 authentication requires: %s, %s, %s, and %s",
+
+ // Remove OAuth config from client config map, Because
+ // GravitinoAdminClient.builder().withClientConfig() does not recognize
these keys.
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
