add azure premium file support

update bazel and fix goftm

use defaultStorageAccountKind

fix test failure

update godep license file

fix staging godeps issue

update staging godeps

fix comments, use one API call for file creation

pkg/cloudprovider/providers/azure/azure_blobDiskController.go

@@ -80,7 +80,7 @@ func newBlobDiskController(common *controllerCommon) (*BlobDiskController, error
 // If no storage account is given, search all the storage accounts associated with the resource group and pick one that
 // fits storage type and location.
 func (c *BlobDiskController) CreateVolume(blobName, accountName, accountType, location string, requestGB int) (string, string, int, error) {
-	account, key, err := c.common.cloud.ensureStorageAccount(accountName, accountType, c.common.resourceGroup, location, dedicatedDiskAccountNamePrefix)
+	account, key, err := c.common.cloud.ensureStorageAccount(accountName, accountType, string(defaultStorageAccountKind), c.common.resourceGroup, location, dedicatedDiskAccountNamePrefix)
 	if err != nil {
 		return "", "", 0, fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err)
 	}
@@ -491,7 +491,7 @@ func (c *BlobDiskController) createStorageAccount(storageAccountName string, sto
 		cp := storage.AccountCreateParameters{
 			Sku: &storage.Sku{Name: storageAccountType},
 			// switch to use StorageV2 as it's recommended according to https://docs.microsoft.com/en-us/azure/storage/common/storage-account-options
-			Kind:     storage.StorageV2,
+			Kind:     defaultStorageAccountKind,
 			Tags:     map[string]*string{"created-by": to.StringPtr("azure-dd")},
 			Location: &location}
 		ctx, cancel := getContextWithCancel()

pkg/cloudprovider/providers/azure/azure_file.go

@@ -58,22 +58,11 @@ func (f *azureFileClient) createFileShare(accountName, accountKey, name string,
 	if err != nil {
 		return err
 	}
-	// create a file share and set quota
-	// Note. Per https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/Create-Share,
-	// setting x-ms-share-quota can set quota on the new share, but in reality, setting quota in CreateShare
-	// receives error "The metadata specified is invalid. It has characters that are not permitted."
-	// As a result,breaking into two API calls: create share and set quota
 	share := fileClient.GetShareReference(name)
+	share.Properties.Quota = sizeGiB
 	if err = share.Create(nil); err != nil {
 		return fmt.Errorf("failed to create file share, err: %v", err)
 	}
-	share.Properties.Quota = sizeGiB
-	if err = share.SetProperties(nil); err != nil {
-		if err := share.Delete(nil); err != nil {
-			glog.Errorf("Error deleting share: %v", err)
-		}
-		return fmt.Errorf("failed to set quota on file share %s, err: %v", name, err)
-	}
 	return nil
 }
 

pkg/cloudprovider/providers/azure/azure_storage.go

@@ -25,18 +25,20 @@ import (
 
 const (
 	defaultStorageAccountType      = string(storage.StandardLRS)
+	defaultStorageAccountKind      = storage.StorageV2
 	fileShareAccountNamePrefix     = "f"
 	sharedDiskAccountNamePrefix    = "ds"
 	dedicatedDiskAccountNamePrefix = "dd"
 )
 
-// CreateFileShare creates a file share, using a matching storage account
-func (az *Cloud) CreateFileShare(shareName, accountName, accountType, resourceGroup, location string, requestGiB int) (string, string, error) {
+// CreateFileShare creates a file share, using a matching storage account type, account kind, etc.
+// storage account will be created if specified account is not found
+func (az *Cloud) CreateFileShare(shareName, accountName, accountType, accountKind, resourceGroup, location string, requestGiB int) (string, string, error) {
 	if resourceGroup == "" {
 		resourceGroup = az.resourceGroup
 	}
 
-	account, key, err := az.ensureStorageAccount(accountName, accountType, resourceGroup, location, fileShareAccountNamePrefix)
+	account, key, err := az.ensureStorageAccount(accountName, accountType, accountKind, resourceGroup, location, fileShareAccountNamePrefix)
 	if err != nil {
 		return "", "", fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err)
 	}

pkg/cloudprovider/providers/azure/azure_storage_test.go

@@ -30,6 +30,7 @@ func TestCreateFileShare(t *testing.T) {
 
 	name := "baz"
 	sku := "sku"
+	kind := "StorageV2"
 	location := "centralus"
 	value := "foo key"
 	bogus := "bogus"
@@ -38,6 +39,7 @@ func TestCreateFileShare(t *testing.T) {
 		name     string
 		acct     string
 		acctType string
+		acctKind string
 		loc      string
 		gb       int
 		accounts storage.AccountListResult
@@ -52,6 +54,7 @@ func TestCreateFileShare(t *testing.T) {
 			name:      "foo",
 			acct:      "bar",
 			acctType:  "type",
+			acctKind:  "StorageV2",
 			loc:       "eastus",
 			gb:        10,
 			expectErr: true,
@@ -60,6 +63,7 @@ func TestCreateFileShare(t *testing.T) {
 			name:      "foo",
 			acct:      "",
 			acctType:  "type",
+			acctKind:  "StorageV2",
 			loc:       "eastus",
 			gb:        10,
 			expectErr: true,
@@ -68,11 +72,12 @@ func TestCreateFileShare(t *testing.T) {
 			name:     "foo",
 			acct:     "",
 			acctType: sku,
+			acctKind: kind,
 			loc:      location,
 			gb:       10,
 			accounts: storage.AccountListResult{
 				Value: &[]storage.Account{
-					{Name: &name, Sku: &storage.Sku{Name: storage.SkuName(sku)}, Location: &location},
+					{Name: &name, Sku: &storage.Sku{Name: storage.SkuName(sku)}, Kind: storage.Kind(kind), Location: &location},
 				},
 			},
 			keys: storage.AccountListKeysResult{
@@ -87,6 +92,7 @@ func TestCreateFileShare(t *testing.T) {
 			name:     "foo",
 			acct:     "",
 			acctType: sku,
+			acctKind: kind,
 			loc:      location,
 			gb:       10,
 			accounts: storage.AccountListResult{
@@ -100,6 +106,7 @@ func TestCreateFileShare(t *testing.T) {
 			name:     "foo",
 			acct:     "",
 			acctType: sku,
+			acctKind: kind,
 			loc:      location,
 			gb:       10,
 			accounts: storage.AccountListResult{
@@ -116,7 +123,7 @@ func TestCreateFileShare(t *testing.T) {
 		fake.Keys = test.keys
 		fake.Err = test.err
 
-		account, key, err := cloud.CreateFileShare(test.name, test.acct, test.acctType, "rg", test.loc, test.gb)
+		account, key, err := cloud.CreateFileShare(test.name, test.acct, test.acctType, test.acctKind, "rg", test.loc, test.gb)
 		if test.expectErr && err == nil {
 			t.Errorf("unexpected non-error")
 			continue