Skip to content

Commit 1d4c86e

Browse files
committed
module: remove unused variables; examples/complete: improve the examples
1 parent e6b35fc commit 1d4c86e

File tree

5 files changed

+35
-25
lines changed

5 files changed

+35
-25
lines changed

examples/complete/main.tf

+18-13
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ data "alicloud_images" "default" {
99
}
1010

1111
data "alicloud_instance_types" "default" {
12-
availability_zone = data.alicloud_polardb_zones.default.zones.0.id
12+
availability_zone = data.alicloud_polardb_zones.default.zones[0].id
13+
cpu_core_count = 2
14+
memory_size = 8
15+
instance_type_family = "ecs.g6"
1316
}
1417

1518
data "alicloud_kvstore_instance_classes" "default" {
16-
zone_id = data.alicloud_polardb_zones.default.zones.0.id
19+
zone_id = data.alicloud_polardb_zones.default.zones[0].id
1720
engine = "Redis"
1821
engine_version = var.redis_engine_version
1922
}
@@ -22,37 +25,39 @@ data "alicloud_polardb_node_classes" "default" {
2225
pay_type = var.pay_type
2326
db_type = "MySQL"
2427
db_version = "5.6"
25-
zone_id = data.alicloud_polardb_zones.default.zones.0.id
28+
zone_id = data.alicloud_polardb_zones.default.zones[0].id
2629
}
2730

2831
resource "alicloud_security_group" "default" {
29-
name = var.name
30-
vpc_id = module.vpc.this_vpc_id
32+
security_group_name = var.name
33+
vpc_id = module.vpc.this_vpc_id
3134
}
3235

3336
module "vpc" {
34-
source = "alibaba/vpc/alicloud"
37+
source = "alibaba/vpc/alicloud"
38+
version = "~>1.11"
39+
3540
create = true
3641
vpc_name = var.name
3742
vpc_cidr = "172.16.0.0/16"
3843
vswitch_name = var.name
3944
vswitch_cidrs = ["172.16.0.0/21"]
40-
availability_zones = [data.alicloud_polardb_zones.default.zones.0.id]
45+
availability_zones = [data.alicloud_polardb_zones.default.zones[0].id]
4146
}
4247

4348
module "example" {
4449
source = "../.."
4550
name = var.name
4651
vswitch_id = module.vpc.this_vswitch_ids[0]
47-
availability_zone = data.alicloud_polardb_zones.default.zones.0.id
52+
availability_zone = data.alicloud_polardb_zones.default.zones[0].id
4853
security_group_ids = [alicloud_security_group.default.id]
4954

5055
#alicloud_instance
51-
instance_type = data.alicloud_instance_types.default.instance_types.0.id
56+
instance_type = data.alicloud_instance_types.default.instance_types[0].id
5257
system_disk_category = "cloud_efficiency"
5358
system_disk_name = var.system_disk_name
5459
system_disk_description = var.system_disk_description
55-
image_id = data.alicloud_images.default.images.0.id
60+
image_id = data.alicloud_images.default.images[0].id
5661
internet_max_bandwidth_out = var.internet_max_bandwidth_out
5762
data_disks_name = "data_disks_name"
5863
ecs_size = 1200
@@ -66,8 +71,8 @@ module "example" {
6671
redis_engine_version = var.redis_engine_version
6772
redis_appendonly = var.redis_appendonly
6873
redis_lazyfree_lazy_eviction = var.redis_lazyfree_lazy_eviction
69-
redis_resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
70-
redis_instance_class = data.alicloud_kvstore_instance_classes.default.instance_classes.0
74+
redis_resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids[0]
75+
redis_instance_class = data.alicloud_kvstore_instance_classes.default.instance_classes[0]
7176

7277
#alicloud_mongodb_instance
7378
mongodb_engine_version = "4.2"
@@ -78,7 +83,7 @@ module "example" {
7883
db_type = "MySQL"
7984
db_version = "5.6"
8085
pay_type = var.pay_type
81-
db_node_class = data.alicloud_polardb_node_classes.default.classes.0.supported_engines.0.available_resources.0.db_node_class
86+
db_node_class = data.alicloud_polardb_node_classes.default.classes[0].supported_engines[0].available_resources[0].db_node_class
8287
polardb_cluster_description = var.polardb_cluster_description
8388

8489
#alicloud_polardb_database

examples/complete/outputs.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
output "this_ecs_name" {
2-
value = module.example.this_ecs_name
2+
description = "The name of the ECS instance."
3+
value = module.example.this_ecs_name
34
}

examples/complete/versions.tf

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
terraform {
2+
required_version = ">= 0.13"
3+
}

outputs.tf

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
11
output "this_ecs_id" {
2-
value = alicloud_instance.default.id
2+
description = "The ID of the ECS instance."
3+
value = alicloud_instance.default.id
34
}
45

56
output "this_redis_id" {
6-
value = alicloud_kvstore_instance.default.id
7+
description = "The ID of the Redis instance."
8+
value = alicloud_kvstore_instance.default.id
79
}
810

911
output "this_mongodb_id" {
10-
value = alicloud_mongodb_instance.default.id
12+
description = "The ID of the MongoDB instance."
13+
value = alicloud_mongodb_instance.default.id
1114
}
1215

1316
output "this_polardb_cluster_id" {
14-
value = alicloud_polardb_cluster.default.id
17+
description = "The ID of the PolarDB cluster."
18+
value = alicloud_polardb_cluster.default.id
1519
}
1620

1721
output "this_polardb_database_id" {
18-
value = alicloud_polardb_database.default.id
22+
description = "The ID of the PolarDB database."
23+
value = alicloud_polardb_database.default.id
1924
}
2025

2126
output "this_ecs_name" {
22-
value = alicloud_instance.default.instance_name
27+
description = "The name of the ECS instance."
28+
value = alicloud_instance.default.instance_name
2329
}

variables.tf

-5
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,3 @@ variable "db_name" {
189189
default = ""
190190
}
191191

192-
variable "available_resource_creation" {
193-
description = "The specification of available resource creation."
194-
type = string
195-
default = "PolarDB"
196-
}

0 commit comments

Comments
 (0)