HADOOP-12520. Use XInclude in hadoop-azure test configuration to isolate Azure Storage account keys for service integration tests. Contributed by Chris Nauroth.
(cherry picked from commit 73822de7c38e189f7654444ff48d15cbe0df7404) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a23f79b9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a23f79b9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a23f79b9 Branch: refs/heads/branch-2 Commit: a23f79b92c74013525106ab93bc55c97c4a243f2 Parents: e984534 Author: cnauroth <cnaur...@apache.org> Authored: Tue Oct 27 22:48:56 2015 -0700 Committer: cnauroth <cnaur...@apache.org> Committed: Tue Oct 27 22:49:04 2015 -0700 ---------------------------------------------------------------------- .gitignore | 1 + hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++ .../hadoop-azure/src/site/markdown/index.md | 29 ++++++++++++-------- .../src/test/resources/azure-test.xml | 14 ++++++++-- 4 files changed, 33 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a23f79b9/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index e115db1..1bfa8df 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/tla/yarnregistry.t yarnregistry.pdf hadoop-tools/hadoop-aws/src/test/resources/auth-keys.xml hadoop-tools/hadoop-aws/src/test/resources/contract-test-options.xml +hadoop-tools/hadoop-azure/src/test/resources/azure-auth-keys.xml patchprocess/ http://git-wip-us.apache.org/repos/asf/hadoop/blob/a23f79b9/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index b99fd7b..0347a1d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -319,6 +319,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12472. Make GenericTestUtils.assertExceptionContains robust. (Steve Loughran via jing9) + HADOOP-12520. Use XInclude in hadoop-azure test configuration to isolate + Azure Storage account keys for service integration tests. (cnauroth) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/a23f79b9/hadoop-tools/hadoop-azure/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/site/markdown/index.md b/hadoop-tools/hadoop-azure/src/site/markdown/index.md index 0d69ccf..9d0115a 100644 --- a/hadoop-tools/hadoop-azure/src/site/markdown/index.md +++ b/hadoop-tools/hadoop-azure/src/site/markdown/index.md @@ -226,18 +226,25 @@ following failure message: To resolve this, restart the Azure Emulator. Ensure it v3.2 or later. -It's also possible to run tests against a live Azure Storage account by adding -credentials to `src/test/resources/azure-test.xml` and setting +It's also possible to run tests against a live Azure Storage account by saving a +file to `src/test/resources/azure-auth-keys.xml` and setting `fs.azure.test.account.name` to the name of the storage account. For example: - <property> - <name>fs.azure.account.key.youraccount.blob.core.windows.net</name> - <value>YOUR ACCESS KEY</value> - </property> - - <property> - <name>fs.azure.test.account.name</name> - <value>youraccount</value> - </property> + <?xml version="1.0"?> + <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> + <configuration> + <property> + <name>fs.azure.account.key.youraccount.blob.core.windows.net</name> + <value>YOUR ACCESS KEY</value> + </property> + + <property> + <name>fs.azure.test.account.name</name> + <value>youraccount</value> + </property> + </configuration> + +DO NOT ADD azure-auth-keys.xml TO REVISION CONTROL. The keys to your Azure +Storage account are a secret and must not be shared. http://git-wip-us.apache.org/repos/asf/hadoop/blob/a23f79b9/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml index 75b466d..00611fc 100644 --- a/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml +++ b/hadoop-tools/hadoop-azure/src/test/resources/azure-test.xml @@ -15,7 +15,7 @@ <?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <configuration xmlns:xi="http://www.w3.org/2001/XInclude";> - + <!-- For tests against live azure, provide the following account information --> <!-- <property> @@ -26,8 +26,16 @@ <name>fs.azure.account.key.{ACCOUNTNAME}.blob.core.windows.net</name> <value>{ACCOUNTKEY}</value> </property> - --> - + --> + + <!-- Save the above configuration properties in a separate file named --> + <!-- azure-auth-keys.xml in the same directory as this file. --> + <!-- DO NOT ADD azure-auth-keys.xml TO REVISION CONTROL. The keys to your --> + <!-- Azure Storage account are a secret and must not be shared. --> + <include xmlns="http://www.w3.org/2001/XInclude"; href="azure-auth-keys.xml"> + <fallback /> + </include> + <!-- For tests against azure-emulator --> <!-- <property>
