From 619afbe4fb1af1f79602e259d46ab9c91dcbc85f Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 29 Jun 2018 02:27:48 -0700 Subject: [PATCH] cosmos db account - now checks to see if name is already in use (#1464) --- azurerm/resource_arm_cosmos_db_account.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go index fb9309efcc6c..3b5628f3027a 100644 --- a/azurerm/resource_arm_cosmos_db_account.go +++ b/azurerm/resource_arm_cosmos_db_account.go @@ -262,9 +262,16 @@ func resourceArmCosmosDBAccountCreate(d *schema.ResourceData, meta interface{}) ipRangeFilter := d.Get("ip_range_filter").(string) enableAutomaticFailover := d.Get("enable_automatic_failover").(bool) + r, err := client.CheckNameExists(ctx, name) + if err != nil { + return fmt.Errorf("Error checking if CosmosDB Account %q already exists (Resource Group %q): %+v", name, resourceGroup, err) + } + if !utils.ResponseWasNotFound(r) { + return fmt.Errorf("CosmosDB Account %s already exists, please import the resource via terraform import", name) + } + //hacky, todo fix up once deprecated field 'failover_policy' is removed var geoLocations []documentdb.Location - var err error if _, ok := d.GetOk("geo_location"); ok { geoLocations, err = expandAzureRmCosmosDBAccountGeoLocations(name, d) if err != nil { @@ -277,7 +284,7 @@ func resourceArmCosmosDBAccountCreate(d *schema.ResourceData, meta interface{}) } } else { //could be a CustomizeDiff?, but this is temporary - return fmt.Errorf("Neither `geo_location` or `failover_policy` is set for CosmosDB Account '%s'", name) + return fmt.Errorf("Neither `geo_location` or `failover_policy` is set for CosmosDB Account %s", name) } account := documentdb.DatabaseAccountCreateUpdateParameters{ @@ -298,9 +305,7 @@ func resourceArmCosmosDBAccountCreate(d *schema.ResourceData, meta interface{}) return fmt.Errorf("Error creating CosmosDB Account %q (Resource Group %q): %+v", name, resourceGroup, err) } - //todo is this still required? - r := *resp - id := r.ID + id := resp.ID if id == nil { return fmt.Errorf("Cannot read CosmosDB Account '%s' (resource group %s) ID", name, resourceGroup) }