Merge pull request #29 from csi-driver/use-azure-lib

use cloud.GetStorageAccesskey instead

Author: andyzhangx

pkg/blobfuse/azure.go

@@ -17,14 +17,11 @@ limitations under the License.
 package blobfuse
 
 import (
-	"context"
 	"fmt"
 	"os"
-	"strings"
-
-	"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
 
 	"k8s.io/klog"
+	"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
 )
 
 // GetCloudProvider get Azure Cloud Provider
@@ -55,33 +52,3 @@ func GetCloudProvider() (*azure.Cloud, error) {
 	}
 	return az, nil
 }
-
-// GetStorageAccesskey get storage account access key
-// todo: use cloud.GetStorageAccesskey func in k8s v1.14.0
-func GetStorageAccesskey(cloud *azure.Cloud, account, resourceGroup string) (string, error) {
-	ctx, cancel := getContextWithCancel()
-	defer cancel()
-
-	result, err := cloud.StorageAccountClient.ListKeys(ctx, resourceGroup, account)
-	if err != nil {
-		return "", err
-	}
-	if result.Keys == nil {
-		return "", fmt.Errorf("empty keys")
-	}
-
-	for _, k := range *result.Keys {
-		if k.Value != nil && *k.Value != "" {
-			v := *k.Value
-			if ind := strings.LastIndex(v, " "); ind >= 0 {
-				v = v[(ind + 1):]
-			}
-			return v, nil
-		}
-	}
-	return "", fmt.Errorf("no valid keys")
-}
-
-func getContextWithCancel() (context.Context, context.CancelFunc) {
-	return context.WithCancel(context.Background())
-}

pkg/blobfuse/controllerserver.go

@@ -148,7 +148,7 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 		resourceGroupName = d.cloud.ResourceGroup
 	}
 
-	accountKey, err := GetStorageAccesskey(d.cloud, accountName, resourceGroupName)
+	accountKey, err := d.cloud.GetStorageAccesskey(accountName, resourceGroupName)
 	if err != nil {
 		return nil, fmt.Errorf("no key for storage account(%s) under resource group(%s), err %v", accountName, resourceGroupName, err)
 	}
@@ -191,7 +191,7 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
 		resourceGroupName = d.cloud.ResourceGroup
 	}
 
-	accountKey, err := GetStorageAccesskey(d.cloud, accountName, resourceGroupName)
+	accountKey, err := d.cloud.GetStorageAccesskey(accountName, resourceGroupName)
 	if err != nil {
 		return nil, fmt.Errorf("no key for storage account(%s) under resource group(%s), err %v", accountName, resourceGroupName, err)
 	}

pkg/blobfuse/nodeserver.go

@@ -93,7 +93,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 			resourceGroupName = d.cloud.ResourceGroup
 		}
 
-		accountKey, err = GetStorageAccesskey(d.cloud, accountName, resourceGroupName)
+		accountKey, err = d.cloud.GetStorageAccesskey(accountName, resourceGroupName)
 		if err != nil {
 			return nil, fmt.Errorf("no key for storage account(%s) under resource group(%s), err %v", accountName, resourceGroupName, err)
 		}