diff --git a/builtin/providers/azurerm/config.go b/builtin/providers/azurerm/config.go index 55b7f0949f..ff6e6c51a2 100644 --- a/builtin/providers/azurerm/config.go +++ b/builtin/providers/azurerm/config.go @@ -101,10 +101,7 @@ type ArmClient struct { keyVaultClient keyvault.VaultsClient - sqlDatabasesClient sql.DatabasesClient - sqlElasticPoolsClient sql.ElasticPoolsClient - sqlRecommendedElasticPoolsClient sql.RecommendedElasticPoolsClient - sqlServersClient sql.ServersClient + sqlElasticPoolsClient sql.ElasticPoolsClient } func withRequestLogging() autorest.SendDecorator { @@ -464,30 +461,12 @@ func (c *Config) getArmClient() (*ArmClient, error) { kvc.Sender = autorest.CreateSender(withRequestLogging()) client.keyVaultClient = kvc - sqldc := sql.NewDatabasesClientWithBaseURI(endpoint, c.SubscriptionID) - setUserAgent(&sqldc.Client) - sqldc.Authorizer = spt - sqldc.Sender = autorest.CreateSender(withRequestLogging()) - client.sqlDatabasesClient = sqldc - sqlepc := sql.NewElasticPoolsClientWithBaseURI(endpoint, c.SubscriptionID) setUserAgent(&sqlepc.Client) sqlepc.Authorizer = spt sqlepc.Sender = autorest.CreateSender(withRequestLogging()) client.sqlElasticPoolsClient = sqlepc - sqlrepc := sql.NewRecommendedElasticPoolsClientWithBaseURI(endpoint, c.SubscriptionID) - setUserAgent(&sqlrepc.Client) - sqlrepc.Authorizer = spt - sqlrepc.Sender = autorest.CreateSender(withRequestLogging()) - client.sqlRecommendedElasticPoolsClient = sqlrepc - - sqlsc := sql.NewServersClientWithBaseURI(endpoint, c.SubscriptionID) - setUserAgent(&sqlsc.Client) - sqlsc.Authorizer = spt - sqlsc.Sender = autorest.CreateSender(withRequestLogging()) - client.sqlServersClient = sqlsc - return &client, nil } diff --git a/builtin/providers/azurerm/resource_arm_sql_elasticpool.go b/builtin/providers/azurerm/resource_arm_sql_elasticpool.go index 3e1cf04123..6231950fb6 100644 --- a/builtin/providers/azurerm/resource_arm_sql_elasticpool.go +++ b/builtin/providers/azurerm/resource_arm_sql_elasticpool.go @@ -137,20 +137,23 @@ func resourceArmSqlElasticPoolRead(d *schema.ResourceData, meta interface{}) err return fmt.Errorf("Error making Read request on Sql Elastic Pool %s: %s", name, err) } - elasticPool := *resp.ElasticPoolProperties - d.Set("name", resp.Name) d.Set("resource_group_name", resGroup) d.Set("location", azureRMNormalizeLocation(*resp.Location)) d.Set("server_name", serverName) - d.Set("edition", string(elasticPool.Edition)) - d.Set("dtu", int(*elasticPool.Dtu)) - d.Set("db_dtu_min", int(*elasticPool.DatabaseDtuMin)) - d.Set("db_dtu_max", int(*elasticPool.DatabaseDtuMax)) - d.Set("pool_size", int(*elasticPool.StorageMB)) - if elasticPool.CreationDate != nil { - d.Set("creation_date", elasticPool.CreationDate.Format(time.RFC3339)) + elasticPool := resp.ElasticPoolProperties + + if elasticPool != nil { + d.Set("edition", string(elasticPool.Edition)) + d.Set("dtu", int(*elasticPool.Dtu)) + d.Set("db_dtu_min", int(*elasticPool.DatabaseDtuMin)) + d.Set("db_dtu_max", int(*elasticPool.DatabaseDtuMax)) + d.Set("pool_size", int(*elasticPool.StorageMB)) + + if elasticPool.CreationDate != nil { + d.Set("creation_date", elasticPool.CreationDate.Format(time.RFC3339)) + } } flattenAndSetTags(d, resp.Tags)