Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updates requested in pr #2378
Browse files Browse the repository at this point in the history
katbyte committed Nov 22, 2018
1 parent 0fe8df0 commit eca05fe
Showing 3 changed files with 6 additions and 28 deletions.
26 changes: 3 additions & 23 deletions azurerm/resource_arm_mssql_elasticpool.go
Original file line number Diff line number Diff line change
@@ -2,18 +2,16 @@ package azurerm

import (
"fmt"
"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"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
"log"
"math"
"strings"
)

func resourceArmMsSqlElasticPool() *schema.Resource {
@@ -159,16 +157,6 @@ func resourceArmMsSqlElasticPool() *schema.Resource {
},
},

"state": {
Type: schema.TypeString,
Computed: true,
},

"creation_date": {
Type: schema.TypeString,
Computed: true,
},

"max_size_bytes": {
Type: schema.TypeInt,
Computed: true,
@@ -179,11 +167,6 @@ func resourceArmMsSqlElasticPool() *schema.Resource {
Computed: true,
},

"license_type": {
Type: schema.TypeString,
Computed: true,
},

"tags": tagsSchema(),
},

@@ -347,10 +330,7 @@ func resourceArmMsSqlElasticPoolRead(d *schema.ResourceData, meta interface{}) e
}

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
4 changes: 0 additions & 4 deletions azurerm/resource_arm_mssql_elasticpool_test.go
Original file line number Diff line number Diff line change
@@ -29,9 +29,7 @@ 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"),
),
},
@@ -64,9 +62,7 @@ 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"),
),
},
4 changes: 3 additions & 1 deletion website/docs/r/mssql_elasticpool.html.markdown
Original file line number Diff line number Diff line change
@@ -93,7 +93,9 @@ The following attributes are exported:

* `id` - The MsSQL Elastic Pool ID.

* `creation_date` - The creation date of the MsSQL Elastic Pool.
* `max_size_bytes` - The storage limit for the database elastic pool in bytes.

* `zone_redundant` - Whether or not this elastic pool is zone redundant.

## Import

0 comments on commit eca05fe

Please sign in to comment.