Skip to content

Commit

Permalink
Storage Account: requiring import/timeouts
Browse files Browse the repository at this point in the history
  • Loading branch information
@tombuildsstuff
tombuildsstuff committed Aug 22, 2018
1 parent b142f33 commit ed58e57
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 35 deletions.
112 changes: 77 additions & 35 deletions azurerm/resource_arm_storage_account.go
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
package azurerm

import (
"context"
"errors"
"fmt"
"log"
"regexp"
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
tf "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

Expand All @@ -21,12 +24,16 @@ func resourceArmStorageAccount() *schema.Resource {
Read: resourceArmStorageAccountRead,
Update: resourceArmStorageAccountUpdate,
Delete: resourceArmStorageAccountDelete,

Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
MigrateState: resourceStorageAccountMigrateState,
SchemaVersion: 2,
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(time.Minute * 30),
Update: schema.DefaultTimeout(time.Minute * 30),
Delete: schema.DefaultTimeout(time.Minute * 30),
},

Schema: map[string]*schema.Schema{
"name": {
Expand Down Expand Up @@ -299,36 +306,25 @@ func resourceArmStorageAccount() *schema.Resource {
}
}

func validateAzureRMStorageAccountTags(v interface{}, _ string) (ws []string, es []error) {
tagsMap := v.(map[string]interface{})
func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).storageServiceClient
ctx := meta.(*ArmClient).StopContext

if len(tagsMap) > 15 {
es = append(es, errors.New("a maximum of 15 tags can be applied to each ARM resource"))
}
resourceGroupName := d.Get("resource_group_name").(string)
storageAccountName := d.Get("name").(string)

for k, v := range tagsMap {
if len(k) > 128 {
es = append(es, fmt.Errorf("the maximum length for a tag key is 128 characters: %q is %d characters", k, len(k)))
if d.IsNewResource() {
resp, err := client.GetProperties(ctx, resourceGroupName, storageAccountName)
if !utils.ResponseWasNotFound(resp.Response) {
return fmt.Errorf("Error checking for the existence of Storage Account %q (Resource Group %q): %+v", storageAccountName, resourceGroupName, err)
}

value, err := tagValueToString(v)
if err != nil {
es = append(es, err)
} else if len(value) > 256 {
es = append(es, fmt.Errorf("the maximum length for a tag value is 256 characters: the value for %q is %d characters", k, len(value)))
if resp.ID != nil {
return tf.ImportAsExistsError("azurerm_storage_account", *resp.ID)
}
}

return ws, es
}

func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*ArmClient).storageServiceClient

resourceGroupName := d.Get("resource_group_name").(string)
storageAccountName := d.Get("name").(string)
accountKind := d.Get("account_kind").(string)

location := azureRMNormalizeLocation(d.Get("location").(string))
tags := d.Get("tags").(map[string]interface{})
enableBlobEncryption := d.Get("enable_blob_encryption").(bool)
Expand Down Expand Up @@ -393,13 +389,14 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e
}

// Create
ctx := meta.(*ArmClient).StopContext
future, err := client.Create(ctx, resourceGroupName, storageAccountName, parameters)
if err != nil {
return fmt.Errorf("Error creating Azure Storage Account %q: %+v", storageAccountName, err)
}

err = future.WaitForCompletionRef(ctx, client.Client)
waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutCreate))
defer cancel()
err = future.WaitForCompletionRef(waitCtx, client.Client)
if err != nil {
return fmt.Errorf("Error waiting for Azure Storage Account %q to be created: %+v", storageAccountName, err)
}
Expand All @@ -423,8 +420,8 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e
// and idempotent operation for CreateOrUpdate. In particular updating all of the parameters
// available requires a call to Update per parameter...
func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) error {
ctx := meta.(*ArmClient).StopContext
client := meta.(*ArmClient).storageServiceClient
ctx := meta.(*ArmClient).StopContext
id, err := parseAzureResourceID(d.Id())
if err != nil {
return err
Expand Down Expand Up @@ -453,7 +450,9 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
opts := storage.AccountUpdateParameters{
Sku: &sku,
}
_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)
waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account type %q: %+v", storageAccountName, err)
}
Expand All @@ -470,7 +469,9 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
},
}

_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)
waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account access_tier %q: %+v", storageAccountName, err)
}
Expand All @@ -484,7 +485,10 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
opts := storage.AccountUpdateParameters{
Tags: expandTags(tags),
}
_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)

waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account tags %q: %+v", storageAccountName, err)
}
Expand Down Expand Up @@ -521,7 +525,9 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
d.SetPartial("enable_file_encryption")
}

_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)
waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account Encryption %q: %+v", storageAccountName, err)
}
Expand All @@ -535,7 +541,9 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
},
}

_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)
waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account Custom Domain %q: %+v", storageAccountName, err)
}
Expand All @@ -549,7 +557,10 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
EnableHTTPSTrafficOnly: &enableHTTPSTrafficOnly,
},
}
_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)

waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account enable_https_traffic_only %q: %+v", storageAccountName, err)
}
Expand All @@ -563,7 +574,10 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
opts := storage.AccountUpdateParameters{
Identity: storageAccountIdentity,
}
_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)

waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account identity %q: %+v", storageAccountName, err)
}
Expand All @@ -577,7 +591,10 @@ func resourceArmStorageAccountUpdate(d *schema.ResourceData, meta interface{}) e
NetworkRuleSet: networkRules,
},
}
_, err := client.Update(ctx, resourceGroupName, storageAccountName, opts)

waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutUpdate))
defer cancel()
_, err := client.Update(waitCtx, resourceGroupName, storageAccountName, opts)
if err != nil {
return fmt.Errorf("Error updating Azure Storage Account network_rules %q: %+v", storageAccountName, err)
}
Expand Down Expand Up @@ -732,7 +749,9 @@ func resourceArmStorageAccountDelete(d *schema.ResourceData, meta interface{}) e
name := id.Path["storageAccounts"]
resGroup := id.ResourceGroup

_, err = client.Delete(ctx, resGroup, name)
waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutDelete))
defer cancel()
_, err = client.Delete(waitCtx, resGroup, name)
if err != nil {
return fmt.Errorf("Error issuing AzureRM delete request for storage account %q: %+v", name, err)
}
Expand Down Expand Up @@ -928,3 +947,26 @@ func flattenAzureRmStorageAccountIdentity(identity *storage.Identity) []interfac

return []interface{}{result}
}

func validateAzureRMStorageAccountTags(v interface{}, _ string) (ws []string, es []error) {
tagsMap := v.(map[string]interface{})

if len(tagsMap) > 15 {
es = append(es, errors.New("a maximum of 15 tags can be applied to each ARM resource"))
}

for k, v := range tagsMap {
if len(k) > 128 {
es = append(es, fmt.Errorf("the maximum length for a tag key is 128 characters: %q is %d characters", k, len(k)))
}

value, err := tagValueToString(v)
if err != nil {
es = append(es, err)
} else if len(value) > 256 {
es = append(es, fmt.Errorf("the maximum length for a tag value is 256 characters: the value for %q is %d characters", k, len(value)))
}
}

return ws, es
}
45 changes: 45 additions & 0 deletions azurerm/resource_arm_storage_account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,32 @@ func TestAccAzureRMStorageAccount_basic(t *testing.T) {
})
}

func TestAccAzureRMStorageAccount_requiresImport(t *testing.T) {
resourceName := "azurerm_storage_account.testsa"
ri := acctest.RandInt()
rs := acctest.RandString(4)
location := testLocation()

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMStorageAccountDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMStorageAccount_basic(ri, rs, location),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMStorageAccountExists(resourceName),
),
},

{
Config: testAccAzureRMStorageAccount_requiresImport(ri, rs, location),
ExpectError: testRequiresImportError("azurerm_storage_account"),
},
},
})
}

func TestAccAzureRMStorageAccount_premium(t *testing.T) {
resourceName := "azurerm_storage_account.testsa"
ri := acctest.RandInt()
Expand Down Expand Up @@ -574,6 +600,25 @@ resource "azurerm_storage_account" "testsa" {
`, rInt, location, rString)
}

func testAccAzureRMStorageAccount_requiresImport(rInt int, rString string, location string) string {
template := testAccAzureRMStorageAccount_basic(rInt, rString, location)
return fmt.Sprintf(`
%s
resource "azurerm_storage_account" "import" {
name = "${azurem_storage_account.test.name}"
resource_group_name = "${azurem_storage_account.test.resource_group_name}"
location = "${azurem_storage_account.test.location}"
account_tier = "${azurem_storage_account.test.account_tier}"
account_replication_type = "${azurem_storage_account.test.account_replication_type}"
tags {
environment = "production"
}
}
`, template)
}

func testAccAzureRMStorageAccount_premium(rInt int, rString string, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "testrg" {
Expand Down

0 comments on commit ed58e57

Please sign in to comment.