From 99e0a341a1fd66621cddc874e177ee450f8d76aa Mon Sep 17 00:00:00 2001 From: Dingjia Chen <48020536+Pumpkin-3906@users.noreply.github.com> Date: Thu, 16 Feb 2023 00:35:27 -0600 Subject: [PATCH] fix 101-cosmos-db-autoscale example (#157) --- quickstart/101-cosmos-db-autoscale/main.tf | 11 ++++++++--- quickstart/101-cosmos-db-autoscale/outputs.tf | 2 +- quickstart/101-cosmos-db-autoscale/providers.tf | 8 +++++++- quickstart/101-cosmos-db-autoscale/variables.tf | 11 +++++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/quickstart/101-cosmos-db-autoscale/main.tf b/quickstart/101-cosmos-db-autoscale/main.tf index e44cfa0d..7b88ebeb 100644 --- a/quickstart/101-cosmos-db-autoscale/main.tf +++ b/quickstart/101-cosmos-db-autoscale/main.tf @@ -1,5 +1,5 @@ resource "azurerm_resource_group" "example" { - name = var.resource_group_name + name = "${random_pet.prefix.id}-rg" location = var.location } @@ -24,7 +24,7 @@ resource "azurerm_cosmosdb_account" "example" { ] } -resource "azurerm_cosmosdb_sql_database" "example" { +resource "azurerm_cosmosdb_sql_database" "main" { name = var.cosmosdb_sqldb_name resource_group_name = azurerm_resource_group.example.name account_name = azurerm_cosmosdb_account.example.name @@ -37,7 +37,7 @@ resource "azurerm_cosmosdb_sql_container" "example" { name = var.sql_container_name resource_group_name = azurerm_resource_group.example.name account_name = azurerm_cosmosdb_account.example.name - database_name = azurerm_cosmosdb_sql_database.example.name + database_name = azurerm_cosmosdb_sql_database.main.name partition_key_path = "/definition/id" partition_key_version = 1 autoscale_settings { @@ -64,3 +64,8 @@ resource "azurerm_cosmosdb_sql_container" "example" { paths = ["/definition/idlong", "/definition/idshort"] } } + +resource "random_pet" "prefix" { + prefix = var.prefix + length = 1 +} \ No newline at end of file diff --git a/quickstart/101-cosmos-db-autoscale/outputs.tf b/quickstart/101-cosmos-db-autoscale/outputs.tf index 7f78abd8..eeb83014 100644 --- a/quickstart/101-cosmos-db-autoscale/outputs.tf +++ b/quickstart/101-cosmos-db-autoscale/outputs.tf @@ -3,5 +3,5 @@ output "cosmosdb_account_id" { } output "cosmosdb_sql_database_id" { - value = azurerm_cosmosdb_sql_database.example.id + value = azurerm_cosmosdb_sql_database.main.id } \ No newline at end of file diff --git a/quickstart/101-cosmos-db-autoscale/providers.tf b/quickstart/101-cosmos-db-autoscale/providers.tf index 47306772..dc42605e 100644 --- a/quickstart/101-cosmos-db-autoscale/providers.tf +++ b/quickstart/101-cosmos-db-autoscale/providers.tf @@ -1,8 +1,14 @@ terraform { + required_version = ">= 1.0" + required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">=3.0.0" + version = ">= 3.0, < 4.0" + } + random = { + source = "hashicorp/random" + version = ">= 3.0" } } } diff --git a/quickstart/101-cosmos-db-autoscale/variables.tf b/quickstart/101-cosmos-db-autoscale/variables.tf index 9613347f..55eab6ee 100644 --- a/quickstart/101-cosmos-db-autoscale/variables.tf +++ b/quickstart/101-cosmos-db-autoscale/variables.tf @@ -1,35 +1,42 @@ -variable "resource_group_name" { +variable "prefix" { type = string - description = "Resource group name" + default = "cosmos-db-autoscale" + description = "Prefix of the resource name" } variable "location" { type = string + default = "eastus" description = "Resource group location" } variable "cosmosdb_account_name" { type = string + default = "default-cosmosdb-user" description = "Cosmos db account name" } variable "cosmosdb_account_location" { type = string + default = "eastus" description = "Cosmos db account location" } variable "cosmosdb_sqldb_name" { type = string + default = "default-cosmosdb-sqldb" description = "value" } variable "sql_container_name" { type = string + default = "default-sql-container" description = "SQL API container name." } variable "max_throughput" { type = number + default = 4000 description = "Cosmos db database max throughput" validation { condition = var.max_throughput >= 4000 && var.max_throughput <= 1000000