[MINOR UPDATE] Fix default auth mode in AuthMode.parseOrDefault and test the case of JDBC. (#2528)
diff --git a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePluginConfig.java b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePluginConfig.java
index 3af4ed2..6bd9475 100644
--- a/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePluginConfig.java
+++ b/contrib/storage-http/src/main/java/org/apache/drill/exec/store/http/HttpStoragePluginConfig.java
@@ -82,7 +82,7 @@
normalize(proxyPassword),
credentialsProvider),
credentialsProvider == null,
- AuthMode.parseOrDefault(authMode)
+ AuthMode.parseOrDefault(authMode, AuthMode.SHARED_USER)
);
this.cacheResults = cacheResults != null && cacheResults;
diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java
index d6deb64..b8d915c 100644
--- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java
+++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java
@@ -70,7 +70,7 @@
super(
CredentialProviderUtils.getCredentialsProvider(username, password, credentialsProvider),
credentialsProvider == null,
- AuthMode.parseOrDefault(authMode)
+ AuthMode.parseOrDefault(authMode, AuthMode.SHARED_USER)
);
this.driver = driver;
this.url = url;
diff --git a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestDataSource.java b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestDataSource.java
index 2e345ea..a9c35d7 100644
--- a/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestDataSource.java
+++ b/contrib/storage-jdbc/src/test/java/org/apache/drill/exec/store/jdbc/TestDataSource.java
@@ -55,12 +55,13 @@
@Test
public void testInitWithoutUserAndPassword() {
JdbcStorageConfig config = new JdbcStorageConfig(
- DRIVER, url, null, null, false, false, null, null, AuthMode.SHARED_USER.name(), 1000);
+ DRIVER, url, null, null, false, false, null, null, null, 1000);
try (HikariDataSource dataSource = JdbcStoragePlugin.initDataSource(config, null)) {
assertEquals(DRIVER, dataSource.getDriverClassName());
assertEquals(url, dataSource.getJdbcUrl());
assertNull(dataSource.getUsername());
assertNull(dataSource.getPassword());
+ assertEquals(config.getAuthMode(), AuthMode.SHARED_USER);
}
}
diff --git a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java
index 32154fa..b5c265e 100644
--- a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java
+++ b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java
@@ -32,7 +32,8 @@
// comparisons; doing so will break the plugin registry.
protected Boolean enabled;
- protected AuthMode authMode;
+ // The overridable default plugin auth mode is DRILL_PROCESS
+ protected AuthMode authMode = AuthMode.DRILL_PROCESS;
/**
* Check for enabled status of the plugin
@@ -105,8 +106,8 @@
*/
USER_TRANSLATION;
- public static AuthMode parseOrDefault(String authMode) {
- return !Strings.isNullOrEmpty(authMode) ? AuthMode.valueOf(authMode.toUpperCase()) : DRILL_PROCESS;
+ public static AuthMode parseOrDefault(String authMode, AuthMode defavlt) {
+ return !Strings.isNullOrEmpty(authMode) ? AuthMode.valueOf(authMode.toUpperCase()) : defavlt;
}
}
}
