Repository: incubator-atlas Updated Branches: refs/heads/master dd030ecaa -> 9eafb165a
ATLAS-1086 Build failure in hive-bridge after security fixes in ATLAS-762 (sumasai) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/9eafb165 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/9eafb165 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/9eafb165 Branch: refs/heads/master Commit: 9eafb165addfe6d919c5179412cea5e34b3003e3 Parents: dd030ec Author: Suma Shivaprasad <[email protected]> Authored: Wed Aug 3 20:10:28 2016 -0700 Committer: Suma Shivaprasad <[email protected]> Committed: Wed Aug 3 20:10:28 2016 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/atlas/falcon/hook/FalconHookIT.java | 7 ++++++- .../src/test/java/org/apache/atlas/hive/HiveITBase.java | 7 ++++++- .../test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java | 7 ++++++- .../java/org/apache/atlas/storm/hook/StormAtlasHookIT.java | 8 +++++++- release-log.txt | 1 + 5 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9eafb165/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java ---------------------------------------------------------------------- diff --git a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java index f7184f9..0ce7ecb 100644 --- a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java +++ b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java @@ -31,6 +31,7 @@ import org.apache.atlas.hive.model.HiveDataTypes; import org.apache.atlas.typesystem.Referenceable; import org.apache.atlas.typesystem.persistence.Id; import org.apache.atlas.typesystem.types.TypeUtils; +import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.ParamChecker; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.RandomStringUtils; @@ -74,7 +75,11 @@ public class FalconHookIT { @BeforeClass public void setUp() throws Exception { Configuration atlasProperties = ApplicationProperties.get(); - atlasClient = new AtlasClient(atlasProperties.getString("atlas.rest.address")); + if (!AuthenticationUtil.isKerberosAuthenticationEnabled()) { + atlasClient = new AtlasClient(new String[]{atlasProperties.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT)}, new String[]{"admin", "admin"}); + } else { + atlasClient = new AtlasClient(atlasProperties.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT)); + } AtlasService service = new AtlasService(); service.init(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9eafb165/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java index c90fec5..e3dc1ad 100644 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java @@ -26,6 +26,7 @@ import org.apache.atlas.hive.hook.HiveHookIT; import org.apache.atlas.hive.model.HiveDataTypes; import org.apache.atlas.typesystem.Referenceable; import org.apache.atlas.typesystem.persistence.Id; +import org.apache.atlas.utils.AuthenticationUtil; import org.apache.atlas.utils.ParamChecker; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.RandomStringUtils; @@ -79,7 +80,11 @@ public class HiveITBase { SessionState.setCurrentSessionState(ss); Configuration configuration = ApplicationProperties.get(); - atlasClient = new AtlasClient(configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT, DGI_URL)); + if (!AuthenticationUtil.isKerberosAuthenticationEnabled()) { + atlasClient = new AtlasClient(new String[]{configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT, DGI_URL)}, new String[]{"admin", "admin"}); + } else { + atlasClient = new AtlasClient(configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT, DGI_URL)); + } hiveMetaStoreBridge = new HiveMetaStoreBridge(configuration, conf, atlasClient); hiveMetaStoreBridge.registerHiveDataModel(); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9eafb165/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java ---------------------------------------------------------------------- diff --git a/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java b/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java index 577fde6..2a5bf9b 100644 --- a/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java +++ b/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java @@ -26,6 +26,7 @@ import org.apache.atlas.hive.bridge.HiveMetaStoreBridge; import org.apache.atlas.hive.model.HiveDataTypes; import org.apache.atlas.sqoop.model.SqoopDataModelGenerator; import org.apache.atlas.sqoop.model.SqoopDataTypes; +import org.apache.atlas.utils.AuthenticationUtil; import org.apache.commons.configuration.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.sqoop.SqoopJobDataPublisher; @@ -48,7 +49,11 @@ public class SqoopHookIT { public void setUp() throws Exception { //Set-up sqoop session Configuration configuration = ApplicationProperties.get(); - atlasClient = new AtlasClient(configuration.getString("atlas.rest.address")); + if (!AuthenticationUtil.isKerberosAuthenticationEnabled()) { + atlasClient = new AtlasClient(new String[]{configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT)}, new String[]{"admin", "admin"}); + } else { + atlasClient = new AtlasClient(configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT)); + } registerDataModels(atlasClient); } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9eafb165/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java ---------------------------------------------------------------------- diff --git a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java index e4a0d69..d3beb63 100644 --- a/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java +++ b/addons/storm-bridge/src/test/java/org/apache/atlas/storm/hook/StormAtlasHookIT.java @@ -23,6 +23,7 @@ import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasClient; import org.apache.atlas.AtlasException; import org.apache.atlas.AtlasServiceException; +import org.apache.atlas.hive.bridge.HiveMetaStoreBridge; import org.apache.atlas.hive.model.HiveDataModelGenerator; import org.apache.atlas.hive.model.HiveDataTypes; import org.apache.atlas.storm.model.StormDataModel; @@ -30,6 +31,7 @@ import org.apache.atlas.storm.model.StormDataTypes; import org.apache.atlas.typesystem.Referenceable; import org.apache.atlas.typesystem.TypesDef; import org.apache.atlas.typesystem.json.TypesSerialization; +import org.apache.atlas.utils.AuthenticationUtil; import org.apache.commons.configuration.Configuration; import org.apache.storm.ILocalCluster; import org.apache.storm.generated.StormTopology; @@ -60,7 +62,11 @@ public class StormAtlasHookIT { LOG.info("Created a storm local cluster"); Configuration configuration = ApplicationProperties.get(); - atlasClient = new AtlasClient(configuration.getString("atlas.rest.address", ATLAS_URL)); + if (!AuthenticationUtil.isKerberosAuthenticationEnabled()) { + atlasClient = new AtlasClient(new String[]{configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT)}, new String[]{"admin", "admin"}); + } else { + atlasClient = new AtlasClient(configuration.getString(HiveMetaStoreBridge.ATLAS_ENDPOINT)); + } registerDataModel(new HiveDataModelGenerator()); } http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9eafb165/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 35c1ea8..9424c2d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ALL CHANGES: +ATLAS-1086 Build failure in hive-bridge after security fixes in ATLAS-762 (sumasai) ATLAS-1088 Fix /search api to default to fulltext on dsl failure (sumasai) ATLAS-762 Assertion in NegativeSSLAndKerberosTest.testUnsecuredClient needs to be hardened (nixonrodrigues via sumasai) ATLAS-1071 Regression - UI - Details Button under Audits Tab is not working.(kevalbhatt18 via sumasai)
