Skip to content

Commit 3f3e1f0

Browse files
gapra-msftgapra-msft
authored
Upgraded to latest az storage sdks (#2599)
1 parent 2a5f5d6 commit 3f3e1f0

File tree

5 files changed

+99
-56
lines changed

5 files changed

+99
-56
lines changed

‎cmd/removeEnumerator.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ import (
2424
"context"
2525
"errors"
2626
"fmt"
27-
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2827
"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake"
2928
"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/filesystem"
3029
"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/service"
31-
"net/http"
3230
"path"
3331
"strings"
3432
"time"
@@ -145,7 +143,7 @@ func removeBfsResources(cca *CookedCopyCmdArgs) (err error) {
145143
ctx := context.WithValue(context.Background(), ste.ServiceAPIVersionOverride, ste.DefaultServiceApiVersion)
146144
sourceURL, _ := cca.Source.String()
147145
options := createClientOptions(common.AzcopyCurrentJobLogger, nil)
148-
146+
149147
targetServiceClient, err := common.GetServiceClientForLocation(cca.FromTo.From(), sourceURL, cca.credentialInfo.CredentialType, cca.credentialInfo.OAuthTokenInfo.TokenCredential, &options, nil)
150148
if err != nil {
151149
return err
@@ -240,16 +238,14 @@ func dryrunRemoveSingleDFSResource(ctx context.Context, dsc *service.Client, dat
240238
// we do not know if the source is a file or a directory
241239
// we assume it is a directory and get its properties
242240
directoryClient := dsc.NewFileSystemClient(datalakeURLParts.FileSystemName).NewDirectoryClient(datalakeURLParts.PathName)
243-
var respFromCtx *http.Response
244-
ctxWithResp := runtime.WithCaptureResponse(ctx, &respFromCtx)
245-
_, err := directoryClient.GetProperties(ctxWithResp, nil)
241+
props, err := directoryClient.GetProperties(ctx, nil)
246242
if err != nil {
247243
return fmt.Errorf("cannot verify resource due to error: %s", err)
248244
}
249245

250246
// if the source URL is actually a file
251247
// then we should short-circuit and simply remove that file
252-
resourceType := respFromCtx.Header.Get("x-ms-resource-type")
248+
resourceType := common.IffNotNil(props.ResourceType, "")
253249
if strings.EqualFold(resourceType, "file") {
254250
glcm.Dryrun(func(_ common.OutputFormat) string {
255251
return fmt.Sprintf("DRYRUN: remove file %s", datalakeURLParts.PathName)

‎e2etest/zt_newe2e_remove_test.go

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package e2etest
2+
3+
import (
4+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
5+
blobsas "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas"
6+
"github.com/Azure/azure-storage-azcopy/v10/common"
7+
)
8+
9+
func init() {
10+
suiteManager.RegisterSuite(&RemoveSuite{})
11+
}
12+
13+
type RemoveSuite struct{}
14+
15+
func (s *RemoveSuite) SetupSuite(a Asserter) {
16+
//a.Log("Setup logging!")
17+
}
18+
19+
func (s *RemoveSuite) TeardownSuite(a Asserter) {
20+
//a.Log("Teardown logging!")
21+
//a.Error("Oops!")
22+
}
23+
24+
func (s *RemoveSuite) Scenario_SingleFileRemoveBlobFSEncodedPath(svm *ScenarioVariationManager) {
25+
acct := GetAccount(svm, PrimaryHNSAcct)
26+
srcService := acct.GetService(svm, ResolveVariation(svm, []common.Location{common.ELocation.BlobFS()}))
27+
28+
svm.InsertVariationSeparator(":")
29+
body := NewRandomObjectContentContainer(svm, SizeFromString("0K"))
30+
// Scale up from service to object
31+
srcObj := CreateResource[ObjectResourceManager](svm, srcService, ResourceDefinitionObject{
32+
ObjectName: pointerTo("%23%25%3F"),
33+
Body: body,
34+
})
35+
36+
RunAzCopy(
37+
svm,
38+
AzCopyCommand{
39+
Verb: ResolveVariation(svm, []AzCopyVerb{AzCopyVerbRemove}),
40+
Targets: []ResourceManager{
41+
srcObj.(RemoteResourceManager).WithSpecificAuthType(EExplicitCredentialType.SASToken(), svm, CreateAzCopyTargetOptions{
42+
SASTokenOptions: GenericServiceSignatureValues{
43+
ContainerName: srcObj.ContainerName(),
44+
Permissions: (&blobsas.BlobPermissions{Read: true, List: true, Delete: true}).String(),
45+
},
46+
}),
47+
},
48+
Flags: RemoveFlags{},
49+
})
50+
ValidateResource[ObjectResourceManager](svm, srcObj, ResourceDefinitionObject{
51+
ObjectShouldExist: to.Ptr(false),
52+
}, false)
53+
}

‎go.mod

+13-14
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ module github.com/Azure/azure-storage-azcopy/v10
22

33
require (
44
cloud.google.com/go/storage v1.29.0
5-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0
6-
github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake v1.0.0
7-
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.1.1
5+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1
6+
github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake v1.1.1
7+
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1
88
github.com/Azure/go-autorest/autorest/adal v0.9.18
99
github.com/JeffreyRichter/enum v0.0.0-20180725232043-2567042f9cda
1010
github.com/danieljoos/wincred v1.1.2
1111
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
12-
github.com/google/uuid v1.3.1
12+
github.com/google/uuid v1.6.0
1313
github.com/hillu/go-ntdll v0.0.0-20220217145204-be7b5318100d
1414
github.com/mattn/go-ieproxy v0.0.11
1515
github.com/minio/minio-go v6.0.14+incompatible
@@ -19,39 +19,38 @@ require (
1919
github.com/spf13/cobra v1.4.0
2020
github.com/wastore/keychain v0.0.0-20180920053336-f2c902a3d807
2121
github.com/wastore/keyctl v0.3.1
22-
golang.org/x/crypto v0.17.0 // indirect
22+
golang.org/x/crypto v0.18.0 // indirect
2323
golang.org/x/oauth2 v0.7.0
2424
golang.org/x/sync v0.1.0
25-
golang.org/x/sys v0.15.0
25+
golang.org/x/sys v0.16.0
2626
google.golang.org/api v0.114.0
2727
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
2828
)
2929

3030
require github.com/stretchr/testify v1.8.4
3131

3232
require (
33-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0
34-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0
33+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2
34+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
3535
github.com/Azure/go-autorest/autorest/date v0.3.0
36-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
37-
golang.org/x/net v0.17.0
36+
golang.org/x/net v0.20.0
3837
)
3938

4039
require (
4140
cloud.google.com/go v0.110.0 // indirect
4241
cloud.google.com/go/compute v1.19.1 // indirect
4342
cloud.google.com/go/compute/metadata v0.2.3 // indirect
4443
cloud.google.com/go/iam v0.13.0 // indirect
45-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
44+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
4645
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
4746
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4847
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
49-
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect
48+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
5049
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
5150
github.com/davecgh/go-spew v1.1.1 // indirect
5251
github.com/go-ini/ini v1.66.4 // indirect
5352
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
54-
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
53+
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
5554
github.com/golang/protobuf v1.5.3 // indirect
5655
github.com/google/go-cmp v0.5.9 // indirect
5756
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
@@ -61,7 +60,7 @@ require (
6160
github.com/kr/text v0.2.0 // indirect
6261
github.com/kylelemons/godebug v1.1.0 // indirect
6362
github.com/mitchellh/go-homedir v1.1.0 // indirect
64-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
63+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
6564
github.com/pmezard/go-difflib v1.0.0 // indirect
6665
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6766
github.com/spf13/pflag v1.0.5 // indirect

‎go.sum

+28-30
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCta
1010
cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
1111
cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
1212
cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
13-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 h1:fb8kj/Dh4CSwgsOzHeZY4Xh68cFVbzXx+ONXGMY//4w=
14-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0/go.mod h1:uReU2sSxZExRPBAg3qKzmAucSi51+SP1OhohieR821Q=
15-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 h1:BMAjVKJM0U/CYF27gA0ZMmXGkOcvfFtD0oHVZ1TIPRI=
16-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
17-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 h1:d81/ng9rET2YqdVkVwkb6EXeRrLJIwyGnJcAlAWKwhs=
18-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
19-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 h1:Ma67P/GGprNwsslzEH6+Kb8nybI8jpDTm4Wmzu2ReK8=
20-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 h1:gggzg0SUMs6SQbEw+3LoSsYf9YMjkupeAnHMX8O9mmY=
21-
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0/go.mod h1:+6KLcKIVgxoBDMqMO/Nvy7bZ9a0nbU3I1DtFQK3YvB4=
22-
github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake v1.0.0 h1:qmP77CwyG5E6JqNiOro4adXLUdnxx/apfqq7bY7kQJo=
23-
github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake v1.0.0/go.mod h1:LOiiRCZKY9OlgPDmDrdM8uiL63lwSe01M0hklP3/4xc=
24-
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.1.1 h1:pOz+ZkB4uqDgS75Ft6JPeMIsGs5MHz2lkHa1odQ9Ghk=
25-
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.1.1/go.mod h1:eISpIuAeU2UzR3FO0ODAwvpAnVZsfEISxszPW/chkBw=
13+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 h1:c4k2FIYIh4xtwqrQwV0Ct1v5+ehlNXj5NI/MWVsiTkQ=
14+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2/go.mod h1:5FDJtLEO/GxwNgUxbwrY3LP0pEoThTQJtk2oysdXHxM=
15+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ=
16+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=
17+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aMclParm9/5Vgp+TY51uBQ=
18+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
19+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70=
20+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 h1:fXPMAmuh0gDuRDey0atC8cXBuKIlqCzCkL8sm1n9Ov0=
21+
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1/go.mod h1:SUZc9YRRHfx2+FAQKNDGrssXehqLpxmwRv2mC/5ntj4=
22+
github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake v1.1.1 h1:mkaGMgFkpDJVs7QUQrHvqEEpJFvoDrqGaHqMkywhGN0=
23+
github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake v1.1.1/go.mod h1:3S0vo7Y+O3Fjnnon5JXVrlG2IrfQkXasvKWB4OwX1lk=
24+
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1 h1:59Jk/lsLhtEMq6Zi7t6aWDFMman28m2O9K67IPAqqEI=
25+
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1/go.mod h1:b3FkvE9I9pO2DBaMOuml19tAgko7lPlKQPvhXnJXRoE=
2626
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
2727
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
2828
github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ=
@@ -35,8 +35,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z
3535
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
3636
github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
3737
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
38-
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk=
39-
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
38+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA=
39+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
4040
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4141
github.com/JeffreyRichter/enum v0.0.0-20180725232043-2567042f9cda h1:NOo6+gM9NNPJ3W56nxOKb4164LEw094U0C8zYQM8mQU=
4242
github.com/JeffreyRichter/enum v0.0.0-20180725232043-2567042f9cda/go.mod h1:2CaSFTh2ph9ymS6goiOKIBdfhwWUVsX4nQ5QjIYFHHs=
@@ -63,8 +63,8 @@ github.com/go-ini/ini v1.66.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
6363
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
6464
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
6565
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
66-
github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
67-
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
66+
github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
67+
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
6868
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
6969
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
7070
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -94,8 +94,8 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
9494
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
9595
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
9696
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
97-
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
98-
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
97+
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
98+
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
9999
github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
100100
github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
101101
github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
@@ -120,8 +120,8 @@ github.com/minio/minio-go v6.0.14+incompatible h1:fnV+GD28LeqdN6vT2XdGKW8Qe/IfjJ
120120
github.com/minio/minio-go v6.0.14+incompatible/go.mod h1:7guKYtitv8dktvNUGrhzmNlA5wrAABTQXCoesZdFQO8=
121121
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
122122
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
123-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
124-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
123+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
124+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
125125
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
126126
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
127127
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -158,11 +158,9 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
158158
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
159159
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
160160
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
161-
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
162-
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
161+
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
162+
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
163163
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
164-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
165-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
166164
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
167165
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
168166
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -176,8 +174,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
176174
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
177175
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
178176
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
179-
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
180-
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
177+
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
178+
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
181179
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
182180
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
183181
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
@@ -194,10 +192,10 @@ golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7w
194192
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
195193
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
196194
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
197-
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
198195
golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
199-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
200-
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
196+
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
197+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
198+
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
201199
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
202200
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
203201
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

‎ste/xfer-deleteBlobFS.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66

77
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
8-
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
98
"github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake"
109

1110
"net/http"
@@ -101,15 +100,13 @@ func doDeleteHNSResource(jptm IJobPartTransferMgr) {
101100

102101
// Check if the source is a file or directory
103102
directoryClient := c.NewDirectoryClient(info.SrcFilePath)
104-
var respFromCtx *http.Response
105-
ctxWithResp := runtime.WithCaptureResponse(ctx, &respFromCtx)
106-
_, err = directoryClient.GetProperties(ctxWithResp, nil)
103+
props, err := directoryClient.GetProperties(ctx, nil)
107104
if err != nil {
108105
transferDone(err)
109106
return
110107
}
111108

112-
resourceType := respFromCtx.Header.Get("x-ms-resource-type")
109+
resourceType := common.IffNotNil(props.ResourceType, "")
113110
if strings.EqualFold(resourceType, "file") {
114111
fileClient := c.NewFileClient(info.SrcFilePath)
115112

0 commit comments

Comments
 (0)