IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

providers/azurerm: address PR feedback

Browse Source
This commit is contained in:
Mitchell Hashimoto 2016-08-16 09:42:05 -07:00
parent 284725fa94
commit ecad167e31
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/providers/azurerm/resource_arm_storage_account.go
View File

@ -139,8 +139,7 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e
return err
})
// Check the result of the wrapped function. I put this into a select
// since we will likely also want to introduce a time-based timeout.
// Check the result of the wrapped function.
var createErr error
select {
case <-time.After(1 * time.Hour):
@ -154,12 +153,9 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e
// The only way to get the ID back apparently is to read the resource again
read, err := storageClient.GetProperties(resourceGroupName, storageAccountName)
if err != nil {
return err
}
// Set the ID right away if we have one
if read.ID != nil {
if read != nil && read.ID != nil {
log.Printf("[INFO] storage account %q ID: %q", storageAccountName, *read.ID)
d.SetId(*read.ID)
}
@ -172,6 +168,11 @@ func resourceArmStorageAccountCreate(d *schema.ResourceData, meta interface{}) e
storageAccountName, createErr)
}
// Check the read error now that we know it would exist without a create err
if err != nil {
return err
}
// If we got no ID then the resource group doesn't yet exist
if read.ID == nil {
return fmt.Errorf("Cannot read Storage Account %s (resource group %s) ID",