You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2018/09/23 03:23:59 UTC
[02/45] hadoop git commit: HADOOP-15694. ABFS: Allow OAuth
credentials to not be tied to accounts. Contributed by Sean Mackrory.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/TestAccountConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/TestAccountConfiguration.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/TestAccountConfiguration.java
new file mode 100644
index 0000000..425485c
--- /dev/null
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/TestAccountConfiguration.java
@@ -0,0 +1,273 @@
+/**
+ * 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.hadoop.fs.azurebfs;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.azurebfs.contracts.exceptions.InvalidConfigurationValueException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+/**
+ * Tests correct precedence of various configurations that might be returned.
+ * Configuration can be specified with the account name as a suffix to the
+ * config key, or without one. Account-specific values should be returned
+ * whenever they exist. Account-agnostic values are returned if they do not.
+ * Default values are returned if neither exists.
+ *
+ * These tests are in 2 main groups: tests of methods that allow default values
+ * (such as get and getPasswordString) are of one form, while tests of methods
+ * that do allow default values (all others) follow another form.
+ */
+public class TestAccountConfiguration {
+
+ @Test
+ public void testStringPrecedence()
+ throws IllegalAccessException, IOException, InvalidConfigurationValueException {
+ AbfsConfiguration abfsConf;
+ final Configuration conf = new Configuration();
+
+ final String accountName1 = "account1";
+ final String accountName2 = "account2";
+ final String accountName3 = "account3";
+
+ final String globalKey = "fs.azure.configuration";
+ final String accountKey1 = globalKey + "." + accountName1;
+ final String accountKey2 = globalKey + "." + accountName2;
+ final String accountKey3 = globalKey + "." + accountName3;
+
+ final String globalValue = "global";
+ final String accountValue1 = "one";
+ final String accountValue2 = "two";
+
+ conf.set(accountKey1, accountValue1);
+ conf.set(accountKey2, accountValue2);
+ conf.set(globalKey, globalValue);
+
+ abfsConf = new AbfsConfiguration(conf, accountName1);
+ assertEquals("Wrong value returned when account-specific value was requested",
+ abfsConf.get(accountKey1), accountValue1);
+ assertEquals("Account-specific value was not returned when one existed",
+ abfsConf.get(globalKey), accountValue1);
+
+ abfsConf = new AbfsConfiguration(conf, accountName2);
+ assertEquals("Wrong value returned when a different account-specific value was requested",
+ abfsConf.get(accountKey1), accountValue1);
+ assertEquals("Wrong value returned when account-specific value was requested",
+ abfsConf.get(accountKey2), accountValue2);
+ assertEquals("Account-agnostic value return even though account-specific value was set",
+ abfsConf.get(globalKey), accountValue2);
+
+ abfsConf = new AbfsConfiguration(conf, accountName3);
+ assertNull("Account-specific value returned when none was set",
+ abfsConf.get(accountKey3));
+ assertEquals("Account-agnostic value not returned when no account-specific value was set",
+ abfsConf.get(globalKey), globalValue);
+ }
+
+ @Test
+ public void testPasswordPrecedence()
+ throws IllegalAccessException, IOException, InvalidConfigurationValueException {
+ AbfsConfiguration abfsConf;
+ final Configuration conf = new Configuration();
+
+ final String accountName1 = "account1";
+ final String accountName2 = "account2";
+ final String accountName3 = "account3";
+
+ final String globalKey = "fs.azure.password";
+ final String accountKey1 = globalKey + "." + accountName1;
+ final String accountKey2 = globalKey + "." + accountName2;
+ final String accountKey3 = globalKey + "." + accountName3;
+
+ final String globalValue = "global";
+ final String accountValue1 = "one";
+ final String accountValue2 = "two";
+
+ conf.set(accountKey1, accountValue1);
+ conf.set(accountKey2, accountValue2);
+ conf.set(globalKey, globalValue);
+
+ abfsConf = new AbfsConfiguration(conf, accountName1);
+ assertEquals("Wrong value returned when account-specific value was requested",
+ abfsConf.getPasswordString(accountKey1), accountValue1);
+ assertEquals("Account-specific value was not returned when one existed",
+ abfsConf.getPasswordString(globalKey), accountValue1);
+
+ abfsConf = new AbfsConfiguration(conf, accountName2);
+ assertEquals("Wrong value returned when a different account-specific value was requested",
+ abfsConf.getPasswordString(accountKey1), accountValue1);
+ assertEquals("Wrong value returned when account-specific value was requested",
+ abfsConf.getPasswordString(accountKey2), accountValue2);
+ assertEquals("Account-agnostic value return even though account-specific value was set",
+ abfsConf.getPasswordString(globalKey), accountValue2);
+
+ abfsConf = new AbfsConfiguration(conf, accountName3);
+ assertNull("Account-specific value returned when none was set",
+ abfsConf.getPasswordString(accountKey3));
+ assertEquals("Account-agnostic value not returned when no account-specific value was set",
+ abfsConf.getPasswordString(globalKey), globalValue);
+ }
+
+ @Test
+ public void testBooleanPrecedence()
+ throws IllegalAccessException, IOException, InvalidConfigurationValueException {
+
+ final String accountName = "account";
+ final String globalKey = "fs.azure.bool";
+ final String accountKey = globalKey + "." + accountName;
+
+ final Configuration conf = new Configuration();
+ final AbfsConfiguration abfsConf = new AbfsConfiguration(conf, accountName);
+
+ conf.setBoolean(globalKey, false);
+ assertEquals("Default value returned even though account-agnostic config was set",
+ abfsConf.getBoolean(globalKey, true), false);
+ conf.unset(globalKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getBoolean(globalKey, true), true);
+
+ conf.setBoolean(accountKey, false);
+ assertEquals("Default value returned even though account-specific config was set",
+ abfsConf.getBoolean(globalKey, true), false);
+ conf.unset(accountKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getBoolean(globalKey, true), true);
+
+ conf.setBoolean(accountKey, true);
+ conf.setBoolean(globalKey, false);
+ assertEquals("Account-agnostic or default value returned even though account-specific config was set",
+ abfsConf.getBoolean(globalKey, false), true);
+ }
+
+ @Test
+ public void testLongPrecedence()
+ throws IllegalAccessException, IOException, InvalidConfigurationValueException {
+
+ final String accountName = "account";
+ final String globalKey = "fs.azure.long";
+ final String accountKey = globalKey + "." + accountName;
+
+ final Configuration conf = new Configuration();
+ final AbfsConfiguration abfsConf = new AbfsConfiguration(conf, accountName);
+
+ conf.setLong(globalKey, 0);
+ assertEquals("Default value returned even though account-agnostic config was set",
+ abfsConf.getLong(globalKey, 1), 0);
+ conf.unset(globalKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getLong(globalKey, 1), 1);
+
+ conf.setLong(accountKey, 0);
+ assertEquals("Default value returned even though account-specific config was set",
+ abfsConf.getLong(globalKey, 1), 0);
+ conf.unset(accountKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getLong(globalKey, 1), 1);
+
+ conf.setLong(accountKey, 1);
+ conf.setLong(globalKey, 0);
+ assertEquals("Account-agnostic or default value returned even though account-specific config was set",
+ abfsConf.getLong(globalKey, 0), 1);
+ }
+
+ public enum GetEnumType {
+ TRUE, FALSE
+ }
+
+ @Test
+ public void testEnumPrecedence()
+ throws IllegalAccessException, IOException, InvalidConfigurationValueException {
+
+ final String accountName = "account";
+ final String globalKey = "fs.azure.enum";
+ final String accountKey = globalKey + "." + accountName;
+
+ final Configuration conf = new Configuration();
+ final AbfsConfiguration abfsConf = new AbfsConfiguration(conf, accountName);
+
+ conf.setEnum(globalKey, GetEnumType.FALSE);
+ assertEquals("Default value returned even though account-agnostic config was set",
+ abfsConf.getEnum(globalKey, GetEnumType.TRUE), GetEnumType.FALSE);
+ conf.unset(globalKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getEnum(globalKey, GetEnumType.TRUE), GetEnumType.TRUE);
+
+ conf.setEnum(accountKey, GetEnumType.FALSE);
+ assertEquals("Default value returned even though account-specific config was set",
+ abfsConf.getEnum(globalKey, GetEnumType.TRUE), GetEnumType.FALSE);
+ conf.unset(accountKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getEnum(globalKey, GetEnumType.TRUE), GetEnumType.TRUE);
+
+ conf.setEnum(accountKey, GetEnumType.TRUE);
+ conf.setEnum(globalKey, GetEnumType.FALSE);
+ assertEquals("Account-agnostic or default value returned even though account-specific config was set",
+ abfsConf.getEnum(globalKey, GetEnumType.FALSE), GetEnumType.TRUE);
+ }
+
+ interface GetClassInterface {
+ }
+
+ private class GetClassImpl0 implements GetClassInterface {
+ }
+
+ private class GetClassImpl1 implements GetClassInterface {
+ }
+
+ @Test
+ public void testClassPrecedence()
+ throws IllegalAccessException, IOException, InvalidConfigurationValueException {
+
+ final String accountName = "account";
+ final String globalKey = "fs.azure.class";
+ final String accountKey = globalKey + "." + accountName;
+
+ final Configuration conf = new Configuration();
+ final AbfsConfiguration abfsConf = new AbfsConfiguration(conf, accountName);
+
+ final Class class0 = GetClassImpl0.class;
+ final Class class1 = GetClassImpl1.class;
+ final Class xface = GetClassInterface.class;
+
+ conf.setClass(globalKey, class0, xface);
+ assertEquals("Default value returned even though account-agnostic config was set",
+ abfsConf.getClass(globalKey, class1, xface), class0);
+ conf.unset(globalKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getClass(globalKey, class1, xface), class1);
+
+ conf.setClass(accountKey, class0, xface);
+ assertEquals("Default value returned even though account-specific config was set",
+ abfsConf.getClass(globalKey, class1, xface), class0);
+ conf.unset(accountKey);
+ assertEquals("Default value not returned even though config was unset",
+ abfsConf.getClass(globalKey, class1, xface), class1);
+
+ conf.setClass(accountKey, class1, xface);
+ conf.setClass(globalKey, class0, xface);
+ assertEquals("Account-agnostic or default value returned even though account-specific config was set",
+ abfsConf.getClass(globalKey, class0, xface), class1);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/constants/TestConfigurationKeys.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/constants/TestConfigurationKeys.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/constants/TestConfigurationKeys.java
index 7852f25..49a0e2e 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/constants/TestConfigurationKeys.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/constants/TestConfigurationKeys.java
@@ -24,7 +24,7 @@ package org.apache.hadoop.fs.azurebfs.constants;
public final class TestConfigurationKeys {
public static final String FS_AZURE_ACCOUNT_NAME = "fs.azure.account.name";
public static final String FS_AZURE_ABFS_ACCOUNT_NAME = "fs.azure.abfs.account.name";
- public static final String FS_AZURE_ACCOUNT_KEY_PREFIX = "fs.azure.account.key.";
+ public static final String FS_AZURE_ACCOUNT_KEY = "fs.azure.account.key";
public static final String FS_AZURE_CONTRACT_TEST_URI = "fs.contract.test.fs.abfs";
public static final String FS_AZURE_BLOB_DATA_CONTRIBUTOR_CLIENT_ID = "fs.azure.account.oauth2.contributor.client.id";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ABFSContractTestBinding.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ABFSContractTestBinding.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ABFSContractTestBinding.java
index 6d089d1..79e295a 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ABFSContractTestBinding.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ABFSContractTestBinding.java
@@ -20,8 +20,8 @@ package org.apache.hadoop.fs.azurebfs.contract;
import java.net.URI;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+import org.apache.hadoop.fs.azurebfs.AbfsConfiguration;
import org.apache.hadoop.fs.azurebfs.AbstractAbfsIntegrationTest;
import org.apache.hadoop.fs.azurebfs.constants.FileSystemUriSchemes;
import org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys;
@@ -41,7 +41,7 @@ public class ABFSContractTestBinding extends AbstractAbfsIntegrationTest {
public ABFSContractTestBinding(
final boolean useExistingFileSystem) throws Exception{
if (useExistingFileSystem) {
- Configuration configuration = getConfiguration();
+ AbfsConfiguration configuration = getConfiguration();
String testUrl = configuration.get(TestConfigurationKeys.FS_AZURE_CONTRACT_TEST_URI);
Assume.assumeTrue("Contract tests are skipped because of missing config property :"
+ TestConfigurationKeys.FS_AZURE_CONTRACT_TEST_URI, testUrl != null);
@@ -61,10 +61,6 @@ public class ABFSContractTestBinding extends AbstractAbfsIntegrationTest {
}
}
- public Configuration getConfiguration() {
- return super.getConfiguration();
- }
-
public boolean isSecureMode() {
return this.getAuthType() == AuthType.SharedKey ? false : true;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractAppend.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractAppend.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractAppend.java
index 8a955bc..59df4f0 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractAppend.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractAppend.java
@@ -45,7 +45,7 @@ public class ITestAbfsFileSystemContractAppend extends AbstractContractAppendTes
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractConcat.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractConcat.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractConcat.java
index 383528b..c67e2bc 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractConcat.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractConcat.java
@@ -41,7 +41,7 @@ public class ITestAbfsFileSystemContractConcat extends AbstractContractConcatTes
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractCreate.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractCreate.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractCreate.java
index 3c3e949..11d0164 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractCreate.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractCreate.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractCreate extends AbstractContractCreateTes
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractDelete.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractDelete.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractDelete.java
index 1d1136c..9d77829 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractDelete.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractDelete.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractDelete extends AbstractContractDeleteTes
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractGetFileStatus.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractGetFileStatus.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractGetFileStatus.java
index 08b7eef..f64abf9 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractGetFileStatus.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractGetFileStatus.java
@@ -41,7 +41,7 @@ public class ITestAbfsFileSystemContractGetFileStatus extends AbstractContractGe
@Override
protected Configuration createConfiguration() {
- return this.binding.getConfiguration();
+ return this.binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractMkdir.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractMkdir.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractMkdir.java
index 7b78575..99959ed 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractMkdir.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractMkdir.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractMkdir extends AbstractContractMkdirTest
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractOpen.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractOpen.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractOpen.java
index 41f691d..43552e5 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractOpen.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractOpen.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractOpen extends AbstractContractOpenTest {
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
index 82f104a..b92bef6 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRename.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractRename extends AbstractContractRenameTes
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRootDirectory.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRootDirectory.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRootDirectory.java
index 5b5493f..5da2c76 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRootDirectory.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractRootDirectory.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractRootDirectory extends AbstractContractRo
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSeek.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSeek.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSeek.java
index 4529e75..35a5e17 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSeek.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSeek.java
@@ -42,7 +42,7 @@ public class ITestAbfsFileSystemContractSeek extends AbstractContractSeekTest{
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSetTimes.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSetTimes.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSetTimes.java
index 6c4f9ba..4043484 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSetTimes.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/contract/ITestAbfsFileSystemContractSetTimes.java
@@ -41,7 +41,7 @@ public class ITestAbfsFileSystemContractSetTimes extends AbstractContractSetTime
@Override
protected Configuration createConfiguration() {
- return binding.getConfiguration();
+ return binding.getRawConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClient.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClient.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClient.java
index a2fdd09..6a92bb2b4 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClient.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClient.java
@@ -35,6 +35,8 @@ import org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys;
*/
public final class TestAbfsClient {
+ private final String accountName = "bogusAccountName";
+
private void validateUserAgent(String expectedPattern,
URL baseUrl,
AbfsConfiguration config,
@@ -55,7 +57,7 @@ public final class TestAbfsClient {
String expectedUserAgentPattern = "Azure Blob FS\\/1.0 \\(JavaJRE ([^\\)]+)\\)";
final Configuration configuration = new Configuration();
configuration.unset(ConfigurationKeys.FS_AZURE_USER_AGENT_PREFIX_KEY);
- AbfsConfiguration abfsConfiguration = new AbfsConfiguration(configuration);
+ AbfsConfiguration abfsConfiguration = new AbfsConfiguration(configuration, accountName);
validateUserAgent(expectedUserAgentPattern, new URL("http://azure.com"),
abfsConfiguration, false);
}
@@ -65,7 +67,7 @@ public final class TestAbfsClient {
String expectedUserAgentPattern = "Azure Blob FS\\/1.0 \\(JavaJRE ([^\\)]+)\\) Partner Service";
final Configuration configuration = new Configuration();
configuration.set(ConfigurationKeys.FS_AZURE_USER_AGENT_PREFIX_KEY, "Partner Service");
- AbfsConfiguration abfsConfiguration = new AbfsConfiguration(configuration);
+ AbfsConfiguration abfsConfiguration = new AbfsConfiguration(configuration, accountName);
validateUserAgent(expectedUserAgentPattern, new URL("http://azure.com"),
abfsConfiguration, false);
}
@@ -77,8 +79,8 @@ public final class TestAbfsClient {
configuration.set(ConfigurationKeys.FS_AZURE_USER_AGENT_PREFIX_KEY, "Partner Service");
configuration.set(ConfigurationKeys.FS_AZURE_SSL_CHANNEL_MODE_KEY,
SSLSocketFactoryEx.SSLChannelMode.Default_JSSE.name());
- AbfsConfiguration abfsConfiguration = new AbfsConfiguration(configuration);
+ AbfsConfiguration abfsConfiguration = new AbfsConfiguration(configuration, accountName);
validateUserAgent(expectedUserAgentPattern, new URL("https://azure.com"),
abfsConfiguration, true);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestShellDecryptionKeyProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestShellDecryptionKeyProvider.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestShellDecryptionKeyProvider.java
index d17e767..5ef4eab 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestShellDecryptionKeyProvider.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestShellDecryptionKeyProvider.java
@@ -54,6 +54,7 @@ public class TestShellDecryptionKeyProvider {
String key = "key";
conf.set(ConfigurationKeys.FS_AZURE_ACCOUNT_KEY_PROPERTY_NAME + account, key);
+
try {
provider.getStorageAccountKey(account, conf);
Assert
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5593cbd/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AbfsTestUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AbfsTestUtils.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AbfsTestUtils.java
index 9c636a2..7e6336d 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AbfsTestUtils.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/utils/AbfsTestUtils.java
@@ -37,6 +37,11 @@ import static org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys.TEST
public final class AbfsTestUtils extends AbstractAbfsIntegrationTest{
private static final Logger LOG =
LoggerFactory.getLogger(AbfsTestUtils.class);
+
+ public AbfsTestUtils() throws Exception {
+ super();
+ }
+
/**
* If unit tests were interrupted and crushed accidentally, the test containers won't be deleted.
* In that case, dev can use this tool to list and delete all test containers.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org