Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_mssql_elasticpool: moved elastic_pool_properties properties to the top level #2378

Merged
merged 2 commits into from
Nov 22, 2018
Merged

azurerm_mssql_elasticpool: moved elastic_pool_properties properties to the top level #2378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fe8df0
Moved properties in to the top level
katbyte Nov 22, 2018
f99feb5
updates requested in pr #2378
katbyte Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 71 additions & 31 deletions azurerm/resource_arm_mssql_elasticpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"log"
"math"
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/sql/mgmt/2017-10-01-preview/sql"
"github.com/hashicorp/terraform/helper/schema"
Expand Down Expand Up @@ -119,39 +120,70 @@ func resourceArmMsSqlElasticPool() *schema.Resource {
},

"elastic_pool_properties": {
Type: schema.TypeList,
Computed: true,
MaxItems: 1,
Type: schema.TypeList,
Computed: true,
MaxItems: 1,
Deprecated: "All properties herein have been move to the top level",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"state": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Deprecated: "This property has been moved to the top level",
},

"creation_date": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Deprecated: "This property has been moved to the top level",
},

"max_size_bytes": {
Type: schema.TypeInt,
Computed: true,
Type: schema.TypeInt,
Computed: true,
Deprecated: "This property has been moved to the top level",
},

"zone_redundant": {
Type: schema.TypeBool,
Computed: true,
Type: schema.TypeBool,
Computed: true,
Deprecated: "This property has been moved to the top level",
},

"license_type": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Deprecated: "This property has been moved to the top level",
},
},
},
},

katbyte marked this conversation as resolved.
Show resolved Hide resolved
"state": {
Type: schema.TypeString,
Computed: true,
},

"creation_date": {
Type: schema.TypeString,
Computed: true,
},
katbyte marked this conversation as resolved.
Show resolved Hide resolved

"max_size_bytes": {
Type: schema.TypeInt,
Computed: true,
},

"zone_redundant": {
Type: schema.TypeBool,
Computed: true,
},

"license_type": {
Type: schema.TypeString,
Computed: true,
},
katbyte marked this conversation as resolved.
Show resolved Hide resolved

"tags": tagsSchema(),
},

Expand Down Expand Up @@ -208,7 +240,7 @@ func resourceArmMsSqlElasticPool() *schema.Resource {
}
}

// Addutional checks based of SKU type...
// Additional checks based of SKU type...
if strings.HasPrefix(strings.ToLower(name.(string)), "gp_") || strings.HasPrefix(strings.ToLower(name.(string)), "bc_") {
// vCore based
if maxCapacity.(float64) > float64(capacity.(int)) {
Expand Down Expand Up @@ -249,15 +281,16 @@ func resourceArmMsSqlElasticPoolCreate(d *schema.ResourceData, meta interface{})
location := azureRMNormalizeLocation(d.Get("location").(string))
resGroup := d.Get("resource_group_name").(string)
sku := expandAzureRmMsSqlElasticPoolSku(d)
properties := expandAzureRmMsSqlElasticPoolProperties(d)
tags := d.Get("tags").(map[string]interface{})

elasticPool := sql.ElasticPool{
Sku: sku,
ElasticPoolProperties: properties,
Location: &location,
Tags: expandTags(tags),
Name: &elasticPoolName,
Name: &elasticPoolName,
Location: &location,
Sku: sku,
Tags: expandTags(tags),
ElasticPoolProperties: &sql.ElasticPoolProperties{
PerDatabaseSettings: expandAzureRmMsSqlElasticPoolPerDatabaseSettings(d),
},
}

future, err := client.CreateOrUpdate(ctx, resGroup, serverName, elasticPoolName, elasticPool)
Expand Down Expand Up @@ -313,12 +346,21 @@ func resourceArmMsSqlElasticPoolRead(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error setting `sku`: %+v", err)
}

if err := d.Set("elastic_pool_properties", flattenAzureRmMsSqlElasticPoolProperties(resp.ElasticPoolProperties)); err != nil {
return fmt.Errorf("Error setting `elastic_pool_properties`: %+v", err)
}
if properties := resp.ElasticPoolProperties; properties != nil {
d.Set("creation_date", properties.CreationDate.Format(time.RFC3339))
d.Set("license_type", string(properties.LicenseType))
d.Set("max_size_bytes", properties.MaxSizeBytes)
d.Set("state", string(properties.State))
d.Set("zone_redundant", properties.ZoneRedundant)

//todo remove in 2.0
if err := d.Set("elastic_pool_properties", flattenAzureRmMsSqlElasticPoolProperties(resp.ElasticPoolProperties)); err != nil {
return fmt.Errorf("Error setting `elastic_pool_properties`: %+v", err)
}

if err := d.Set("per_database_settings", flattenAzureRmMsSqlElasticPoolPerDatabaseSettings(resp.ElasticPoolProperties.PerDatabaseSettings)); err != nil {
return fmt.Errorf("Error setting `per_database_settings`: %+v", err)
if err := d.Set("per_database_settings", flattenAzureRmMsSqlElasticPoolPerDatabaseSettings(properties.PerDatabaseSettings)); err != nil {
return fmt.Errorf("Error setting `per_database_settings`: %+v", err)
}
}

flattenAndSetTags(d, resp.Tags)
Expand Down Expand Up @@ -348,18 +390,16 @@ func parseArmMsSqlElasticPoolId(sqlElasticPoolId string) (string, string, string
return id.ResourceGroup, id.Path["servers"], id.Path["elasticPools"], nil
}

func expandAzureRmMsSqlElasticPoolProperties(d *schema.ResourceData) *sql.ElasticPoolProperties {
func expandAzureRmMsSqlElasticPoolPerDatabaseSettings(d *schema.ResourceData) *sql.ElasticPoolPerDatabaseSettings {
perDatabaseSettings := d.Get("per_database_settings").([]interface{})
perDatabaseSetting := perDatabaseSettings[0].(map[string]interface{})

minCapacity := perDatabaseSetting["min_capacity"].(float64)
maxCapacity := perDatabaseSetting["max_capacity"].(float64)

return &sql.ElasticPoolProperties{
PerDatabaseSettings: &sql.ElasticPoolPerDatabaseSettings{
MinCapacity: utils.Float(minCapacity),
MaxCapacity: utils.Float(maxCapacity),
},
return &sql.ElasticPoolPerDatabaseSettings{
MinCapacity: utils.Float(minCapacity),
MaxCapacity: utils.Float(maxCapacity),
}
}

Expand Down
8 changes: 8 additions & 0 deletions azurerm/resource_arm_mssql_elasticpool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ func TestAccAzureRMMsSqlElasticPool_basic_DTU(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "sku.0.capacity", "50"),
resource.TestCheckResourceAttr(resourceName, "per_database_settings.0.min_capacity", "0"),
resource.TestCheckResourceAttr(resourceName, "per_database_settings.0.max_capacity", "50"),
resource.TestCheckResourceAttrSet(resourceName, "creation_date"),
resource.TestCheckResourceAttrSet(resourceName, "max_size_bytes"),
resource.TestCheckResourceAttrSet(resourceName, "state"),
resource.TestCheckResourceAttrSet(resourceName, "zone_redundant"),
),
},
{
Expand Down Expand Up @@ -60,6 +64,10 @@ func TestAccAzureRMMsSqlElasticPool_basic_vCore(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "sku.0.family", "Gen5"),
resource.TestCheckResourceAttr(resourceName, "per_database_settings.0.min_capacity", "0.25"),
resource.TestCheckResourceAttr(resourceName, "per_database_settings.0.max_capacity", "4"),
resource.TestCheckResourceAttrSet(resourceName, "creation_date"),
resource.TestCheckResourceAttrSet(resourceName, "max_size_bytes"),
resource.TestCheckResourceAttrSet(resourceName, "state"),
resource.TestCheckResourceAttrSet(resourceName, "zone_redundant"),
),
},
{
Expand Down