Adapt to using HNS account instead when using BlobFS

Author: adreed-msft

cmd/zc_traverser_blob.go

@@ -256,8 +256,9 @@ func (t *blobTraverser) Traverse(preprocessor objectMorpher, processor objectPro
 		if !t.includeDeleted && (isBlob || err != nil) {
 			return err
 		}
-	} else if blobURLParts.BlobName == "" && t.preservePermissions.IsTruthy() {
-		// if the root is a container and we're copying "folders", we should persist the ACLs there too.
+	} else if blobURLParts.BlobName == "" && (t.preservePermissions.IsTruthy() || t.isDFS) {
+		// If the root is a container and we're copying "folders", we should persist the ACLs there too.
+		// For DFS, we should always include the container root.
 		if azcopyScanningLogger != nil {
 			azcopyScanningLogger.Log(common.LogDebug, "Detected the root as a container.")
 		}
@@ -560,8 +561,8 @@ func newBlobTraverser(rawURL string, serviceClient *service.Client, ctx context.
 		includeDeleted:              includeDeleted,
 		includeSnapshot:             includeSnapshot,
 		includeVersion:              includeVersion,
-		preservePermissions: 		 preservePermissions,
-		isDFS:			     	     isDFS,
+		preservePermissions:         preservePermissions,
+		isDFS:                       isDFS,
 	}
 
 	disableHierarchicalScanning := strings.ToLower(glcm.GetEnvironmentVariable(common.EEnvironmentVariable.DisableHierarchicalScanning()))

e2etest/declarativeRunner.go

@@ -167,19 +167,20 @@ func RunScenarios(
 					subtestName += "-" + scenarioSuffix
 				}
 
+				usedSrc, usedDst := srcAccountType, destAccountType
 				if fromTo.From() == common.ELocation.BlobFS() {
 					// switch to an account made for dfs
-					srcAccountType = EAccountType.HierarchicalNamespaceEnabled()
+					usedSrc = EAccountType.HierarchicalNamespaceEnabled()
 				}
 
 				if fromTo.To() == common.ELocation.BlobFS() {
 					// switch to an account made for dfs
-					destAccountType = EAccountType.HierarchicalNamespaceEnabled()
+					usedDst = EAccountType.HierarchicalNamespaceEnabled()
 				}
 
 				s := scenario{
-					srcAccountType:      srcAccountType,
-					destAccountType:     destAccountType,
+					srcAccountType:      usedSrc,
+					destAccountType:     usedDst,
 					subtestName:         subtestName,
 					compactScenarioName: compactScenarioName,
 					fullScenarioName:    fullScenarioName,

e2etest/zt_basic_copy_sync_remove_test.go

@@ -39,7 +39,7 @@ import (
 
 // ================================  Copy And Sync: Upload, Download, and S2S  =========================================
 func TestBasic_CopyUploadSingleBlob(t *testing.T) {
-	RunScenarios(t, eOperation.CopyAndSync(), eTestFromTo.AllUploads(), eValidate.AutoPlusContent(), anonymousAuthOnly, allCredentialTypes, params{
+	RunScenarios(t, eOperation.Copy(), eTestFromTo.Other(common.EFromTo.LocalBlobFS()), eValidate.AutoPlusContent(), anonymousAuthOnly, anonymousAuthOnly, params{
 		recursive: true,
 	}, nil, testFiles{
 		defaultSize: "1K",
@@ -136,7 +136,7 @@ func TestBasic_CopyUploadLargeAppendBlobBlockSizeFlag(t *testing.T) {
 }
 
 func TestBasic_CopyDownloadSingleBlob(t *testing.T) {
-	RunScenarios(t, eOperation.CopyAndSync(), eTestFromTo.AllDownloads(), eValidate.Auto(), allCredentialTypes, anonymousAuthOnly, params{
+	RunScenarios(t, eOperation.CopyAndSync(), eTestFromTo.AllDownloads(), eValidate.Auto(), anonymousAuthOnly, anonymousAuthOnly, params{
 		recursive: true,
 	}, nil, testFiles{
 		defaultSize: "1K",