lasdf1234 commented on code in PR #13354:
URL: https://github.com/apache/gravitino/pull/13354#discussion_r4060423092
##########
core/src/test/java/org/apache/gravitino/connector/TestBaseCatalogPropertiesMetadata.java:
##########
@@ -43,4 +46,59 @@ void
testCredentialPropertyEntriesAreDeclaredForAllCatalogs() {
assertFalse(metadata.isHiddenProperty(CredentialConstants.CREDENTIAL_PROVIDERS));
assertFalse(metadata.isHiddenProperty(CredentialConstants.S3_TOKEN_EXPIRE_IN_SECS));
}
+
+ @Test
+ void testSharedCloudCredentialKeysAreDeclaredForAllCatalogs() {
+
assertTrue(metadata.containsProperty(S3Properties.GRAVITINO_S3_ACCESS_KEY_ID));
+
assertTrue(metadata.containsProperty(S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY));
+
assertFalse(metadata.isHiddenProperty(S3Properties.GRAVITINO_S3_ACCESS_KEY_ID));
+
assertTrue(metadata.isHiddenProperty(S3Properties.GRAVITINO_S3_SECRET_ACCESS_KEY));
+ }
+
+ @Test
+ void testConnectorCredentialKeysAreDeclaredForAllCatalogs() {
+ assertTrue(metadata.containsProperty("aws-access-key-id"));
+ assertFalse(metadata.isHiddenProperty("aws-access-key-id"));
+ assertTrue(metadata.isHiddenProperty("aws-secret-access-key"));
+ assertFalse(metadata.containsProperty("jdbc-user"));
+ assertFalse(metadata.containsProperty("jdbc-password"));
+ assertFalse(metadata.containsProperty("token-provider"));
+ assertFalse(metadata.containsProperty("gcs.oauth2.token"));
+ assertFalse(metadata.containsProperty("s3.session-token"));
+ assertFalse(metadata.containsProperty("jdbc.user"));
+ }
+
+ @Test
+ void testRuntimeCopiedS3AccessKeyUsesSharedCloudMetadata() {
+ PropertiesMetadata glueLikeMetadata =
+ new BaseCatalogPropertiesMetadata() {
+ @Override
+ protected Map<String, PropertyEntry<?>> specificPropertyEntries() {
+ return ImmutableMap.of(
+ "aws-access-key-id",
+ PropertyEntry.stringOptionalPropertyEntry(
+ "aws-access-key-id", "AWS access key ID", false, null,
false),
+ "aws-secret-access-key",
+ PropertyEntry.stringOptionalPropertyEntry(
+ "aws-secret-access-key", "AWS secret access key", false,
null, true));
+ }
Review Comment:
Done. Added testCatalogDeclarationWinsOverSharedCloudEntry. The shared
s3-access-key-id entry is hidden=false, and the test catalog declares the same
key with hidden=true. isHiddenProperty stays true, so the catalog entry wins. A
catalog that does not declare it still sees hidden=false.
--
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]
