From cf17d34de4d8ce9c4b083a7549dd9693e9efd713 Mon Sep 17 00:00:00 2001 From: Dingjia Chen <48020536+Pumpkin-3906@users.noreply.github.com> Date: Thu, 16 Feb 2023 19:45:31 -0600 Subject: [PATCH] fix 101-cosmos-db-manualscale example (#162) --- quickstart/101-cosmos-db-manualscale/main.tf | 17 +++++++++----- .../101-cosmos-db-manualscale/outputs.tf | 2 +- .../101-cosmos-db-manualscale/providers.tf | 8 ++++++- .../101-cosmos-db-manualscale/variables.tf | 23 +++++-------------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/quickstart/101-cosmos-db-manualscale/main.tf b/quickstart/101-cosmos-db-manualscale/main.tf index a1e48857..dfd58cb5 100644 --- a/quickstart/101-cosmos-db-manualscale/main.tf +++ b/quickstart/101-cosmos-db-manualscale/main.tf @@ -1,10 +1,10 @@ resource "azurerm_resource_group" "example" { - name = var.resource_group_name + name = "${random_pet.prefix.id}-rg" location = var.location } resource "azurerm_cosmosdb_account" "example" { - name = var.cosmosdb_account_name + name = "${random_pet.prefix.id}-cosmosdb" location = var.cosmosdb_account_location resource_group_name = azurerm_resource_group.example.name offer_type = "Standard" @@ -24,18 +24,18 @@ resource "azurerm_cosmosdb_account" "example" { ] } -resource "azurerm_cosmosdb_sql_database" "example" { - name = var.cosmosdb_sqldb_name +resource "azurerm_cosmosdb_sql_database" "main" { + name = "${random_pet.prefix.id}-sqldb" resource_group_name = azurerm_resource_group.example.name account_name = azurerm_cosmosdb_account.example.name throughput = var.throughput } resource "azurerm_cosmosdb_sql_container" "example" { - name = var.sql_container_name + name = "${random_pet.prefix.id}-sql-container" 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 throughput = var.throughput @@ -60,3 +60,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-manualscale/outputs.tf b/quickstart/101-cosmos-db-manualscale/outputs.tf index 7f78abd8..eeb83014 100644 --- a/quickstart/101-cosmos-db-manualscale/outputs.tf +++ b/quickstart/101-cosmos-db-manualscale/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-manualscale/providers.tf b/quickstart/101-cosmos-db-manualscale/providers.tf index 47306772..dc42605e 100644 --- a/quickstart/101-cosmos-db-manualscale/providers.tf +++ b/quickstart/101-cosmos-db-manualscale/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-manualscale/variables.tf b/quickstart/101-cosmos-db-manualscale/variables.tf index 7387aa38..d6e632bb 100644 --- a/quickstart/101-cosmos-db-manualscale/variables.tf +++ b/quickstart/101-cosmos-db-manualscale/variables.tf @@ -1,35 +1,24 @@ -variable "resource_group_name" { +variable "prefix" { type = string - description = "Resource group name" + default = "cosmosdb-manualscale" + description = "Prefix of the resource name" } variable "location" { type = string + default = "eastus" description = "Resource group location" } -variable "cosmosdb_account_name" { - type = string - description = "Cosmos db account name" -} - variable "cosmosdb_account_location" { type = string + default = "eastus" description = "Cosmos db account location" } -variable "cosmosdb_sqldb_name" { - type = string - description = "value" -} - -variable "sql_container_name" { - type = string - description = "SQL API container name." -} - variable "throughput" { type = number + default = 400 description = "Cosmos db database throughput" validation { condition = var.throughput >= 400 && var.throughput <= 1000000