Skip to content

Commit 1226fd0

Browse files
shanye997shanye997
committed
quickstarts: sync from Provider
1 parent e1d920e commit 1226fd0

File tree

9 files changed

+126
-71
lines changed

9 files changed

+126
-71
lines changed

‎quickstarts/Cloud_Monitor_Service/101-cms-alarm-docs-Example/main.tf

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
variable "name" {
22
default = "tf-example"
33
}
4-
data "alicloud_images" "default" {
5-
name_regex = "^ubuntu_18.*64"
6-
owners = "system"
7-
}
4+
85
data "alicloud_zones" "default" {
9-
available_resource_creation = "Instance"
6+
available_disk_category = "cloud_efficiency"
7+
available_resource_creation = "VSwitch"
8+
}
9+
10+
data "alicloud_images" "default" {
11+
most_recent = true
12+
owners = "system"
1013
}
14+
1115
data "alicloud_instance_types" "default" {
1216
availability_zone = data.alicloud_zones.default.zones.0.id
13-
cpu_core_count = 1
14-
memory_size = 2
17+
image_id = data.alicloud_images.default.images.0.id
1518
}
1619

1720
resource "alicloud_vpc" "default" {
@@ -26,7 +29,6 @@ resource "alicloud_vswitch" "default" {
2629
zone_id = data.alicloud_zones.default.zones.0.id
2730
}
2831

29-
3032
resource "alicloud_security_group" "default" {
3133
name = var.name
3234
vpc_id = alicloud_vpc.default.id
@@ -46,18 +48,24 @@ resource "alicloud_cms_alarm_contact_group" "default" {
4648
}
4749

4850
resource "alicloud_cms_alarm" "default" {
49-
name = var.name
50-
project = "acs_ecs_dashboard"
51-
metric = "disk_writebytes"
52-
metric_dimensions = "[{\"instanceId\":\"${alicloud_instance.default.id}\",\"device\":\"/dev/vda1\"}]"
51+
name = var.name
52+
project = "acs_ecs_dashboard"
53+
metric = "disk_writebytes"
54+
period = 900
55+
contact_groups = [alicloud_cms_alarm_contact_group.default.alarm_contact_group_name]
56+
effective_interval = "06:00-20:00"
57+
metric_dimensions = <<EOF
58+
[
59+
{
60+
"instanceId": "${alicloud_instance.default.id}",
61+
"device": "/dev/vda1"
62+
}
63+
]
64+
EOF
5365
escalations_critical {
5466
statistics = "Average"
5567
comparison_operator = "<="
5668
threshold = 35
5769
times = 2
5870
}
59-
period = 900
60-
contact_groups = [
61-
alicloud_cms_alarm_contact_group.default.alarm_contact_group_name]
62-
effective_interval = "06:00-20:00"
6371
}

‎quickstarts/Message_Service/101-message-service-queue-docs-Example/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ This example is used to create a `alicloud_message_service_queue` resource.
88
| Name | Version |
99
|------|---------|
1010
| <a name="provider_alicloud"></a> [alicloud](#provider\_alicloud) | n/a |
11-
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
1211

1312
## Modules
1413

@@ -18,12 +17,11 @@ No modules.
1817

1918
| Name | Type |
2019
|------|------|
21-
| [alicloud_message_service_queue.queue](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/message_service_queue) | resource |
22-
| [random_integer.default](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource |
20+
| [alicloud_message_service_queue.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/message_service_queue) | resource |
2321

2422
## Inputs
2523

2624
| Name | Description | Type | Default | Required |
2725
|------|-------------|------|---------|:--------:|
28-
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"tf-example"` | no |
26+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
2927
<!-- END_TF_DOCS -->

‎quickstarts/Message_Service/101-message-service-queue-docs-Example/main.tf

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
variable "name" {
2-
default = "tf-example"
2+
default = "terraform-example"
33
}
4-
resource "random_integer" "default" {
5-
min = 10000
6-
max = 99999
4+
5+
provider "alicloud" {
6+
region = "cn-hangzhou"
77
}
8-
resource "alicloud_message_service_queue" "queue" {
9-
queue_name = "${var.name}-${random_integer.default.result}"
10-
delay_seconds = 60478
11-
maximum_message_size = 12357
12-
message_retention_period = 256000
13-
visibility_timeout = 30
14-
polling_wait_seconds = 3
15-
logging_enabled = true
8+
9+
10+
resource "alicloud_message_service_queue" "default" {
11+
delay_seconds = "2"
12+
polling_wait_seconds = "2"
13+
message_retention_period = "566"
14+
maximum_message_size = "1123"
15+
visibility_timeout = "30"
16+
queue_name = var.name
1617
}

‎quickstarts/Network_Attached_Storage(NAS)/101-nas-access-rule-docs-Example/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ This example is used to create a `alicloud_nas_access_rule` resource.
88
| Name | Version |
99
|------|---------|
1010
| <a name="provider_alicloud"></a> [alicloud](#provider\_alicloud) | n/a |
11+
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
1112

1213
## Modules
1314

@@ -17,10 +18,13 @@ No modules.
1718

1819
| Name | Type |
1920
|------|------|
20-
| [alicloud_nas_access_group.foo](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/nas_access_group) | resource |
21-
| [alicloud_nas_access_rule.foo](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/nas_access_rule) | resource |
21+
| [alicloud_nas_access_group.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/nas_access_group) | resource |
22+
| [alicloud_nas_access_rule.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/nas_access_rule) | resource |
23+
| [random_integer.default](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource |
2224

2325
## Inputs
2426

25-
No inputs.
27+
| Name | Description | Type | Default | Required |
28+
|------|-------------|------|---------|:--------:|
29+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
2630
<!-- END_TF_DOCS -->

‎quickstarts/Network_Attached_Storage(NAS)/101-nas-access-rule-docs-Example/main.tf

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,28 @@
1-
resource "alicloud_nas_access_group" "foo" {
2-
access_group_name = "tf-NasConfigName"
1+
variable "name" {
2+
default = "terraform-example"
3+
}
4+
5+
provider "alicloud" {
6+
region = "cn-hangzhou"
7+
}
8+
9+
resource "random_integer" "default" {
10+
min = 10000
11+
max = 99999
12+
}
13+
14+
resource "alicloud_nas_access_group" "default" {
315
access_group_type = "Vpc"
4-
description = "tf-testAccNasConfig"
16+
description = "ExtremeAccessGroup"
17+
access_group_name = "terraform-example-${random_integer.default.result}"
18+
file_system_type = "extreme"
519
}
620

7-
resource "alicloud_nas_access_rule" "foo" {
8-
access_group_name = alicloud_nas_access_group.foo.access_group_name
9-
source_cidr_ip = "168.1.1.0/16"
10-
rw_access_type = "RDWR"
11-
user_access_type = "no_squash"
12-
priority = 2
21+
resource "alicloud_nas_access_rule" "default" {
22+
access_group_name = alicloud_nas_access_group.default.access_group_name
23+
rw_access_type = "RDONLY"
24+
ipv6_source_cidr_ip = "::1"
25+
user_access_type = "no_squash"
26+
priority = "1"
27+
file_system_type = "extreme"
1328
}

‎quickstarts/Network_Attached_Storage(NAS)/101-nas-auto-snapshot-policy-docs-Example/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ No modules.
1717

1818
| Name | Type |
1919
|------|------|
20-
| [alicloud_nas_auto_snapshot_policy.example](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/nas_auto_snapshot_policy) | resource |
20+
| [alicloud_nas_auto_snapshot_policy.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/nas_auto_snapshot_policy) | resource |
2121

2222
## Inputs
2323

24-
No inputs.
24+
| Name | Description | Type | Default | Required |
25+
|------|-------------|------|---------|:--------:|
26+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
2527
<!-- END_TF_DOCS -->

‎quickstarts/Network_Attached_Storage(NAS)/101-nas-auto-snapshot-policy-docs-Example/main.tf

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
resource "alicloud_nas_auto_snapshot_policy" "example" {
2-
auto_snapshot_policy_name = "example_value"
3-
repeat_weekdays = ["3", "4", "5"]
4-
retention_days = 30
5-
time_points = ["3", "4", "5"]
1+
variable "name" {
2+
default = "terraform-example"
3+
}
4+
5+
provider "alicloud" {
6+
region = "cn-hangzhou"
7+
}
8+
9+
10+
resource "alicloud_nas_auto_snapshot_policy" "default" {
11+
time_points = ["0", "1", "2"]
12+
retention_days = "1"
13+
repeat_weekdays = ["2", "3", "4"]
14+
auto_snapshot_policy_name = var.name
15+
file_system_type = "extreme"
616
}

‎quickstarts/Private_Link/101-privatelink-vpc-endpoint-docs-Example/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ No modules.
1717

1818
| Name | Type |
1919
|------|------|
20-
| [alicloud_privatelink_vpc_endpoint.example](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/privatelink_vpc_endpoint) | resource |
21-
| [alicloud_privatelink_vpc_endpoint_service.example](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/privatelink_vpc_endpoint_service) | resource |
22-
| [alicloud_security_group.example](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/security_group) | resource |
23-
| [alicloud_vpc.example](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc) | resource |
20+
| [alicloud_privatelink_vpc_endpoint.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/privatelink_vpc_endpoint) | resource |
21+
| [alicloud_security_group.default1FTFrP](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/security_group) | resource |
22+
| [alicloud_security_group.defaultjljY5S](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/security_group) | resource |
23+
| [alicloud_vpc.defaultbFzA4a](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc) | resource |
24+
| [alicloud_resource_manager_resource_groups.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/resource_manager_resource_groups) | data source |
2425

2526
## Inputs
2627

2728
| Name | Description | Type | Default | Required |
2829
|------|-------------|------|---------|:--------:|
29-
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"tf-example"` | no |
30+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
3031
<!-- END_TF_DOCS -->

‎quickstarts/Private_Link/101-privatelink-vpc-endpoint-docs-Example/main.tf

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
11
variable "name" {
2-
default = "tf-example"
2+
default = "terraform-example"
33
}
44

5-
resource "alicloud_privatelink_vpc_endpoint_service" "example" {
6-
service_description = var.name
7-
connect_bandwidth = 103
8-
auto_accept_connection = false
5+
provider "alicloud" {
6+
region = "ap-southeast-5"
97
}
108

11-
resource "alicloud_vpc" "example" {
12-
vpc_name = var.name
13-
cidr_block = "10.0.0.0/8"
9+
data "alicloud_resource_manager_resource_groups" "default" {}
10+
11+
resource "alicloud_vpc" "defaultbFzA4a" {
12+
description = "example-terraform"
13+
cidr_block = "172.16.0.0/12"
14+
vpc_name = var.name
15+
}
16+
17+
resource "alicloud_security_group" "default1FTFrP" {
18+
name = var.name
19+
vpc_id = alicloud_vpc.defaultbFzA4a.id
1420
}
1521

16-
resource "alicloud_security_group" "example" {
22+
resource "alicloud_security_group" "defaultjljY5S" {
1723
name = var.name
18-
vpc_id = alicloud_vpc.example.id
24+
vpc_id = alicloud_vpc.defaultbFzA4a.id
1925
}
2026

21-
resource "alicloud_privatelink_vpc_endpoint" "example" {
22-
service_id = alicloud_privatelink_vpc_endpoint_service.example.id
23-
security_group_ids = [alicloud_security_group.example.id]
24-
vpc_id = alicloud_vpc.example.id
25-
vpc_endpoint_name = var.name
27+
resource "alicloud_privatelink_vpc_endpoint" "default" {
28+
endpoint_description = var.name
29+
vpc_endpoint_name = var.name
30+
resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
31+
endpoint_type = "Interface"
32+
vpc_id = alicloud_vpc.defaultbFzA4a.id
33+
service_name = "com.aliyuncs.privatelink.ap-southeast-5.oss"
34+
dry_run = "false"
35+
zone_private_ip_address_count = "1"
36+
policy_document = jsonencode({ "Version" : "1", "Statement" : [{ "Effect" : "Allow", "Action" : ["*"], "Resource" : ["*"], "Principal" : "*" }] })
37+
security_group_ids = [
38+
"${alicloud_security_group.default1FTFrP.id}"
39+
]
40+
service_id = "epsrv-k1apjysze8u1l9t6uyg9"
41+
protected_enabled = "false"
2642
}

0 commit comments

Comments
 (0)