diff --git a/CHANGELOG.md b/CHANGELOG.md index 30b641e..bac0790 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ -## 1.3.0 (Unreleased) ## 1.2.1 (2025-03-14) - examples/complete: improve the examples [GH-7](https://github.com/alibabacloud-automation/terraform-alicloud-ecommerce-elasticsearch/pull/7) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 2baf719..6f6084e 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -1,3 +1,7 @@ +provider "alicloud" { + region = "ap-southeast-5" +} + data "alicloud_db_zones" "default" { engine = "MySQL" engine_version = "8.0" @@ -7,14 +11,16 @@ data "alicloud_db_zones" "default" { } data "alicloud_images" "default" { - name_regex = "^centos_6" + instance_type = data.alicloud_instance_types.default.instance_types[0].id + owners = "system" + most_recent = true } data "alicloud_instance_types" "default" { availability_zone = data.alicloud_db_zones.default.zones[0].id cpu_core_count = 2 memory_size = 8 - instance_type_family = "ecs.g6" + instance_type_family = "ecs.g9i" } data "alicloud_db_instance_classes" "default" { @@ -62,7 +68,7 @@ module "example" { internet_max_bandwidth_out = 0 ecs_password = var.ecs_password ecs_charge_type = var.ecs_charge_type - disk_category = "cloud_efficiency" + disk_category = "cloud_essd" system_disk_size = var.system_disk_size #alicloud_eip_address @@ -74,6 +80,7 @@ module "example" { #alicloud_db_instance engine = "MySQL" engine_version = "8.0" + category = "Basic" instance_type = data.alicloud_db_instance_classes.default.instance_classes[1].instance_class instance_storage = var.instance_storage instance_charge_type = var.instance_charge_type diff --git a/main.tf b/main.tf index 26e2efd..5209188 100644 --- a/main.tf +++ b/main.tf @@ -98,6 +98,7 @@ resource "alicloud_db_instance" "rds" { instance_type = var.instance_type instance_storage = var.instance_storage instance_charge_type = var.instance_charge_type + category = var.category db_instance_storage_type = var.db_storage_type zone_id = var.rds_zone_id vswitch_id = element(split(",", join(",", alicloud_vswitch.vswitch[*].id)), 1) diff --git a/variables.tf b/variables.tf index c59d30b..674d5e6 100644 --- a/variables.tf +++ b/variables.tf @@ -209,6 +209,12 @@ variable "instance_charge_type" { default = "Postpaid" } +variable "category" { + description = "The category of the rds instance." + type = string + default = null +} + variable "db_storage_type" { description = "The DB instance storage type." type = string