Skip to content

Commit 029236b

Browse files
lexwongxiaozhu36
authored andcommitted
imporve(mongodb): update the module to the format of the new version.
1 parent 1c85540 commit 029236b

File tree

7 files changed

+50
-26
lines changed

7 files changed

+50
-26
lines changed

examples/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module "mongodb_instance" {
55
db_instance_storage = 10
66
security_ip_list = ["10.168.1.12", "100.69.7.112"]
77
name = "my-mongodb"
8-
vswitch_id = "${module.module_vpc.vswitch_ids}"
8+
vswitch_id = module.module_vpc.vswitch_ids
99
}
1010

1111
module "module_vpc" {
@@ -19,3 +19,4 @@ module "module_vpc" {
1919
data "alicloud_zones" "default" {
2020
available_resource_creation = "MongoDB"
2121
}
22+

examples/output.tf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
output "this_mongodb_instance_id" {
2-
value = "${module.mongodb_instance.this_db_instance_id}"
2+
value = module.mongodb_instance.this_db_instance_id
33
}
44

55
output "this_mongodb_instance_name" {
6-
value = "${module.mongodb_instance.this_db_instance_name}"
6+
value = module.mongodb_instance.this_db_instance_name
77
}
88

99
output "this_mongodb_instance_zone_id" {
10-
value = "${module.mongodb_instance.this_db_instance_zone_id}"
10+
value = module.mongodb_instance.this_db_instance_zone_id
1111
}
1212

1313
output "this_mongodb_instance_vswitch_id" {
14-
value = "${module.mongodb_instance.this_db_instance_vswitch_id}"
14+
value = module.mongodb_instance.this_db_instance_vswitch_id
1515
}
1616

1717
output "this_mongodb_instance_security_ip_list" {
18-
value = "${module.mongodb_instance.this_db_instance_security_ip_list}"
18+
value = module.mongodb_instance.this_db_instance_security_ip_list
1919
}
20+

examples/versions.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
terraform {
3+
required_version = ">= 0.12"
4+
}

main.tf

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1+
provider "alicloud" {
2+
version = ">=1.56.0"
3+
region = var.region != "" ? var.region : null
4+
configuration_source = "terraform-alicloud-modules/mongodb"
5+
}
6+
17
resource "alicloud_mongodb_instance" "this_instance" {
2-
engine_version = "${var.engine_version}"
3-
name = "${var.name}"
4-
instance_charge_type = "${var.instance_charge_type}"
5-
db_instance_class = "${var.db_instance_class}"
6-
db_instance_storage = "${var.db_instance_storage}"
7-
period = "${var.period}"
8-
security_ip_list = "${var.security_ip_list}"
9-
replication_factor = "${var.replication_factor}"
10-
storage_engine = "${var.storage_engine}"
11-
vswitch_id = "${var.vswitch_id}"
12-
zone_id = "${var.zone_id}"
13-
account_password = "${var.account_password}"
8+
engine_version = var.engine_version
9+
name = var.name
10+
instance_charge_type = var.instance_charge_type
11+
db_instance_class = var.db_instance_class
12+
db_instance_storage = var.db_instance_storage
13+
period = var.period
14+
security_ip_list = var.security_ip_list
15+
replication_factor = var.replication_factor
16+
storage_engine = var.storage_engine
17+
vswitch_id = var.vswitch_id
18+
zone_id = var.zone_id
19+
account_password = var.account_password
1420
}
21+

outputs.tf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
output "this_db_instance_id" {
2-
value = "${alicloud_mongodb_instance.this_instance.id}"
2+
value = alicloud_mongodb_instance.this_instance.id
33
}
44

55
output "this_db_instance_name" {
6-
value = "${alicloud_mongodb_instance.this_instance.name}"
6+
value = alicloud_mongodb_instance.this_instance.name
77
}
88

99
output "this_db_instance_zone_id" {
10-
value = "${alicloud_mongodb_instance.this_instance.zone_id}"
10+
value = alicloud_mongodb_instance.this_instance.zone_id
1111
}
1212

1313
output "this_db_instance_vswitch_id" {
14-
value = "${alicloud_mongodb_instance.this_instance.vswitch_id}"
14+
value = alicloud_mongodb_instance.this_instance.vswitch_id
1515
}
1616

1717
output "this_db_instance_security_ip_list" {
18-
value = "${alicloud_mongodb_instance.this_instance.security_ip_list}"
18+
value = alicloud_mongodb_instance.this_instance.security_ip_list
1919
}
20+

variables.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
#variables for alicloud_mongodb_instance
33
##############################################################
44

5+
variable "region" {
6+
description = "The region used to launch this module resources."
7+
default = ""
8+
}
9+
510
variable "engine_version" {
611
description = "The engine version to use"
712
}
@@ -30,12 +35,12 @@ variable "instance_charge_type" {
3035

3136
variable "period" {
3237
description = "The duration that you will buy DB instance (in month). It is valid when instance_charge_type is PrePaid. Valid values: [1~9], 12, 24, 36. Default to 1"
33-
default=1
38+
default = 1
3439
}
3540

3641
variable "zone_id" {
3742
description = "The Zone to launch the DB instance. "
38-
default=""
43+
default = ""
3944
}
4045

4146
variable "vswitch_id" {
@@ -44,7 +49,7 @@ variable "vswitch_id" {
4449

4550
variable "security_ip_list" {
4651
description = " List of IP addresses allowed to access all databases of an instance. The list contains up to 1,000 IP addresses, separated by commas. Supported formats include 0.0.0.0/0, 10.23.12.24 (IP), and 10.23.12.24/24 (Classless Inter-Domain Routing (CIDR) mode. /24 represents the length of the prefix in an IP address. The range of the prefix length is [1,32])."
47-
type = "list"
52+
type = list(string)
4853
default = []
4954
}
5055

@@ -57,3 +62,4 @@ variable "replication_factor" {
5762
description = "Number of replica set nodes. Valid values: [3,5,7]"
5863
default = 3
5964
}
65+

versions.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
terraform {
3+
required_version = ">= 0.12"
4+
}

0 commit comments

Comments
 (0)