Repository: incubator-atlas Updated Branches: refs/heads/master 3869b8a2f -> 999219300
ATLAS-483 Remove client.properties (tbeerbower via shwethags) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/99921930 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/99921930 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/99921930 Branch: refs/heads/master Commit: 999219300cf594a0a7fe4b92725e84aa85abe8d9 Parents: 3869b8a Author: Shwetha GS <[email protected]> Authored: Tue Feb 23 12:09:08 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Tue Feb 23 12:09:08 2016 +0530 ---------------------------------------------------------------------- .../atlas/hive/bridge/HiveMetaStoreBridge.java | 2 +- client/src/main/resources/client.properties | 42 -------------------- .../org/apache/atlas/ApplicationProperties.java | 7 +--- distro/src/conf/atlas-application.properties | 14 +++++++ distro/src/conf/client.properties | 38 ------------------ docs/src/site/twiki/Bridge-Falcon.twiki | 4 +- docs/src/site/twiki/Bridge-Hive.twiki | 8 ++-- docs/src/site/twiki/Bridge-Sqoop.twiki | 2 +- docs/src/site/twiki/InstallationSteps.twiki | 1 - docs/src/site/twiki/security.twiki | 4 +- .../java/org/apache/atlas/hook/AtlasHook.java | 2 +- release-log.txt | 3 +- .../security/NegativeSSLAndKerberosTest.java | 3 +- .../atlas/web/security/SSLAndKerberosTest.java | 3 +- .../org/apache/atlas/web/security/SSLTest.java | 4 +- 15 files changed, 35 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java index 4680a3c..db48fcf 100755 --- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java +++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java @@ -604,7 +604,7 @@ public class HiveMetaStoreBridge { } public static void main(String[] argv) throws Exception { - Configuration atlasConf = ApplicationProperties.get(ApplicationProperties.CLIENT_PROPERTIES); + Configuration atlasConf = ApplicationProperties.get(); HiveMetaStoreBridge hiveMetaStoreBridge = new HiveMetaStoreBridge(new HiveConf(), atlasConf); hiveMetaStoreBridge.registerHiveDataModel(); hiveMetaStoreBridge.importHiveMetadata(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/client/src/main/resources/client.properties ---------------------------------------------------------------------- diff --git a/client/src/main/resources/client.properties b/client/src/main/resources/client.properties deleted file mode 100755 index bc7bc98..0000000 --- a/client/src/main/resources/client.properties +++ /dev/null @@ -1,42 +0,0 @@ -# -# 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. -# - -######### Security Properties ######### - -# SSL config - -atlas.enableTLS=false -#truststore.file=/path/to/truststore.jks -#cert.stores.credential.provider.path=jceks://file/path/to/credentialstore.jceks - -#following only required for 2-way SSL -#keystore.file=/path/to/keystore.jks - -# Authentication config - -# enabled: true or false -atlas.http.authentication.enabled=false -# type: simple or kerberos -atlas.http.authentication.type=simple - -######### Security Properties ######### - -######### Server Properties ######### -# Configuring a 'test' port different from where a local atlas server instance would run -atlas.rest.address=http://localhost:31000 -######### Server Properties ######### http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/common/src/main/java/org/apache/atlas/ApplicationProperties.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/atlas/ApplicationProperties.java b/common/src/main/java/org/apache/atlas/ApplicationProperties.java index 6b4d31a..d74a30e 100644 --- a/common/src/main/java/org/apache/atlas/ApplicationProperties.java +++ b/common/src/main/java/org/apache/atlas/ApplicationProperties.java @@ -17,7 +17,6 @@ */ package org.apache.atlas; -import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; @@ -26,7 +25,6 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.net.URL; -import java.util.Arrays; import java.util.Iterator; /** @@ -36,7 +34,6 @@ public final class ApplicationProperties extends PropertiesConfiguration { private static final Logger LOG = LoggerFactory.getLogger(ApplicationProperties.class); public static final String APPLICATION_PROPERTIES = "atlas-application.properties"; - public static final String CLIENT_PROPERTIES = "client.properties"; private static Configuration instance = null; @@ -48,9 +45,7 @@ public final class ApplicationProperties extends PropertiesConfiguration { if (instance == null) { synchronized (ApplicationProperties.class) { if (instance == null) { - Configuration applicationProperties = get(APPLICATION_PROPERTIES); - Configuration clientProperties = get(CLIENT_PROPERTIES); - instance = new CompositeConfiguration(Arrays.asList(applicationProperties, clientProperties)); + instance = get(APPLICATION_PROPERTIES); } } } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/distro/src/conf/atlas-application.properties ---------------------------------------------------------------------- diff --git a/distro/src/conf/atlas-application.properties b/distro/src/conf/atlas-application.properties index cb6ee31..453435b 100755 --- a/distro/src/conf/atlas-application.properties +++ b/distro/src/conf/atlas-application.properties @@ -81,4 +81,18 @@ atlas.lineage.hive.table.schema.query.Table=Table where name='%s'\, columns # SSL config atlas.enableTLS=false +#truststore.file=/path/to/truststore.jks +#cert.stores.credential.provider.path=jceks://file/path/to/credentialstore.jceks + +#following only required for 2-way SSL +#keystore.file=/path/to/keystore.jks + +# Authentication config + +# enabled: true or false +atlas.http.authentication.enabled=false +# type: simple or kerberos +atlas.http.authentication.type=simple + +######### Server Properties ######### atlas.rest.address=http://localhost:21000 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/distro/src/conf/client.properties ---------------------------------------------------------------------- diff --git a/distro/src/conf/client.properties b/distro/src/conf/client.properties deleted file mode 100755 index ab6ef2f..0000000 --- a/distro/src/conf/client.properties +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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. -# - -######### Security Properties ######### - -# SSL config - -atlas.enableTLS=false - -#truststore.file=/path/to/truststore.jks -#cert.stores.credential.provider.path=jceks://file/path/to/credentialstore.jceks - -#following only required for 2-way SSL -#keystore.file=/path/to/keystore.jks - -# Authentication config - -# enabled: true or false -atlas.http.authentication.enabled=false -# type: simple or kerberos -atlas.http.authentication.type=simple - -######### Security Properties ######### http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/docs/src/site/twiki/Bridge-Falcon.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/Bridge-Falcon.twiki b/docs/src/site/twiki/Bridge-Falcon.twiki index d9a452a..98737fb 100644 --- a/docs/src/site/twiki/Bridge-Falcon.twiki +++ b/docs/src/site/twiki/Bridge-Falcon.twiki @@ -16,9 +16,9 @@ Falcon supports listeners on falcon entity submission. This is used to add entit The hook submits the request to a thread pool executor to avoid blocking the command execution. The thread submits the entities as message to the notification server and atlas server reads these messages and registers the entities. * Add 'org.apache.falcon.atlas.service.AtlasService' to application.services in <falcon-conf>/startup.properties * Link falcon hook jars in falcon classpath - 'ln -s <atlas-home>/hook/falcon/* <falcon-home>/server/webapp/falcon/WEB-INF/lib/' - * Copy <atlas-conf>/client.properties and <atlas-conf>/atlas-application.properties to the falcon conf directory. + * Copy <atlas-conf>/atlas-application.properties to the falcon conf directory. -The following properties in <atlas-conf>/client.properties control the thread pool and notification details: +The following properties in <atlas-conf>/atlas-application.properties control the thread pool and notification details: * atlas.hook.falcon.synchronous - boolean, true to run the hook synchronously. default false * atlas.hook.falcon.numRetries - number of retries for notification failure. default 3 * atlas.hook.falcon.minThreads - core number of threads. default 5 http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/docs/src/site/twiki/Bridge-Hive.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/Bridge-Hive.twiki b/docs/src/site/twiki/Bridge-Hive.twiki index e3b03fa..3887871 100644 --- a/docs/src/site/twiki/Bridge-Hive.twiki +++ b/docs/src/site/twiki/Bridge-Hive.twiki @@ -29,7 +29,7 @@ The entities are created and de-duped using unique qualified name. They provide ---++ Importing Hive Metadata org.apache.atlas.hive.bridge.HiveMetaStoreBridge imports the hive metadata into Atlas using the model defined in org.apache.atlas.hive.model.HiveDataModelGenerator. import-hive.sh command can be used to facilitate this. -Set the following configuration in <atlas-conf>/client.properties and set environment variable $HIVE_CONF_DIR to the hive conf directory: +Set the following configuration in <atlas-conf>/atlas-application.properties and set environment variable $HIVE_CONF_DIR to the hive conf directory: <verbatim> <property> <name>atlas.cluster.name</name> @@ -64,9 +64,9 @@ Follow these instructions in your hive set-up to add hive hook for Atlas: </property> </verbatim> * Add 'export HIVE_AUX_JARS_PATH=<atlas package>/hook/hive' in hive-env.sh of your hive configuration - * Copy <atlas-conf>/client.properties and <atlas-conf>/atlas-application.properties to the hive conf directory. + * Copy <atlas-conf>/atlas-application.properties to the hive conf directory. -The following properties in <atlas-conf>/client.properties control the thread pool and notification details: +The following properties in <atlas-conf>/atlas-application.properties control the thread pool and notification details: * atlas.hook.hive.synchronous - boolean, true to run the hook synchronously. default false * atlas.hook.hive.numRetries - number of retries for notification failure. default 3 * atlas.hook.hive.minThreads - core number of threads. default 5 @@ -79,4 +79,4 @@ Refer [[Configuration][Configuration]] for notification related configurations ---++ Limitations * Since database name, table name and column names are case insensitive in hive, the corresponding names in entities are lowercase. So, any search APIs should use lowercase while querying on the entity names - * Only the following hive operations are captured by hive hook currently - create database, create table, create view, CTAS, load, import, export, query, alter table rename and alter view rename \ No newline at end of file + * Only the following hive operations are captured by hive hook currently - create database, create table, create view, CTAS, load, import, export, query, alter table rename and alter view rename http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/docs/src/site/twiki/Bridge-Sqoop.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/Bridge-Sqoop.twiki b/docs/src/site/twiki/Bridge-Sqoop.twiki index fb865a4..bf942f2 100644 --- a/docs/src/site/twiki/Bridge-Sqoop.twiki +++ b/docs/src/site/twiki/Bridge-Sqoop.twiki @@ -28,7 +28,7 @@ Follow these instructions in your sqoop set-up to add sqoop hook for Atlas in <s <name>atlas.cluster.name</name> <value><clustername></value> </property> - * Copy <atlas-conf>/atlas-application.properties and <atlas-conf>/client.properties to to the sqoop conf directory <sqoop-conf>/ + * Copy <atlas-conf>/atlas-application.properties to to the sqoop conf directory <sqoop-conf>/ * Link <atlas-home>/hook/sqoop/*.jar in sqoop lib Refer [[Configuration][Configuration]] for notification related configurations http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/docs/src/site/twiki/InstallationSteps.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki index 4e67bcb..ac10710 100644 --- a/docs/src/site/twiki/InstallationSteps.twiki +++ b/docs/src/site/twiki/InstallationSteps.twiki @@ -32,7 +32,6 @@ Tar is structured as follows |- cputil.py |- conf |- atlas-application.properties - |- client.properties |- atlas-env.sh |- log4j.xml |- solr http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/docs/src/site/twiki/security.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/security.twiki b/docs/src/site/twiki/security.twiki index d80f5c6..88e35d2 100755 --- a/docs/src/site/twiki/security.twiki +++ b/docs/src/site/twiki/security.twiki @@ -87,8 +87,8 @@ For a more detailed discussion of the HTTP authentication mechanism refer to [[h ---+++ Client security configuration -When leveraging Atlas client code to communicate with an Atlas server configured for SSL transport and/or Kerberos authentication, there is a requirement to provide a client configuration file that provides the security properties that allow for communication with, or authenticating to, the server. -Create a client.properties file with the appropriate settings (see below) and place it on the client's classpath or in the directory specified by the "atlas.conf" system property. +When leveraging Atlas client code to communicate with an Atlas server configured for SSL transport and/or Kerberos authentication, there is a requirement to provide the Atlas client configuration file that provides the security properties that allow for communication with, or authenticating to, the server. +Update the atlas-application.properties file with the appropriate settings (see below) and copy it to the client's classpath or to the directory specified by the "atlas.conf" system property. The client properties for SSL communication are: http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java ---------------------------------------------------------------------- diff --git a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java index ba50625..2e41c5c 100644 --- a/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java +++ b/notification/src/main/java/org/apache/atlas/hook/AtlasHook.java @@ -60,7 +60,7 @@ public abstract class AtlasHook { static { try { - atlasProperties = ApplicationProperties.get(ApplicationProperties.CLIENT_PROPERTIES); + atlasProperties = ApplicationProperties.get(); } catch (Exception e) { LOG.info("Attempting to send msg while shutdown in progress.", e); } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index a948c57..90076d3 100644 --- a/release-log.txt +++ b/release-log.txt @@ -3,9 +3,10 @@ Apache Atlas Release Notes --trunk - unreleased INCOMPATIBLE CHANGES: +ATLAS-483 Remove client.properties (tbeerbower via shwethags) +ATLAS-349 SSL - Atlas SSL connection has weak/unsafe Ciphers suites (ndjouhr via shwethags) ATLAS-409 Atlas will not import avro tables with schema read from a file ([email protected] via shwethags) ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) -ATLAS-349 SSL - Atlas SSL connection has weak/unsafe Ciphers suites (ndjouhr via shwethags) ALL CHANGES: ATLAS_396 Creating an entity with non-existing type results in "Unable to deserialize json" error (guptaneeru via sumasai) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java index 6fc43c9..8eb8094 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/NegativeSSLAndKerberosTest.java @@ -61,7 +61,8 @@ public class NegativeSSLAndKerberosTest extends BaseSSLAndKerberosTest { final PropertiesConfiguration configuration = getSSLConfiguration(providerUrl); configuration.setProperty("atlas.http.authentication.type", "kerberos"); - TestUtils.writeConfiguration(configuration, persistDir + File.separator + "client.properties"); + TestUtils.writeConfiguration(configuration, persistDir + File.separator + + ApplicationProperties.APPLICATION_PROPERTIES); String confLocation = System.getProperty("atlas.conf"); URL url; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java index 90b6a14..a3b3a3c 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java @@ -70,7 +70,8 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest { // client will actually only leverage subset of these properties final PropertiesConfiguration configuration = getSSLConfiguration(providerUrl); configuration.setProperty("atlas.http.authentication.type", "kerberos"); - TestUtils.writeConfiguration(configuration, persistDir + File.separator + "client.properties"); + TestUtils.writeConfiguration(configuration, persistDir + File.separator + + ApplicationProperties.APPLICATION_PROPERTIES); String confLocation = System.getProperty("atlas.conf"); URL url; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/99921930/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java index 9ee3b46..aad3f3b 100755 --- a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java @@ -18,6 +18,7 @@ package org.apache.atlas.web.security; +import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasClient; import org.apache.atlas.AtlasException; import org.apache.atlas.web.TestUtils; @@ -73,7 +74,8 @@ public class SSLTest extends BaseSSLAndKerberosTest { setupCredentials(); final PropertiesConfiguration configuration = getSSLConfiguration(providerUrl); - TestUtils.writeConfiguration(configuration, persistDir + File.separator + "client.properties"); + TestUtils.writeConfiguration(configuration, persistDir + File.separator + + ApplicationProperties.APPLICATION_PROPERTIES); dgiCLient = new AtlasClient(DGI_URL) { @Override
