Merge branch 'main' into dev

.github/workflows/codespell.yml

@@ -1,24 +1,24 @@
-# GitHub Action to automate the identification of common misspellings in text files.
-# https://github.com/codespell-project/actions-codespell
-# https://github.com/codespell-project/codespell
-name: codespell
-on:
-  push:
-    branches:
-      - dev
-      - main
-  pull_request:
-    branches:
-      - dev
-      - main
-jobs:
-  codespell:
-    name: Check for spelling errors
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: codespell-project/actions-codespell@master
-        with:
-          check_filenames: true
-          skip: ./sddl/sddlPortable_test.go,./sddl/sddlHelper_linux.go,./go.sum
+# GitHub Action to automate the identification of common misspellings in text files.
+# https://github.com/codespell-project/actions-codespell
+# https://github.com/codespell-project/codespell
+name: codespell
+on:
+  push:
+    branches:
+      - dev
+      - main
+  pull_request:
+    branches:
+      - dev
+      - main
+jobs:
+  codespell:
+    name: Check for spelling errors
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: codespell-project/actions-codespell@master
+        with:
+          check_filenames: true
+          skip: ./sddl/sddlPortable_test.go,./sddl/sddlHelper_linux.go,./go.sum
           ignore_words_list: "resue,pase,cancl,cacl,froms"

cmd/zc_traverser_blob.go

@@ -64,6 +64,8 @@ type blobTraverser struct {
 	includeSnapshot bool
 
 	includeVersion bool
+
+	stripTopDir bool
 }
 
 func (t *blobTraverser) IsDirectory(isSource bool) (bool, error) {

e2etest/declarativeRunner.go

@@ -111,16 +111,16 @@ func RunScenarios(
 	validate Validate, // TODO: do we really want the test author to have to nominate which validation should happen?  Pros: better perf of tests. Cons: they have to tell us, and if they tell us wrong test may not test what they think it tests
 // _ interface{}, // TODO if we want it??, blockBlobsOnly or specific/all blob types
 
-// It would be a pain to list out every combo by hand,
-// In addition to the fact that not every credential type is sensible.
-// Thus, the E2E framework takes in a requested set of credential types, and applies them where sensible.
-// This allows you to make tests use OAuth only, SAS only, etc.
+	// It would be a pain to list out every combo by hand,
+	// In addition to the fact that not every credential type is sensible.
+	// Thus, the E2E framework takes in a requested set of credential types, and applies them where sensible.
+	// This allows you to make tests use OAuth only, SAS only, etc.
 	requestedCredentialTypesSrc []common.CredentialType,
 	requestedCredentialTypesDst []common.CredentialType,
 	p params,
 	hs *hooks,
 	fs testFiles,
-// TODO: do we need something here to explicitly say that we expect success or failure? For now, we are just inferring that from the elements of sourceFiles
+	// TODO: do we need something here to explicitly say that we expect success or failure? For now, we are just inferring that from the elements of sourceFiles
 	destAccountType AccountType,
 	srcAccountType AccountType,
 	scenarioSuffix string) {

e2etest/scenario_os_helpers_for_windows.go

@@ -39,7 +39,7 @@ import (
 type osScenarioHelper struct{}
 
 // set file attributes to test file
-func (osScenarioHelper) setAttributesForLocalFile(filePath string, attrList []string) error {
+func (osScenarioHelper) setAttributesForLocalFile(filePath string, attrList []string) error { //nolint:golint,unused
 	lpFilePath, err := syscall.UTF16PtrFromString(filePath)
 	if err != nil {
 		return err
@@ -65,7 +65,7 @@ func (osScenarioHelper) setAttributesForLocalFile(filePath string, attrList []st
 	return err
 }
 
-func (s osScenarioHelper) setAttributesForLocalFiles(c asserter, dirPath string, fileList []string, attrList []string) {
+func (s osScenarioHelper) setAttributesForLocalFiles(c asserter, dirPath string, fileList []string, attrList []string) { //nolint:golint,unused
 	for _, fileName := range fileList {
 		err := s.setAttributesForLocalFile(filepath.Join(dirPath, fileName), attrList)
 		c.AssertNoErr(err)