Skip to content

Commit 4f861cc

Browse files
authored
Merge pull request #1823 from kubernetes-sigs/volume-clone-http-allow
fix: allow http auth in volume clone
2 parents bd3e56f + 713c99f commit 4f861cc

File tree

10 files changed

+40
-28
lines changed

10 files changed

+40
-28
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0
12-
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1
12+
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.2
1313
github.com/Azure/azure-storage-file-go v0.8.0
1414
github.com/Azure/go-autorest/autorest v0.11.29
1515
github.com/Azure/go-autorest/autorest/to v0.4.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0
5353
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A=
5454
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 h1:fXPMAmuh0gDuRDey0atC8cXBuKIlqCzCkL8sm1n9Ov0=
5555
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1/go.mod h1:SUZc9YRRHfx2+FAQKNDGrssXehqLpxmwRv2mC/5ntj4=
56-
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1 h1:59Jk/lsLhtEMq6Zi7t6aWDFMman28m2O9K67IPAqqEI=
57-
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1/go.mod h1:b3FkvE9I9pO2DBaMOuml19tAgko7lPlKQPvhXnJXRoE=
56+
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.2 h1:PmDhkIT8S5U4nkY/s78Xmf7CXT8qCliNEBhbrkBp3Q0=
57+
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.2/go.mod h1:Kj2pCkQ47klX1aAlDnlN/BUvwBiARqIJkc9iw1Up7q8=
5858
github.com/Azure/azure-storage-file-go v0.8.0 h1:OX8DGsleWLUE6Mw4R/OeWEZMvsTIpwN94J59zqKQnTI=
5959
github.com/Azure/azure-storage-file-go v0.8.0/go.mod h1:3w3mufGcMjcOJ3w+4Gs+5wsSgkT7xDwWWqMMIrXtW4c=
6060
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=

pkg/azurefile/controllerserver.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,9 @@ func (d *Driver) generateSASToken(accountName, accountKey, storageEndpointSuffix
12721272
if err != nil {
12731273
return "", status.Errorf(codes.Internal, fmt.Sprintf("failed to generate sas token in creating new shared key credential, accountName: %s, err: %s", accountName, err.Error()))
12741274
}
1275-
serviceClient, err := service.NewClientWithSharedKeyCredential(fmt.Sprintf("https://%s.file.%s/", accountName, storageEndpointSuffix), credential, nil)
1275+
clientOptions := service.ClientOptions{}
1276+
clientOptions.InsecureAllowCredentialWithHTTP = true
1277+
serviceClient, err := service.NewClientWithSharedKeyCredential(fmt.Sprintf("https://%s.file.%s/", accountName, storageEndpointSuffix), credential, &clientOptions)
12761278
if err != nil {
12771279
return "", status.Errorf(codes.Internal, fmt.Sprintf("failed to generate sas token in creating new client with shared key credential, accountName: %s, err: %s", accountName, err.Error()))
12781280
}

vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/directory/client.go

+7-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/file/client.go

+9-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/internal/exported/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/sas/query_params.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/service/client.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/share/client.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources
7676
# github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0
7777
## explicit; go 1.18
7878
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage
79-
# github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.1
79+
# github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.2.2
8080
## explicit; go 1.18
8181
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/directory
8282
github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/file

0 commit comments

Comments
 (0)