From 14ad73eaa8a3ed41478b9bad2ad0bbd1b45188cc Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Tue, 4 Dec 2018 07:02:50 +0000 Subject: [PATCH] make GetStorageAccesskey public as a lib --- .../providers/azure/azure_blobDiskController.go | 2 +- pkg/cloudprovider/providers/azure/azure_storageaccount.go | 6 +++--- .../providers/azure/azure_storageaccount_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go b/pkg/cloudprovider/providers/azure/azure_blobDiskController.go index 9d0be714894..7cb8a756df7 100644 --- a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go +++ b/pkg/cloudprovider/providers/azure/azure_blobDiskController.go @@ -108,7 +108,7 @@ func (c *BlobDiskController) DeleteVolume(diskURI string) error { if err != nil { return fmt.Errorf("failed to parse vhd URI %v", err) } - key, err := c.common.cloud.getStorageAccesskey(accountName, c.common.resourceGroup) + key, err := c.common.cloud.GetStorageAccesskey(accountName, c.common.resourceGroup) if err != nil { return fmt.Errorf("no key for storage account %s, err %v", accountName, err) } diff --git a/pkg/cloudprovider/providers/azure/azure_storageaccount.go b/pkg/cloudprovider/providers/azure/azure_storageaccount.go index 34871a11198..8dadcdc2d0f 100644 --- a/pkg/cloudprovider/providers/azure/azure_storageaccount.go +++ b/pkg/cloudprovider/providers/azure/azure_storageaccount.go @@ -64,8 +64,8 @@ func (az *Cloud) getStorageAccounts(matchingAccountType, matchingAccountKind, re return accounts, nil } -// getStorageAccesskey gets the storage account access key -func (az *Cloud) getStorageAccesskey(account, resourceGroup string) (string, error) { +// GetStorageAccesskey gets the storage account access key +func (az *Cloud) GetStorageAccesskey(account, resourceGroup string) (string, error) { ctx, cancel := getContextWithCancel() defer cancel() @@ -137,7 +137,7 @@ func (az *Cloud) ensureStorageAccount(accountName, accountType, accountKind, res } // find the access key with this account - accountKey, err := az.getStorageAccesskey(accountName, resourceGroup) + accountKey, err := az.GetStorageAccesskey(accountName, resourceGroup) if err != nil { return "", "", fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err) } diff --git a/pkg/cloudprovider/providers/azure/azure_storageaccount_test.go b/pkg/cloudprovider/providers/azure/azure_storageaccount_test.go index bba66e0043f..6d6eabd2f14 100644 --- a/pkg/cloudprovider/providers/azure/azure_storageaccount_test.go +++ b/pkg/cloudprovider/providers/azure/azure_storageaccount_test.go @@ -64,7 +64,7 @@ func TestGetStorageAccessKeys(t *testing.T) { expectedKey := test.expectedKey fake.Keys = test.results fake.Err = test.err - key, err := cloud.getStorageAccesskey("acct", "rg") + key, err := cloud.GetStorageAccesskey("acct", "rg") if test.expectErr && err == nil { t.Errorf("Unexpected non-error") continue