@@ -22,17 +22,15 @@ import (
2222 "net/http"
2323
2424 "github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
25- azs "github.com/Azure/azure-sdk-for-go/storage"
25+ "github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/service"
26+ "github.com/Azure/azure-sdk-for-go/sdk/storage/azfile/share"
2627 "k8s.io/klog/v2"
2728
29+ "sigs.k8s.io/cloud-provider-azure/pkg/azclient/utils"
2830 "sigs.k8s.io/cloud-provider-azure/pkg/azureclients/fileclient"
2931 "sigs.k8s.io/cloud-provider-azure/pkg/retry"
3032)
3133
32- const (
33- useHTTPS = true
34- )
35-
3634var (
3735 // refer https://github.com/Azure/azure-sdk-for-go/blob/master/storage/client.go#L88.
3836 defaultValidStatusCodes = []int {
@@ -47,78 +45,84 @@ var (
4745type azureFileDataplaneClient struct {
4846 accountName string
4947 accountKey string
50- * azs. FileServiceClient
48+ * service. Client
5149}
5250
5351func newAzureFileClient (accountName , accountKey , storageEndpointSuffix string , backoff * retry.Backoff ) (azureFileClient , error ) {
5452 if storageEndpointSuffix == "" {
5553 storageEndpointSuffix = defaultStorageEndPointSuffix
5654 }
57-
58- fileClient , err := azs .NewClient (accountName , accountKey , storageEndpointSuffix , azs .DefaultAPIVersion , useHTTPS )
55+ keyCred , err := service .NewSharedKeyCredential (accountName , accountKey )
5956 if err != nil {
6057 return nil , fmt .Errorf ("error creating azure client: %v" , err )
6158 }
62-
59+ storageEndpoint := fmt .Sprintf ("https://%s.file." + storageEndpointSuffix , accountName )
60+ clientOps := utils .GetDefaultAzCoreClientOption ()
6361 if backoff != nil {
64- fileClient .Sender = & azs.DefaultSender {
65- RetryAttempts : backoff .Steps ,
66- ValidStatusCodes : defaultValidStatusCodes ,
67- RetryDuration : backoff .Duration ,
68- }
62+ clientOps .Retry .MaxRetries = int32 (backoff .Steps )
63+ clientOps .Retry .StatusCodes = defaultValidStatusCodes
64+ clientOps .Retry .RetryDelay = backoff .Duration
65+ }
66+ fileClient , err := service .NewClientWithSharedKeyCredential (storageEndpoint , keyCred , & service.ClientOptions {
67+ ClientOptions : clientOps ,
68+ })
69+ if err != nil {
70+ return nil , fmt .Errorf ("error creating azure client: %v" , err )
6971 }
7072
7173 return & azureFileDataplaneClient {
72- accountName : accountName ,
73- accountKey : accountKey ,
74- FileServiceClient : to . Ptr ( fileClient . GetFileService ()) ,
74+ accountName : accountName ,
75+ accountKey : accountKey ,
76+ Client : fileClient ,
7577 }, nil
7678}
7779
78- func (f * azureFileDataplaneClient ) CreateFileShare (_ context.Context , shareOptions * fileclient.ShareOptions ) error {
80+ func (f * azureFileDataplaneClient ) CreateFileShare (ctx context.Context , shareOptions * fileclient.ShareOptions ) error {
7981 if shareOptions == nil {
8082 return fmt .Errorf ("shareOptions of account(%s) is nil" , f .accountName )
8183 }
82- share := f .FileServiceClient .GetShareReference (shareOptions .Name )
83- share .Properties .Quota = shareOptions .RequestGiB
84- newlyCreated , err := share .CreateIfNotExists (nil )
84+ shareClient := f .Client .NewShareClient (shareOptions .Name )
85+ _ , err := shareClient .Create (ctx , & share.CreateOptions {
86+ Quota : to .Ptr (int32 (shareOptions .RequestGiB )),
87+ })
88+
8589 if err != nil {
8690 return fmt .Errorf ("failed to create file share, err: %v" , err )
8791 }
88- if ! newlyCreated {
89- klog .V (2 ).Infof ("file share(%s) under account(%s) already exists" , shareOptions .Name , f .accountName )
90- }
9192 return nil
9293}
9394
9495// delete a file share
95- func (f * azureFileDataplaneClient ) DeleteFileShare (_ context.Context , shareName string ) error {
96- return f .FileServiceClient .GetShareReference (shareName ).Delete (nil )
96+ func (f * azureFileDataplaneClient ) DeleteFileShare (ctx context.Context , shareName string ) error {
97+ _ , err := f .Client .NewShareClient (shareName ).Delete (ctx , nil )
98+ return err
9799}
98100
99- func (f * azureFileDataplaneClient ) ResizeFileShare (_ context.Context , shareName string , sizeGiB int ) error {
100- share := f .FileServiceClient .GetShareReference (shareName )
101- if share .Properties .Quota >= sizeGiB {
101+ func (f * azureFileDataplaneClient ) ResizeFileShare (ctx context.Context , shareName string , sizeGiB int ) error {
102+ shareClient := f .Client .NewShareClient (shareName )
103+ shareProps , err := shareClient .GetProperties (ctx , nil )
104+ if err != nil {
105+ return fmt .Errorf ("failed to set quota on file share %s, err: %v" , shareName , err )
106+ }
107+ if * shareProps .Quota >= int32 (sizeGiB ) {
102108 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 )
109+ * shareProps .Quota , sizeGiB , f .accountName , shareName )
104110 return nil
105111 }
106- share .Properties .Quota = sizeGiB
107- if err := share .SetProperties (nil ); err != nil {
112+ if _ , err := shareClient .SetProperties (ctx , & share.SetPropertiesOptions {
113+ Quota : to .Ptr (int32 (sizeGiB )),
114+ }); err != nil {
108115 return fmt .Errorf ("failed to set quota on file share %s, err: %v" , shareName , err )
109116 }
110117 klog .V (4 ).Infof ("resize file share completed, accountName: %s, shareName: %s, sizeGiB: %d" , f .accountName , shareName , sizeGiB )
111118 return nil
112119}
113120
114- func (f * azureFileDataplaneClient ) GetFileShareQuota (_ context.Context , name string ) (int , error ) {
115- share := f .FileServiceClient . GetShareReference (name )
116- exists , err := share . Exists ( )
121+ func (f * azureFileDataplaneClient ) GetFileShareQuota (ctx context.Context , name string ) (int , error ) {
122+ shareClient := f .Client . NewShareClient (name )
123+ shareProps , err := shareClient . GetProperties ( ctx , nil )
117124 if err != nil {
118125 return - 1 , err
119126 }
120- if ! exists {
121- return - 1 , nil
122- }
123- return share .Properties .Quota , nil
127+ return int (* shareProps .Quota ), nil
124128}
0 commit comments