Skip to content

Commit

Permalink
Updated Dependencies. (#1708)
Browse files Browse the repository at this point in the history
  • Loading branch information
mohsha-msft committed Mar 16, 2022
1 parent f4e5770 commit 7ee54bc
Show file tree
Hide file tree
Showing 15 changed files with 47 additions and 231 deletions.
2 changes: 1 addition & 1 deletion azbfs/zc_filesystemRequestOptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ type ListPathsFilesystemOptions struct {
MaxResults *int32
// The continuation token to resume listing.
ContinuationToken *string
}
}
2 changes: 1 addition & 1 deletion cmd/copyEnumeratorInit.go
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ func (cca *CookedCopyCmdArgs) MakeEscapedRelativePath(source bool, dstIsDir bool
panic("unexpected inescapable rootDir name")
}
}

relativePath = "/" + rootDir + relativePath
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ var rootCmd = &cobra.Command{
if err != nil {
return err
}
EnumerationParallelism = concurrencySettings.EnumerationPoolSize.Value
EnumerationParallelism = concurrencySettings.EnumerationPoolSize.Value
EnumerationParallelStatFiles = concurrencySettings.ParallelStatFiles.Value

// Log a clear ISO 8601-formatted start time, so it can be read and use in the --include-after parameter
Expand Down
2 changes: 1 addition & 1 deletion cmd/zc_traverser_local_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import (

func WrapFolder(fullpath string, stat os.FileInfo) (os.FileInfo, error) {
return stat, nil
}
}
2 changes: 1 addition & 1 deletion cmd/zc_traverser_local_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ func WrapFolder(fullpath string, stat os.FileInfo) (os.FileInfo, error) {
} else {
return nil, st.Error()
}
}
}
2 changes: 1 addition & 1 deletion cmd/zt_generic_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (s *genericFilterSuite) TestDateParsingForIncludeAfter(c *chk.C) {

// failure cases (these all get Go's cryptic datetime parsing error messages, unfortunately)
{"2019-03-31 18:30:15", "", "cannot parse \" 18:30:15\" as \"T\""}, // space instead of T
{"2019-03-31T18:30:15UTC", "", "cannot parse \"UTC\" as \".0000000\""}, // "UTC" instead of .0000000
{"2019-03-31T18:30:15UTC", "", "cannot parse \"UTC\" as \".0000000\""}, // "UTC" instead of .0000000
{"2019/03/31T18:30:15", "", "cannot parse \"/03/31T18:30:15\" as \"-\""}, //wrong date separator
{"2019-03-31T18:1:15", "", "cannot parse \"1:15\" as \"04\""}, // single-digit minute
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/zt_remove_blob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ func (s *cmdIntegrationSuite) TestRemoveBlobsUnderVirtualDirWithFromTo(c *chk.C)
func (s *cmdIntegrationSuite) TestPermDeleteSnapshotsVersionsUnderSingleBlob(c *chk.C) {
serviceURL := setUpAccountPermDelete(c)
os.Setenv("AZCOPY_DISABLE_HIERARCHICAL_SCAN", "true")

time.Sleep(time.Second * 10)

// set up the container with numerous blobs
Expand Down
2 changes: 1 addition & 1 deletion cmd/zt_remove_copy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ func (s *cmdIntegrationSuite) TestCopyBlobsWithDirectoryStubsS2S(c *chk.C) {

// validate that the right transfers were sent
expectedTransfers := scenarioHelper{}.shaveOffPrefix(blobAndDirStubsList, strings.TrimSuffix(vdirName, "/"))
validateCopyTransfersAreScheduled(c, true, true, vdirName, "/vdir1",expectedTransfers, mockedRPC)
validateCopyTransfersAreScheduled(c, true, true, vdirName, "/vdir1", expectedTransfers, mockedRPC)
})
}
2 changes: 1 addition & 1 deletion cmd/zt_scenario_helpers_for_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ func getDefaultCopyRawInput(src string, dst string) rawCopyCmdArgs {
s2sInvalidMetadataHandleOption: defaultS2SInvalideMetadataHandleOption.String(),
forceWrite: common.EOverwriteOption.True().String(),
preserveOwner: common.PreserveOwnerDefault,
asSubdir: true,
asSubdir: true,
}
}

Expand Down
4 changes: 2 additions & 2 deletions common/azError.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ func (err AzError) LoginCredMissing() AzError {
}

func (err AzError) InvalidBlobName() AzError {
return AzError {uint64(2), "Invalid Blob Name.", ""}
}
return AzError{uint64(2), "Invalid Blob Name.", ""}
}
4 changes: 2 additions & 2 deletions common/extensions_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package common

import (
chk "gopkg.in/check.v1"
"net/url"
"strings"
chk "gopkg.in/check.v1"
)

type extensionsTestSuite struct{}
Expand Down Expand Up @@ -122,7 +122,7 @@ func (*extensionsTestSuite) TestRedaction(c *chk.C) {
}

c.Assert(len(expectedOutputParams), chk.Equals, len(actualOutputParams))

var sigfound bool = false
for i := range expectedOutputParams {
expParam, expValue := strings.Split(expectedOutputParams[i], "=")[0], strings.Split(expectedOutputParams[i], "=")[1]
Expand Down
16 changes: 9 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
module github.com/Azure/azure-storage-azcopy/v10

require (
cloud.google.com/go/compute v1.5.0 // indirect
cloud.google.com/go/iam v0.2.0 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
cloud.google.com/go/storage v1.21.0
github.com/Azure/azure-pipeline-go v0.2.3
github.com/Azure/azure-storage-blob-go v0.13.1-0.20210914164749-2d6cd3e07548
Expand All @@ -18,16 +17,19 @@ require (
github.com/kr/pretty v0.3.0 // indirect
github.com/mattn/go-ieproxy v0.0.3
github.com/minio/minio-go v6.0.14+incompatible
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.3.0
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/spf13/cobra v1.4.0
github.com/stretchr/objx v0.3.0 // indirect
github.com/wastore/keychain v0.0.0-20180920053336-f2c902a3d807
github.com/wastore/keyctl v0.3.1
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7
google.golang.org/api v0.70.0
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5
google.golang.org/api v0.72.0
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
)

Expand Down
Loading

0 comments on commit 7ee54bc

Please sign in to comment.