@@ -22,9 +22,11 @@ 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)
@@ -47,78 +49,84 @@ var (
4749type azureFileDataplaneClient struct {
4850 accountName string
4951 accountKey string
50- * azs. FileServiceClient
52+ * service. Client
5153}
5254
5355func newAzureFileClient (accountName , accountKey , storageEndpointSuffix string , backoff * retry.Backoff ) (azureFileClient , error ) {
5456 if storageEndpointSuffix == "" {
5557 storageEndpointSuffix = defaultStorageEndPointSuffix
5658 }
57-
58- fileClient , err := azs .NewClient (accountName , accountKey , storageEndpointSuffix , azs .DefaultAPIVersion , useHTTPS )
59+ keyCred , err := service .NewSharedKeyCredential (accountName , accountKey )
5960 if err != nil {
6061 return nil , fmt .Errorf ("error creating azure client: %v" , err )
6162 }
62-
63+ storageEndpoint := fmt .Sprintf ("https://%s.file." + defaultStorageEndPointSuffix , accountName )
64+ clientOps := utils .GetDefaultAzCoreClientOption ()
6365 if backoff != nil {
64- fileClient .Sender = & azs.DefaultSender {
65- RetryAttempts : backoff .Steps ,
66- ValidStatusCodes : defaultValidStatusCodes ,
67- RetryDuration : backoff .Duration ,
68- }
66+ clientOps .Retry .MaxRetries = int32 (backoff .Steps )
67+ clientOps .Retry .StatusCodes = defaultValidStatusCodes
68+ clientOps .Retry .RetryDelay = backoff .Duration
69+ }
70+ fileClient , err := service .NewClientWithSharedKeyCredential (storageEndpoint , keyCred , & service.ClientOptions {
71+ ClientOptions : clientOps ,
72+ })
73+ if err != nil {
74+ return nil , fmt .Errorf ("error creating azure client: %v" , err )
6975 }
7076
7177 return & azureFileDataplaneClient {
72- accountName : accountName ,
73- accountKey : accountKey ,
74- FileServiceClient : to . Ptr ( fileClient . GetFileService ()) ,
78+ accountName : accountName ,
79+ accountKey : accountKey ,
80+ Client : fileClient ,
7581 }, nil
7682}
7783
78- func (f * azureFileDataplaneClient ) CreateFileShare (_ context.Context , shareOptions * fileclient.ShareOptions ) error {
84+ func (f * azureFileDataplaneClient ) CreateFileShare (ctx context.Context , shareOptions * fileclient.ShareOptions ) error {
7985 if shareOptions == nil {
8086 return fmt .Errorf ("shareOptions of account(%s) is nil" , f .accountName )
8187 }
82- share := f .FileServiceClient .GetShareReference (shareOptions .Name )
83- share .Properties .Quota = shareOptions .RequestGiB
84- newlyCreated , err := share .CreateIfNotExists (nil )
88+ shareClient := f .Client .NewShareClient (shareOptions .Name )
89+ _ , err := shareClient .Create (ctx , & share.CreateOptions {
90+ Quota : to .Ptr (int32 (shareOptions .RequestGiB )),
91+ })
92+
8593 if err != nil {
8694 return fmt .Errorf ("failed to create file share, err: %v" , err )
8795 }
88- if ! newlyCreated {
89- klog .V (2 ).Infof ("file share(%s) under account(%s) already exists" , shareOptions .Name , f .accountName )
90- }
9196 return nil
9297}
9398
9499// delete a file share
95- func (f * azureFileDataplaneClient ) DeleteFileShare (_ context.Context , shareName string ) error {
96- return f .FileServiceClient .GetShareReference (shareName ).Delete (nil )
100+ func (f * azureFileDataplaneClient ) DeleteFileShare (ctx context.Context , shareName string ) error {
101+ _ , err := f .Client .NewShareClient (shareName ).Delete (ctx , nil )
102+ return err
97103}
98104
99- func (f * azureFileDataplaneClient ) ResizeFileShare (_ context.Context , shareName string , sizeGiB int ) error {
100- share := f .FileServiceClient .GetShareReference (shareName )
101- if share .Properties .Quota >= sizeGiB {
105+ func (f * azureFileDataplaneClient ) ResizeFileShare (ctx context.Context , shareName string , sizeGiB int ) error {
106+ shareClient := f .Client .NewShareClient (shareName )
107+ shareProps , err := shareClient .GetProperties (ctx , nil )
108+ if err != nil {
109+ return fmt .Errorf ("failed to set quota on file share %s, err: %v" , shareName , err )
110+ }
111+ if * shareProps .Quota >= int32 (sizeGiB ) {
102112 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 )
113+ * shareProps .Quota , sizeGiB , f .accountName , shareName )
104114 return nil
105115 }
106- share .Properties .Quota = sizeGiB
107- if err := share .SetProperties (nil ); err != nil {
116+ if _ , err := shareClient .SetProperties (ctx , & share.SetPropertiesOptions {
117+ Quota : to .Ptr (int32 (sizeGiB )),
118+ }); err != nil {
108119 return fmt .Errorf ("failed to set quota on file share %s, err: %v" , shareName , err )
109120 }
110121 klog .V (4 ).Infof ("resize file share completed, accountName: %s, shareName: %s, sizeGiB: %d" , f .accountName , shareName , sizeGiB )
111122 return nil
112123}
113124
114- func (f * azureFileDataplaneClient ) GetFileShareQuota (_ context.Context , name string ) (int , error ) {
115- share := f .FileServiceClient . GetShareReference (name )
116- exists , err := share . Exists ( )
125+ func (f * azureFileDataplaneClient ) GetFileShareQuota (ctx context.Context , name string ) (int , error ) {
126+ shareClient := f .Client . NewShareClient (name )
127+ shareProps , err := shareClient . GetProperties ( ctx , nil )
117128 if err != nil {
118129 return - 1 , err
119130 }
120- if ! exists {
121- return - 1 , nil
122- }
123- return share .Properties .Quota , nil
131+ return int (* shareProps .Quota ), nil
124132}
0 commit comments