[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r575573350 ## File path: licenses.yaml ## @@ -147,6 +147,16 @@ source_paths: --- +name: AWS RDS SDK for Java +license_category: source +module: extensions/druid-aws-rds-extensions +license_name: Apache License version 2.0 +version: 1.11.199 +libraries: + - com.amazonaws: aws-java-sdk-rds Review comment: source code is not copied here , I guess this should be "binary" , yes. .. will update. ## File path: server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java ## @@ -0,0 +1,179 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.metadata; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.commons.dbcp2.BasicDataSource; +import org.apache.commons.dbcp2.ConnectionFactory; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.logger.Logger; + +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Properties; + +/** + * This class exists so that {@link MetadataStorageConnectorConfig} is asked for password every time a brand new + * connection is established with DB. {@link PasswordProvider} impls such as those based on AWS tokens refresh the + * underlying token periodically since each token is valid for a certain period of time only. + * So, This class overrides (and largely copies due to lack of extensibility), the methods from base class in order to keep + * track of connection properties and call {@link MetadataStorageConnectorConfig#getPassword()} everytime a new + * connection is setup. + */ +public class BasicDataSourceExt extends BasicDataSource +{ + private static final Logger LOGGER = new Logger(BasicDataSourceExt.class); + + private Properties connectionProperties; + private final MetadataStorageConnectorConfig connectorConfig; + + public BasicDataSourceExt(MetadataStorageConnectorConfig connectorConfig) + { +this.connectorConfig = connectorConfig; +this.connectionProperties = new Properties(); + } + + @Override + public void addConnectionProperty(String name, String value) + { +connectionProperties.put(name, value); +super.addConnectionProperty(name, value); + } + + @Override + public void removeConnectionProperty(String name) + { +connectionProperties.remove(name); +super.removeConnectionProperty(name); + } + + @Override + public void setConnectionProperties(String connectionProperties) + { +if (connectionProperties == null) { + throw new NullPointerException("connectionProperties is null"); +} + +String[] entries = connectionProperties.split(";"); +Properties properties = new Properties(); +for (String entry : entries) { + if (entry.length() > 0) { +int index = entry.indexOf('='); +if (index > 0) { + String name = entry.substring(0, index); + String value = entry.substring(index + 1); + properties.setProperty(name, value); +} else { + // no value is empty string which is how java.util.Properties works + properties.setProperty(entry, ""); +} + } +} +this.connectionProperties = properties; +super.setConnectionProperties(connectionProperties); + } + + @VisibleForTesting + public Properties getConnectionProperties() + { +return connectionProperties; + } + + @Override + protected ConnectionFactory createConnectionFactory() throws SQLException Review comment: yeah, most code in this file is copied from `org.apache.commons.dbcp2.BasicDataSource` , will send a PR shortly. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r552981751 ## File path: docs/development/extensions-core/druid-aws-rds.md ## @@ -0,0 +1,38 @@ +--- +id: druid-aws-rds +title: "Druid AWS RDS Module" +--- + + + +This module provides AWS RDS token [password provider](../../operations/password-provider.md) provides temp token for accessing AWS RDS DB cluster. Review comment: reworded to hopefully remove the confusion 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r552983056 ## File path: server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java ## @@ -0,0 +1,179 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.metadata; + +import com.google.common.annotations.VisibleForTesting; +import org.apache.commons.dbcp2.BasicDataSource; +import org.apache.commons.dbcp2.ConnectionFactory; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.logger.Logger; + +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Properties; + +/** + * This class exists so that {@link MetadataStorageConnectorConfig} is asked for password every time a brand new + * connection is established with DB. {@link PasswordProvider} impls such as those based on AWS tokens refresh the + * underlying token periodically since each token is valid for a certain period of time only. + * So, This class overrides,ummm copies due to lack of extensibility, the methods from base class in order to keep + * track of connection properties and call {@link MetadataStorageConnectorConfig#getPassword()} everytime a new + * connection is setup. + */ +public class BasicDataSourceExt extends BasicDataSource +{ + private static final Logger LOGGER = new Logger(BasicDataSourceExt.class); + + private Properties connectionProperties; + private final MetadataStorageConnectorConfig connectorConfig; + + public BasicDataSourceExt(MetadataStorageConnectorConfig connectorConfig) + { +this.connectorConfig = connectorConfig; +this.connectionProperties = new Properties(); + } + + @Override + public void addConnectionProperty(String name, String value) + { +connectionProperties.put(name, value); +super.addConnectionProperty(name, value); + } + + @Override + public void removeConnectionProperty(String name) + { +connectionProperties.remove(name); +super.removeConnectionProperty(name); + } + + @Override + public void setConnectionProperties(String connectionProperties) + { +if (connectionProperties == null) { + throw new NullPointerException("connectionProperties is null"); +} + +String[] entries = connectionProperties.split(";"); +Properties properties = new Properties(); +for (String entry : entries) { + if (entry.length() > 0) { +int index = entry.indexOf('='); +if (index > 0) { + String name = entry.substring(0, index); + String value = entry.substring(index + 1); + properties.setProperty(name, value); +} else { + // no value is empty string which is how java.util.Properties works + properties.setProperty(entry, ""); +} + } +} +this.connectionProperties = properties; +super.setConnectionProperties(connectionProperties); + } + + @VisibleForTesting + public Properties getConnectionProperties() + { +return connectionProperties; + } + + @Override + protected ConnectionFactory createConnectionFactory() throws SQLException + { +Driver driverToUse = getDriver(); + +if (driverToUse == null) { + Class driverFromCCL = null; + if (getDriverClassName() != null) { +try { + try { +if (getDriverClassLoader() == null) { + driverFromCCL = Class.forName(getDriverClassName()); +} else { + driverFromCCL = Class.forName( + getDriverClassName(), true, getDriverClassLoader()); +} + } + catch (ClassNotFoundException cnfe) { +driverFromCCL = Thread.currentThread( +).getContextClassLoader().loadClass( +getDriverClassName()); + } +} +catch (Exception t) { + String message = "Cannot load JDBC driver class '" + + getDriverClassName() + "'"; + LOGGER.error(t, message); + throw new SQLException(message, t); +} + } + + try { +if (driverFromCCL == null) { + driverToUse =
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r552981751 ## File path: docs/development/extensions-core/druid-aws-rds.md ## @@ -0,0 +1,38 @@ +--- +id: druid-aws-rds +title: "Druid AWS RDS Module" +--- + + + +This module provides AWS RDS token [password provider](../../operations/password-provider.md) provides temp token for accessing AWS RDS DB cluster. Review comment: reworded to hopefully remote the confusion 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r552200682 ## File path: server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java ## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.metadata; + +import org.apache.commons.dbcp2.BasicDataSource; +import org.apache.commons.dbcp2.ConnectionFactory; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.logger.Logger; + +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Properties; + +/** + * This class exists so that PasswordProvider is asked for password every time a brand new connection is established + * with DB. PasswordProvider impls such as based on AWS tokens refresh the underlying token periodically since + * each token is valid for a certain period of time only. + * So, This class overrides[ummm copies] the methods from base class in order to keep track of connection properties Review comment: i see :) , updated the comment to hopefully remove the link confusion ## File path: docs/development/extensions-core/druid-aws-rds.md ## @@ -0,0 +1,38 @@ +--- +id: druid-aws-rds +title: "Druid AWS RDS Module" +--- + + + +This module provides AWS RDS token [password provider](../../operations/password-provider.md) provides temp token for accessing AWS RDS DB cluster. + +```json +{ "type": "awsrdstoken", "user": "USER", "host": "HOST", "port": PORT, "region": "AWS_REGION" } Review comment: changed 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r552200528 ## File path: extensions-core/druid-aws-rds-extensions/src/main/java/org/apache/druid/aws/rds/AWSModule.java ## @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.aws.rds; + +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.google.common.collect.ImmutableList; +import com.google.inject.Binder; +import org.apache.druid.initialization.DruidModule; + +import java.util.List; + +public class AWSModule implements DruidModule Review comment: changed 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: URL: https://github.com/apache/druid/pull/9518#discussion_r551712946 ## File path: server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java ## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.metadata; + +import org.apache.commons.dbcp2.BasicDataSource; +import org.apache.commons.dbcp2.ConnectionFactory; +import org.apache.druid.java.util.common.RE; +import org.apache.druid.java.util.common.logger.Logger; + +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Properties; + +/** + * This class exists so that PasswordProvider is asked for password every time a brand new connection is established + * with DB. PasswordProvider impls such as based on AWS tokens refresh the underlying token periodically since + * each token is valid for a certain period of time only. + * So, This class overrides[ummm copies] the methods from base class in order to keep track of connection properties Review comment: not sure if there is anything to fix as of now , `BasicDataSource` isn't open enough for extension to let us dynamically get password from config everytime a new connection is setup. ## File path: docs/development/extensions-core/druid-aws-rds.md ## @@ -0,0 +1,38 @@ +--- +id: druid-aws-rds +title: "Druid AWS RDS Module" +--- + + + +This module provides AWS RDS token [password provider](../../operations/password-provider.md) provides temp token for accessing AWS RDS DB cluster. + +```json +{ "type": "awsrdstoken", "user": "USER", "host": "HOST", "port": PORT, "region": "AWS_REGION" } Review comment: will update ## File path: extensions-core/druid-aws-rds-extensions/src/main/java/org/apache/druid/aws/rds/AWSModule.java ## @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.aws.rds; + +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.google.common.collect.ImmutableList; +import com.google.inject.Binder; +import org.apache.druid.initialization.DruidModule; + +import java.util.List; + +public class AWSModule implements DruidModule Review comment: will change 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[GitHub] [druid] himanshug commented on a change in pull request #9518: AWS RDS token based password provider
himanshug commented on a change in pull request #9518: AWS RDS token based password provider URL: https://github.com/apache/druid/pull/9518#discussion_r403831641 ## File path: extensions-core/druid-aws-rds-extensions/pom.xml ## @@ -0,0 +1,80 @@ + + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + org.apache.druid.extensions + druid-aws-rds-extensions + druid-aws-rds-extensions + druid-aws-rds-extensions + + +org.apache.druid +druid +0.18.0-SNAPSHOT Review comment: updated 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org