examples: improve the examples

Author: shanye997

examples/complete/main.tf

@@ -1,7 +1,3 @@
-provider "alicloud" {
-  region = "eu-central-1"
-}
-
 data "alicloud_mongodb_zones" "default" {
 }
 
@@ -10,6 +6,8 @@ data "alicloud_cms_alarm_contact_groups" "default" {
 
 module "vpc" {
   source             = "alibaba/vpc/alicloud"
+  version            = "~>1.11.0"
+  
   create             = true
   vpc_name           = var.name
   vpc_cidr           = "172.16.0.0/16"
@@ -25,7 +23,7 @@ module "mongodb_example" {
   create = true
 
   name                 = var.name
-  engine_version       = "4.0"
+  engine_version       = "4.4"
   instance_charge_type = var.instance_charge_type
   db_instance_class    = var.db_instance_class
   db_instance_storage  = var.db_instance_storage
@@ -66,131 +64,3 @@ module "use_existing_mongodb" {
   alarm_rule_effective_interval = var.alarm_rule_effective_interval
 
 }
-
-module "mongodb_3_4_rocksdb" {
-  source = "../../modules/mongodb-3.4-rocksdb"
-
-  # Mongodb Instance
-  name                 = var.name
-  instance_charge_type = var.instance_charge_type
-  db_instance_class    = var.db_instance_class
-  db_instance_storage  = var.db_instance_storage
-  period               = var.period
-  security_ip_list     = var.security_ip_list
-  replication_factor   = var.replication_factor
-  vswitch_id           = module.vpc.this_vswitch_ids[0]
-  zone_id              = data.alicloud_mongodb_zones.default.zones.0.id
-  account_password     = var.account_password
-  backup_period        = var.backup_period
-  backup_time          = var.backup_time
-  tags                 = var.tags
-
-  # cms_alarm
-  enable_alarm_rule             = var.enable_alarm_rule
-  alarm_rule_name               = var.alarm_rule_name
-  alarm_rule_statistics         = var.alarm_rule_statistics
-  alarm_rule_operator           = var.alarm_rule_operator
-  alarm_rule_threshold          = var.alarm_rule_threshold
-  alarm_rule_triggered_count    = var.alarm_rule_triggered_count
-  alarm_rule_period             = var.alarm_rule_period
-  alarm_rule_contact_groups     = data.alicloud_cms_alarm_contact_groups.default.names
-  alarm_rule_silence_time       = var.alarm_rule_silence_time
-  alarm_rule_effective_interval = var.alarm_rule_effective_interval
-
-}
-
-module "mongodb_3_4_wiredtiger" {
-  source = "../../modules/mongodb-3.4-wiredtiger"
-
-  # Mongodb Instance
-  name                 = var.name
-  instance_charge_type = var.instance_charge_type
-  db_instance_class    = var.db_instance_class
-  db_instance_storage  = var.db_instance_storage
-  period               = var.period
-  security_ip_list     = var.security_ip_list
-  replication_factor   = var.replication_factor
-  vswitch_id           = module.vpc.this_vswitch_ids[0]
-  zone_id              = data.alicloud_mongodb_zones.default.zones.0.id
-  account_password     = var.account_password
-  backup_period        = var.backup_period
-  backup_time          = var.backup_time
-  tags                 = var.tags
-
-  # cms_alarm
-  enable_alarm_rule             = var.enable_alarm_rule
-  alarm_rule_name               = var.alarm_rule_name
-  alarm_rule_statistics         = var.alarm_rule_statistics
-  alarm_rule_operator           = var.alarm_rule_operator
-  alarm_rule_threshold          = var.alarm_rule_threshold
-  alarm_rule_triggered_count    = var.alarm_rule_triggered_count
-  alarm_rule_period             = var.alarm_rule_period
-  alarm_rule_contact_groups     = data.alicloud_cms_alarm_contact_groups.default.names
-  alarm_rule_silence_time       = var.alarm_rule_silence_time
-  alarm_rule_effective_interval = var.alarm_rule_effective_interval
-
-}
-
-module "mongodb_4_0_wiredtiger" {
-  source = "../../modules/mongodb-4.0-wiredtiger"
-
-  # Mongodb Instance
-  name                 = var.name
-  instance_charge_type = var.instance_charge_type
-  db_instance_class    = var.db_instance_class
-  db_instance_storage  = var.db_instance_storage
-  period               = var.period
-  security_ip_list     = var.security_ip_list
-  replication_factor   = var.replication_factor
-  vswitch_id           = module.vpc.this_vswitch_ids[0]
-  zone_id              = data.alicloud_mongodb_zones.default.zones.0.id
-  account_password     = var.account_password
-  backup_period        = var.backup_period
-  backup_time          = var.backup_time
-  tags                 = var.tags
-
-  # cms_alarm
-  enable_alarm_rule             = var.enable_alarm_rule
-  alarm_rule_name               = var.alarm_rule_name
-  alarm_rule_statistics         = var.alarm_rule_statistics
-  alarm_rule_operator           = var.alarm_rule_operator
-  alarm_rule_threshold          = var.alarm_rule_threshold
-  alarm_rule_triggered_count    = var.alarm_rule_triggered_count
-  alarm_rule_period             = var.alarm_rule_period
-  alarm_rule_contact_groups     = data.alicloud_cms_alarm_contact_groups.default.names
-  alarm_rule_silence_time       = var.alarm_rule_silence_time
-  alarm_rule_effective_interval = var.alarm_rule_effective_interval
-
-}
-
-module "mongodb_4_2_wiredtiger" {
-  source = "../../modules/mongodb-4.2-wiredtiger"
-
-  # Mongodb Instance
-  name                 = var.name
-  instance_charge_type = var.instance_charge_type
-  db_instance_class    = var.db_instance_class
-  db_instance_storage  = var.db_instance_storage
-  period               = var.period
-  security_ip_list     = var.security_ip_list
-  replication_factor   = var.replication_factor
-  vswitch_id           = module.vpc.this_vswitch_ids[0]
-  zone_id              = data.alicloud_mongodb_zones.default.zones.0.id
-  account_password     = var.account_password
-  backup_period        = var.backup_period
-  backup_time          = var.backup_time
-  tags                 = var.tags
-
-  # cms_alarm
-  enable_alarm_rule             = var.enable_alarm_rule
-  alarm_rule_name               = var.alarm_rule_name
-  alarm_rule_statistics         = var.alarm_rule_statistics
-  alarm_rule_operator           = var.alarm_rule_operator
-  alarm_rule_threshold          = var.alarm_rule_threshold
-  alarm_rule_triggered_count    = var.alarm_rule_triggered_count
-  alarm_rule_period             = var.alarm_rule_period
-  alarm_rule_contact_groups     = data.alicloud_cms_alarm_contact_groups.default.names
-  alarm_rule_silence_time       = var.alarm_rule_silence_time
-  alarm_rule_effective_interval = var.alarm_rule_effective_interval
-
-}

examples/complete/variables.tf

@@ -16,7 +16,7 @@ variable "instance_charge_type" {
 variable "db_instance_class" {
   description = "The specification of the instance. For more information about the value, see https://www.alibabacloud.com/help/doc-detail/57141.htm"
   type        = string
-  default     = "dds.mongo.mid"
+  default     = "mdb.shard.2x.xlarge.d"
 }
 
 variable "db_instance_storage" {

examples/using-submodule-complete/main.tf

@@ -12,10 +12,10 @@ data "alicloud_zones" "default" {
   multi                       = true
 }
 resource "alicloud_vswitch" "this" {
-  name              = "mongodb_vpc"
-  availability_zone = data.alicloud_zones.default.zones.0.multi_zone_ids.0
-  vpc_id            = data.alicloud_vpcs.default.vpcs.0.id
-  cidr_block        = cidrsubnet(data.alicloud_vpcs.default.vpcs.0.cidr_block, 4, 4)
+  vswitch_name = "mongodb_vpc"
+  zone_id      = data.alicloud_zones.default.zones.0.multi_zone_ids.0
+  vpc_id       = data.alicloud_vpcs.default.vpcs.0.id
+  cidr_block   = cidrsubnet(data.alicloud_vpcs.default.vpcs.0.cidr_block, 4, 4)
 }
 module "mongodb_example" {
   source = "../../modules/mongodb-3.4-rocksdb"
@@ -51,4 +51,4 @@ module "mongodb_example" {
   alarm_rule_threshold       = 35
   alarm_rule_triggered_count = 2
   alarm_rule_contact_groups  = ["Mongodb", "AccCms"]
-}
+}

modules/mongodb-3.4-rocksdb/README.md

@@ -1,3 +1,7 @@
+# Deprecated
+
+This submodule is deprecated because of the [End of sale for MongoDB 3.4 instances](https://www.alibabacloud.com/help/en/mongodb/product-overview/notice-end-of-sale-for-mongodb-3-4-instances-20230101)
+
 # Alibaba Cloud MongoDB-3.4-RocksDB Terraform Module
 
 Configuration in this directory creates set of MongoDB resources instance

modules/mongodb-3.4-wiredtiger/README.md

@@ -1,3 +1,7 @@
+# Deprecated
+
+This submodule is deprecated because of the [End of sale for MongoDB 3.4 instances](https://www.alibabacloud.com/help/en/mongodb/product-overview/notice-end-of-sale-for-mongodb-3-4-instances-20230101)
+
 # Alibaba Cloud MongoDB-3.4-WiredTiger Terraform Module
 
 Configuration in this directory creates set of MongoDB resources instance