Skip to content

Adapt DynamicConfigProvider to Metadata #11389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bananaaggle wants to merge 2 commits into from
Closed

Adapt DynamicConfigProvider to Metadata #11389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe7c709
adapt DynamicConfigProvider to metadata
Jun 28, 2021
cb9705f
add some unit tests
Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions core/src/main/java/org/apache/druid/metadata/MetadataStorageConnectorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ public class MetadataStorageConnectorConfig
@JsonProperty("dbcp")
private Properties dbcpProperties;

@JsonProperty
@JsonProperty("dynamicConfigProvider")
private DynamicConfigProvider dynamicConfigProvider;

public boolean isCreateTables()
{
return createTables;
Expand Down Expand Up @@ -79,13 +81,17 @@ public String getConnectURI()
@JsonProperty
public String getUser()
{
return user;
return (dynamicConfigProvider != null && dynamicConfigProvider.getConfig().get("user") != null) ? dynamicConfigProvider.getConfig().get("user").toString() : user;
}

@JsonProperty
public String getPassword()
{
return passwordProvider == null ? null : passwordProvider.getPassword();
if (dynamicConfigProvider != null && dynamicConfigProvider.getConfig().get("passward") != null) {
return dynamicConfigProvider.getConfig().get("passward").toString();
} else {
return passwordProvider == null ? null : passwordProvider.getPassword();
}
}

@JsonProperty("dbcp")
Expand All @@ -100,7 +106,7 @@ public String toString()
return "DbConnectorConfig{" +
"createTables=" + createTables +
", connectURI='" + getConnectURI() + '\'' +
", user='" + user + '\'' +
", user='" + getUser() + '\'' +
", passwordProvider=" + passwordProvider +
", dbcpProperties=" + dbcpProperties +
'}';
Expand Down Expand Up @@ -153,6 +159,7 @@ public int hashCode()
result = 31 * result + (getUser() != null ? getUser().hashCode() : 0);
result = 31 * result + (passwordProvider != null ? passwordProvider.hashCode() : 0);
result = 31 * result + (dbcpProperties != null ? dbcpProperties.hashCode() : 0);
result = 31 * result + (dynamicConfigProvider != null ? dynamicConfigProvider.hashCode() : 0);
return result;
}
}
16 changes: 14 additions & 2 deletions ...torage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnectorSslConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.apache.druid.metadata.storage.mysql;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.druid.metadata.DynamicConfigProvider;
import org.apache.druid.metadata.PasswordProvider;

import java.util.List;
Expand Down Expand Up @@ -56,6 +57,9 @@ public class MySQLConnectorSslConfig
@JsonProperty
private boolean verifyServerCertificate = false;

@JsonProperty("dynamicConfigProvider")
private DynamicConfigProvider dynamicConfigProvider;

public boolean isUseSSL()
{
return useSSL;
Expand All @@ -73,7 +77,11 @@ public String getTrustCertificateKeyStoreType()

public String getTrustCertificateKeyStorePassword()
{
return trustCertificateKeyStorePasswordProvider == null ? null : trustCertificateKeyStorePasswordProvider.getPassword();
if (dynamicConfigProvider != null && dynamicConfigProvider.getConfig().get("trustCertificateKeyStorePassword") != null) {
return dynamicConfigProvider.getConfig().get("trustCertificateKeyStorePassword").toString();
} else {
return trustCertificateKeyStorePasswordProvider == null ? null : trustCertificateKeyStorePasswordProvider.getPassword();
}
}

public String getClientCertificateKeyStoreUrl()
Expand All @@ -88,7 +96,11 @@ public String getClientCertificateKeyStoreType()

public String getClientCertificateKeyStorePassword()
{
return clientCertificateKeyStorePasswordProvider == null ? null : clientCertificateKeyStorePasswordProvider.getPassword();
if (dynamicConfigProvider != null && dynamicConfigProvider.getConfig().get("clientCertificateKeyStorePassword") != null) {
return dynamicConfigProvider.getConfig().get("clientCertificateKeyStorePassword").toString();
} else {
return clientCertificateKeyStorePasswordProvider == null ? null : clientCertificateKeyStorePasswordProvider.getPassword();
}
}

public List<String> getEnabledSSLCipherSuites()
Expand Down
33 changes: 33 additions & 0 deletions ...src/test/java/org/apache/druid/metadata/storage/mysql/MySQLMetadataStorageModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,39 @@ public void testSslConfig()
Assert.assertTrue(config.isVerifyServerCertificate());
}

@Test
public void testSslConfigWithDynamicConfigProvider()
{
final Injector injector = createInjector();
final String propertyPrefix = "druid.metadata.mysql.ssl";
final JsonConfigProvider<MySQLConnectorSslConfig> provider = JsonConfigProvider.of(
propertyPrefix,
MySQLConnectorSslConfig.class
);
final Properties properties = new Properties();
properties.setProperty(propertyPrefix + ".useSSL", "true");
properties.setProperty(propertyPrefix + ".trustCertificateKeyStoreUrl", "url");
properties.setProperty(propertyPrefix + ".trustCertificateKeyStoreType", "type");
properties.setProperty(propertyPrefix + ".clientCertificateKeyStoreUrl", "url");
properties.setProperty(propertyPrefix + ".clientCertificateKeyStoreType", "type");
properties.setProperty(propertyPrefix + ".dynamicConfigProvider", "{\"type\":\"mapString\",\"config\":{\"trustCertificateKeyStorePassword\":\"secret\",\"clientCertificateKeyStorePassword\":\"secret\"}}");
properties.setProperty(propertyPrefix + ".enabledSSLCipherSuites", "[\"some\", \"ciphers\"]");
properties.setProperty(propertyPrefix + ".enabledTLSProtocols", "[\"some\", \"protocols\"]");
properties.setProperty(propertyPrefix + ".verifyServerCertificate", "true");
provider.inject(properties, injector.getInstance(JsonConfigurator.class));
final MySQLConnectorSslConfig config = provider.get().get();
Assert.assertTrue(config.isUseSSL());
Assert.assertEquals("url", config.getTrustCertificateKeyStoreUrl());
Assert.assertEquals("type", config.getTrustCertificateKeyStoreType());
Assert.assertEquals("secret", config.getTrustCertificateKeyStorePassword());
Assert.assertEquals("url", config.getClientCertificateKeyStoreUrl());
Assert.assertEquals("type", config.getClientCertificateKeyStoreType());
Assert.assertEquals("secret", config.getClientCertificateKeyStorePassword());
Assert.assertEquals(ImmutableList.of("some", "ciphers"), config.getEnabledSSLCipherSuites());
Assert.assertEquals(ImmutableList.of("some", "protocols"), config.getEnabledTLSProtocols());
Assert.assertTrue(config.isVerifyServerCertificate());
}

@Test
public void testDriverConfigDefault()
{
Expand Down
12 changes: 10 additions & 2 deletions ...-hadoop/src/main/java/org/apache/druid/indexer/updater/MetadataStorageUpdaterJobSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Supplier;
import org.apache.druid.metadata.DynamicConfigProvider;
import org.apache.druid.metadata.MetadataStorageConnectorConfig;
import org.apache.druid.metadata.MetadataStorageTablesConfig;
import org.apache.druid.metadata.PasswordProvider;
Expand Down Expand Up @@ -57,6 +58,9 @@ public String getType()
return type;
}

@JsonProperty("dynamicConfigProvider")
private DynamicConfigProvider dynamicConfigProvider;

@Override
public MetadataStorageConnectorConfig get()
{
Expand All @@ -71,13 +75,17 @@ public String getConnectURI()
@Override
public String getUser()
{
return user;
return (dynamicConfigProvider != null && dynamicConfigProvider.getConfig().get("user") != null) ? dynamicConfigProvider.getConfig().get("user").toString() : user;
}

@Override
public String getPassword()
{
return passwordProvider == null ? null : passwordProvider.getPassword();
if (dynamicConfigProvider != null && dynamicConfigProvider.getConfig().get("passward") != null) {
return dynamicConfigProvider.getConfig().get("passward").toString();
} else {
return passwordProvider == null ? null : passwordProvider.getPassword();
}
}
};
}
Expand Down