ITestAbfsCustomEncryption can still work with non hns config, proper guardrail to assert that fs init would fail

Author: saxenapranav

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java

@@ -231,8 +231,8 @@ public void initialize(URI uri, Configuration configuration)
             || StringUtils.isNotEmpty(
             abfsConfiguration.getEncodedClientProvidedEncryptionKey()))) {
       close();
-      throw new PathIOException(
-          "Non HNS account " + uri.getPath() + " can not have CPK configs enabled.");
+      throw new PathIOException(uri.getPath(),
+          "Non HNS account can not have CPK configs enabled.");
     }
 
     LOG.trace("Initiate check for delegation token manager");

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsCustomEncryption.java

@@ -171,21 +171,43 @@ public static Iterable<Object[]> params() {
   }
 
   public ITestAbfsCustomEncryption() throws Exception {
-    Assume.assumeTrue("Account should be HNS enabled for CPK",
-        getConfiguration().getBoolean(FS_AZURE_TEST_NAMESPACE_ENABLED_ACCOUNT,
-            false));
     new Random().nextBytes(cpk);
     cpkSHAEncoded = EncodingHelper.getBase64EncodedString(
         EncodingHelper.getSHA256Hash(cpk));
   }
 
   @Test
   public void testCustomEncryptionCombinations() throws Exception {
-    AzureBlobFileSystem fs = getOrCreateFS();
+    final AzureBlobFileSystem fs;
+    try {
+      fs = getOrCreateFS();
+    } catch (PathIOException ex) {
+      if (ex.getMessage()
+          .contains("Non HNS account can not have CPK configs enabled.")) {
+        return;
+      } else {
+        throw ex;
+      }
+    }
     Path testPath = path("/testFile");
     String relativePath = fs.getAbfsStore().getRelativePath(testPath);
-    MockEncryptionContextProvider ecp =
-        (MockEncryptionContextProvider) createEncryptedFile(testPath);
+    final MockEncryptionContextProvider ecp;
+    try {
+      ecp = (MockEncryptionContextProvider) createEncryptedFile(testPath);
+    } catch (PathIOException ex) {
+      if (ex.getMessage()
+          .contains("Non HNS account can not have CPK configs enabled.")) {
+        return;
+      } else {
+        throw ex;
+      }
+    }
+    Assertions.assertThat(
+            getConfiguration().getBoolean(FS_AZURE_TEST_NAMESPACE_ENABLED_ACCOUNT,
+                false))
+        .describedAs(
+            "Encryption tests should run only on namespace enabled account")
+        .isTrue();
     AbfsRestOperation op = callOperation(fs, new Path(relativePath), ecp);
     if (op == null) {
       return;