@@ -18,21 +18,21 @@ package azurefile
1818
1919import (
2020 "context"
21+ "errors"
2122 "fmt"
2223 "net/http"
2324
25+ "github.com/Azure/azure-sdk-for-go/sdk/azcore"
2426 "github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
25- azs "github.com/Azure/azure-sdk-for-go/storage"
27+ "github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/service"
28+ "github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/share"
2629 "k8s.io/klog/v2"
2730
31+ "sigs.k8s.io/cloud-provider-azure/pkg/azclient/utils"
2832 "sigs.k8s.io/cloud-provider-azure/pkg/azureclients/fileclient"
2933 "sigs.k8s.io/cloud-provider-azure/pkg/retry"
3034)
3135
32- const (
33- useHTTPS = true
34- )
35-
3636var (
3737 // refer https://github.com/Azure/azure-sdk-for-go/blob/master/storage/client.go#L88.
3838 defaultValidStatusCodes = []int {
@@ -47,78 +47,88 @@ var (
4747type azureFileDataplaneClient struct {
4848 accountName string
4949 accountKey string
50- * azs. FileServiceClient
50+ * service. Client
5151}
5252
5353func newAzureFileClient (accountName , accountKey , storageEndpointSuffix string , backoff * retry.Backoff ) (azureFileClient , error ) {
5454 if storageEndpointSuffix == "" {
5555 storageEndpointSuffix = defaultStorageEndPointSuffix
5656 }
57-
58- fileClient , err := azs .NewClient (accountName , accountKey , storageEndpointSuffix , azs .DefaultAPIVersion , useHTTPS )
57+ keyCred , err := service .NewSharedKeyCredential (accountName , accountKey )
5958 if err != nil {
6059 return nil , fmt .Errorf ("error creating azure client: %v" , err )
6160 }
62-
61+ storageEndpoint := fmt .Sprintf ("https://%s.file." + storageEndpointSuffix , accountName )
62+ clientOps := utils .GetDefaultAzCoreClientOption ()
6363 if backoff != nil {
64- fileClient .Sender = & azs.DefaultSender {
65- RetryAttempts : backoff .Steps ,
66- ValidStatusCodes : defaultValidStatusCodes ,
67- RetryDuration : backoff .Duration ,
68- }
64+ clientOps .Retry .MaxRetries = int32 (backoff .Steps )
65+ clientOps .Retry .StatusCodes = defaultValidStatusCodes
66+ clientOps .Retry .RetryDelay = backoff .Duration
67+ }
68+ fileClient , err := service .NewClientWithSharedKeyCredential (storageEndpoint , keyCred , & service.ClientOptions {
69+ ClientOptions : clientOps ,
70+ })
71+ if err != nil {
72+ return nil , fmt .Errorf ("error creating azure client: %v" , err )
6973 }
7074
7175 return & azureFileDataplaneClient {
72- accountName : accountName ,
73- accountKey : accountKey ,
74- FileServiceClient : to . Ptr ( fileClient . GetFileService ()) ,
76+ accountName : accountName ,
77+ accountKey : accountKey ,
78+ Client : fileClient ,
7579 }, nil
7680}
7781
78- func (f * azureFileDataplaneClient ) CreateFileShare (_ context.Context , shareOptions * fileclient.ShareOptions ) error {
82+ func (f * azureFileDataplaneClient ) CreateFileShare (ctx context.Context , shareOptions * fileclient.ShareOptions ) error {
7983 if shareOptions == nil {
8084 return fmt .Errorf ("shareOptions of account(%s) is nil" , f .accountName )
8185 }
82- share := f .FileServiceClient .GetShareReference (shareOptions .Name )
83- share .Properties .Quota = shareOptions .RequestGiB
84- newlyCreated , err := share .CreateIfNotExists (nil )
86+ shareClient := f .Client .NewShareClient (shareOptions .Name )
87+ _ , err := shareClient .Create (ctx , & share.CreateOptions {
88+ Quota : to .Ptr (int32 (shareOptions .RequestGiB )),
89+ })
90+
8591 if err != nil {
8692 return fmt .Errorf ("failed to create file share, err: %v" , err )
8793 }
88- if ! newlyCreated {
89- klog .V (2 ).Infof ("file share(%s) under account(%s) already exists" , shareOptions .Name , f .accountName )
90- }
9194 return nil
9295}
9396
9497// delete a file share
95- func (f * azureFileDataplaneClient ) DeleteFileShare (_ context.Context , shareName string ) error {
96- return f .FileServiceClient .GetShareReference (shareName ).Delete (nil )
98+ func (f * azureFileDataplaneClient ) DeleteFileShare (ctx context.Context , shareName string ) error {
99+ _ , err := f .Client .NewShareClient (shareName ).Delete (ctx , nil )
100+ return err
97101}
98102
99- func (f * azureFileDataplaneClient ) ResizeFileShare (_ context.Context , shareName string , sizeGiB int ) error {
100- share := f .FileServiceClient .GetShareReference (shareName )
101- if share .Properties .Quota >= sizeGiB {
103+ func (f * azureFileDataplaneClient ) ResizeFileShare (ctx context.Context , shareName string , sizeGiB int ) error {
104+ shareClient := f .Client .NewShareClient (shareName )
105+ shareProps , err := shareClient .GetProperties (ctx , nil )
106+ if err != nil {
107+ return fmt .Errorf ("failed to set quota on file share %s, err: %v" , shareName , err )
108+ }
109+ if * shareProps .Quota >= int32 (sizeGiB ) {
102110 klog .Warningf ("file share size(%dGi) is already greater or equal than requested size(%dGi), accountName: %s, shareName: %s" ,
103- share . Properties .Quota , sizeGiB , f .accountName , shareName )
111+ * shareProps .Quota , sizeGiB , f .accountName , shareName )
104112 return nil
105113 }
106- share .Properties .Quota = sizeGiB
107- if err := share .SetProperties (nil ); err != nil {
114+ if _ , err := shareClient .SetProperties (ctx , & share.SetPropertiesOptions {
115+ Quota : to .Ptr (int32 (sizeGiB )),
116+ }); err != nil {
108117 return fmt .Errorf ("failed to set quota on file share %s, err: %v" , shareName , err )
109118 }
110119 klog .V (4 ).Infof ("resize file share completed, accountName: %s, shareName: %s, sizeGiB: %d" , f .accountName , shareName , sizeGiB )
111120 return nil
112121}
113122
114- func (f * azureFileDataplaneClient ) GetFileShareQuota (_ context.Context , name string ) (int , error ) {
115- share := f .FileServiceClient . GetShareReference (name )
116- exists , err := share . Exists ( )
123+ func (f * azureFileDataplaneClient ) GetFileShareQuota (ctx context.Context , name string ) (int , error ) {
124+ shareClient := f .Client . NewShareClient (name )
125+ shareProps , err := shareClient . GetProperties ( ctx , nil )
117126 if err != nil {
127+ var respErr * azcore.ResponseError
128+ if errors .As (err , & respErr ) && respErr != nil && respErr .StatusCode == http .StatusNotFound {
129+ return - 1 , nil
130+ }
118131 return - 1 , err
119132 }
120- if ! exists {
121- return - 1 , nil
122- }
123- return share .Properties .Quota , nil
133+ return int (* shareProps .Quota ), nil
124134}
0 commit comments