Skip to content

Commit

Permalink
azurerm_cosmosdb_sql_database doesn't call get throughput api when …
Browse files Browse the repository at this point in the history
…cosmos account is serverless (#9187)

Co-authored-by: Massimiliano Donini <[email protected]>
  • Loading branch information
ilmax and Massimiliano Donini authored Nov 10, 2020
1 parent 0663163 commit 0dc4f49
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 8 deletions.
37 changes: 29 additions & 8 deletions azurerm/internal/services/cosmos/cosmosdb_sql_database_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ func resourceArmCosmosDbSQLDatabaseUpdate(d *schema.ResourceData, meta interface

func resourceArmCosmosDbSQLDatabaseRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*clients.Client).Cosmos.SqlClient
accountClient := meta.(*clients.Client).Cosmos.DatabaseClient
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down Expand Up @@ -219,16 +220,36 @@ func resourceArmCosmosDbSQLDatabaseRead(d *schema.ResourceData, meta interface{}
}
}

throughputResp, err := client.GetSQLDatabaseThroughput(ctx, id.ResourceGroup, id.Account, id.Name)
accResp, err := accountClient.Get(ctx, id.ResourceGroup, id.Account)
if err != nil {
if !utils.ResponseWasNotFound(throughputResp.Response) {
return fmt.Errorf("Error reading Throughput on Cosmos SQL Database %q (Account: %q) ID: %v", id.Name, id.Account, err)
} else {
d.Set("throughput", nil)
d.Set("autoscale_settings", nil)
return fmt.Errorf("reading CosmosDB Account %q (Resource Group %q): %+v", id.Account, id.ResourceGroup, err)
}

if accResp.ID == nil || *accResp.ID == "" {
return fmt.Errorf("cosmosDB Account %q (Resource Group %q) ID is empty or nil", id.Account, id.ResourceGroup)
}

if props := accResp.DatabaseAccountGetProperties; props != nil && props.Capabilities != nil {
serverless := false
for _, v := range *props.Capabilities {
if *v.Name == "EnableServerless" {
serverless = true
}
}

if !serverless {
throughputResp, err := client.GetSQLDatabaseThroughput(ctx, id.ResourceGroup, id.Account, id.Name)
if err != nil {
if !utils.ResponseWasNotFound(throughputResp.Response) {
return fmt.Errorf("Error reading Throughput on Cosmos SQL Database %q (Account: %q) ID: %v", id.Name, id.Account, err)
} else {
d.Set("throughput", nil)
d.Set("autoscale_settings", nil)
}
} else {
common.SetResourceDataThroughputFromResponse(throughputResp, d)
}
}
} else {
common.SetResourceDataThroughputFromResponse(throughputResp, d)
}

return nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,25 @@ func TestAccAzureRMCosmosDbSqlDatabase_autoscale(t *testing.T) {
})
}

func TestAccAzureRMCosmosDbSqlDatabase_serverless(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_cosmosdb_sql_database", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMCosmosDbSqlDatabaseDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMCosmosDbSqlDatabase_serverless(data),
Check: resource.ComposeAggregateTestCheckFunc(
testCheckAzureRMCosmosDbSqlDatabaseExists(data.ResourceName),
),
},
data.ImportStep(),
},
})
}

func testCheckAzureRMCosmosDbSqlDatabaseDestroy(s *terraform.State) error {
client := acceptance.AzureProvider.Meta().(*clients.Client).Cosmos.SqlClient
ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
Expand Down Expand Up @@ -195,3 +214,14 @@ resource "azurerm_cosmosdb_sql_database" "test" {
}
`, testAccAzureRMCosmosDBAccount_basic(data, documentdb.GlobalDocumentDB, documentdb.Strong), data.RandomInteger, maxThroughput)
}

func testAccAzureRMCosmosDbSqlDatabase_serverless(data acceptance.TestData) string {
return fmt.Sprintf(`
%[1]s
resource "azurerm_cosmosdb_sql_database" "test" {
name = "acctest-%[2]d"
resource_group_name = azurerm_cosmosdb_account.test.resource_group_name
account_name = azurerm_cosmosdb_account.test.name
}
`, testAccAzureRMCosmosDBAccount_capabilities(data, documentdb.GlobalDocumentDB, []string{"EnableServerless"}), data.RandomInteger)
}

0 comments on commit 0dc4f49

Please sign in to comment.