Skip to content

Commit 4820614

Browse files
sync examples from Provider v1.252.0
1 parent 0106d7e commit 4820614

File tree

13 files changed

+122
-60
lines changed

13 files changed

+122
-60
lines changed

quickstarts/Container_Service_for_Kubernetes(ACK)/101-cs-kubernetes-node-pool-docs-Example/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resource "alicloud_vswitch" "default" {
3232
resource "alicloud_cs_managed_kubernetes" "default" {
3333
name_prefix = "terraform-example-${random_integer.default.result}"
3434
cluster_spec = "ack.pro.small"
35-
vswitch_ids = [alicloud_vswitch.default.id]
35+
worker_vswitch_ids = [alicloud_vswitch.default.id]
3636
new_nat_gateway = true
3737
pod_cidr = cidrsubnet("10.0.0.0/8", 8, 36)
3838
service_cidr = cidrsubnet("172.16.0.0/16", 4, 7)
@@ -140,7 +140,7 @@ resource "alicloud_cs_kubernetes_node_pool" "spot_instance" {
140140
key_name = alicloud_key_pair.default.key_pair_name
141141

142142
# you need to specify the number of nodes in the node pool, which can be 0
143-
desired_size = 0
143+
desired_size = 1
144144

145145
# spot config
146146
spot_strategy = "SpotWithPriceLimit"

quickstarts/Event_Bridge/101-event-bridge-service-linked-role-docs-Example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ No modules.
1717

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

2222
## Inputs
2323

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
resource "alicloud_event_bridge_service_linked_role" "service_linked_role" {
1+
resource "alicloud_event_bridge_service_linked_role" "default" {
22
product_name = "AliyunServiceRoleForEventBridgeSourceRocketMQ"
33
}

quickstarts/Global_Accelerator(GA)/101-ga-forwarding-rule-docs-Example/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ No modules.
3030

3131
| Name | Description | Type | Default | Required |
3232
|------|-------------|------|---------|:--------:|
33-
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"tf-example"` | no |
33+
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
3434
| <a name="input_region"></a> [region](#input\_region) | n/a | `string` | `"cn-hangzhou"` | no |
3535
<!-- END_TF_DOCS -->

quickstarts/Global_Accelerator(GA)/101-ga-forwarding-rule-docs-Example/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variable "region" {
77
}
88

99
variable "name" {
10-
default = "tf-example"
10+
default = "terraform-example"
1111
}
1212

1313
data "alicloud_regions" "default" {

quickstarts/Max_Compute/101-maxcompute-project-docs-Example/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variable "name" {
22
default = "tf_example"
33
}
44
resource "alicloud_maxcompute_project" "default" {
5-
default_quota = "默认后付费Quota"
5+
default_quota = "os_PayAsYouGoQuota"
66
project_name = var.name
77
comment = var.name
88
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
## Introduction
2+
3+
This example is used to create a `alicloud_message_service_service` resource.
4+
5+
<!-- BEGIN_TF_DOCS -->
6+
## Providers
7+
8+
| Name | Version |
9+
|------|---------|
10+
| <a name="provider_alicloud"></a> [alicloud](#provider\_alicloud) | n/a |
11+
12+
## Modules
13+
14+
No modules.
15+
16+
## Resources
17+
18+
| Name | Type |
19+
|------|------|
20+
| [alicloud_message_service_service.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/message_service_service) | resource |
21+
22+
## Inputs
23+
24+
No inputs.
25+
<!-- END_TF_DOCS -->
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
resource "alicloud_message_service_service" "default" {
2+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
terraform {
2+
required_providers {
3+
alicloud = {
4+
source = "aliyun/alicloud"
5+
}
6+
}
7+
}

quickstarts/RAM/101-ram-role-docs-Example/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ This example is used to create a `alicloud_ram_role` 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,7 +18,8 @@ No modules.
1718

1819
| Name | Type |
1920
|------|------|
20-
| [alicloud_ram_role.role](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/ram_role) | resource |
21+
| [alicloud_ram_role.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/ram_role) | resource |
22+
| [random_integer.default](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource |
2123

2224
## Inputs
2325

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
# Create a new RAM Role.
2-
resource "alicloud_ram_role" "role" {
3-
name = "terraform-example"
4-
document = <<EOF
1+
resource "random_integer" "default" {
2+
min = 10000
3+
max = 99999
4+
}
5+
6+
resource "alicloud_ram_role" "default" {
7+
role_name = "terraform-example-${random_integer.default.result}"
8+
assume_role_policy_document = <<EOF
59
{
610
"Statement": [
711
{
812
"Action": "sts:AssumeRole",
913
"Effect": "Allow",
1014
"Principal": {
1115
"Service": [
12-
"apigateway.aliyuncs.com",
16+
"apigateway.aliyuncs.com",
1317
"ecs.aliyuncs.com"
1418
]
1519
}
@@ -18,5 +22,5 @@ resource "alicloud_ram_role" "role" {
1822
"Version": "1"
1923
}
2024
EOF
21-
description = "this is a role test."
25+
description = "this is a role test."
2226
}

quickstarts/RDS/101-rds-custom-docs-Example/README.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,18 @@ No modules.
2424
| [alicloud_vpc.vpcId](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc) | resource |
2525
| [alicloud_vswitch.vSwitchId](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vswitch) | resource |
2626
| [alicloud_resource_manager_resource_groups.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/resource_manager_resource_groups) | data source |
27-
| [alicloud_vpcs.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/vpcs) | data source |
28-
| [alicloud_vswitches.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/data-sources/vswitches) | data source |
2927

3028
## Inputs
3129

3230
| Name | Description | Type | Default | Required |
3331
|------|-------------|------|---------|:--------:|
34-
| <a name="input_example_zone_id"></a> [example\_zone\_id](#input\_example\_zone\_id) | n/a | `string` | `"cn-chengdu-b"` | no |
32+
| <a name="input_cluster_id"></a> [cluster\_id](#input\_cluster\_id) | n/a | `string` | `"c18c40b2b336840e2b2bbf8ab291758e2"` | no |
33+
| <a name="input_deploymentsetid"></a> [deploymentsetid](#input\_deploymentsetid) | n/a | `string` | `"ds-2ze78ef5kyj9eveue92m"` | no |
34+
| <a name="input_description"></a> [description](#input\_description) | n/a | `string` | `"ran_1-08_rccreatenodepool_api"` | no |
35+
| <a name="input_example_region_id"></a> [example\_region\_id](#input\_example\_region\_id) | n/a | `string` | `"cn-beijing"` | no |
36+
| <a name="input_example_zone_id"></a> [example\_zone\_id](#input\_example\_zone\_id) | n/a | `string` | `"cn-beijing-h"` | no |
3537
| <a name="input_name"></a> [name](#input\_name) | n/a | `string` | `"terraform-example"` | no |
38+
| <a name="input_securitygroup_name"></a> [securitygroup\_name](#input\_securitygroup\_name) | n/a | `string` | `"rds_custom_init_sg_cn_beijing"` | no |
39+
| <a name="input_vpc_name"></a> [vpc\_name](#input\_vpc\_name) | n/a | `string` | `"beijing111"` | no |
40+
| <a name="input_vswtich-id"></a> [vswtich-id](#input\_vswtich-id) | n/a | `string` | `"example_vswitch"` | no |
3641
<!-- END_TF_DOCS -->

quickstarts/RDS/101-rds-custom-docs-Example/main.tf

Lines changed: 60 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,82 +3,99 @@ variable "name" {
33
}
44

55
provider "alicloud" {
6-
region = "cn-chengdu"
6+
region = "cn-beijing"
77
}
88

9-
variable "example_zone_id" {
10-
default = "cn-chengdu-b"
9+
variable "cluster_id" {
10+
default = "c18c40b2b336840e2b2bbf8ab291758e2"
1111
}
1212

13-
data "alicloud_resource_manager_resource_groups" "default" {}
13+
variable "deploymentsetid" {
14+
default = "ds-2ze78ef5kyj9eveue92m"
15+
}
16+
17+
variable "vswtich-id" {
18+
default = "example_vswitch"
19+
}
20+
21+
variable "vpc_name" {
22+
default = "beijing111"
23+
}
24+
25+
variable "example_region_id" {
26+
default = "cn-beijing"
27+
}
28+
29+
variable "description" {
30+
default = "ran_1-08_rccreatenodepool_api"
31+
}
1432

15-
data "alicloud_vpcs" "default" {
33+
variable "example_zone_id" {
34+
default = "cn-beijing-h"
1635
}
17-
data "alicloud_vswitches" "default" {
18-
vpc_id = data.alicloud_vpcs.default.ids.0
19-
zone_id = var.example_zone_id
36+
37+
variable "securitygroup_name" {
38+
default = "rds_custom_init_sg_cn_beijing"
2039
}
2140

41+
data "alicloud_resource_manager_resource_groups" "default" {}
42+
2243
resource "alicloud_vpc" "vpcId" {
23-
cidr_block = "172.16.0.0/12"
44+
vpc_name = var.vpc_name
2445
}
2546

2647
resource "alicloud_vswitch" "vSwitchId" {
2748
vpc_id = alicloud_vpc.vpcId.id
28-
cidr_block = "172.16.5.0/24"
2949
zone_id = var.example_zone_id
30-
vswitch_name = format("%s1", var.name)
50+
vswitch_name = var.vswtich-id
51+
cidr_block = "172.16.5.0/24"
3152
}
3253

3354
resource "alicloud_security_group" "securityGroupId" {
34-
vpc_id = alicloud_vpc.vpcId.id
55+
vpc_id = alicloud_vpc.vpcId.id
56+
security_group_name = var.securitygroup_name
3557
}
3658

3759
resource "alicloud_ecs_deployment_set" "deploymentSet" {
38-
domain = "Default"
39-
granularity = "Host"
40-
strategy = "Availability"
4160
}
4261

4362
resource "alicloud_ecs_key_pair" "KeyPairName" {
44-
key_pair_name = format("%s4", var.name)
63+
key_pair_name = alicloud_vswitch.vSwitchId.id
4564
}
4665

66+
4767
resource "alicloud_rds_custom" "default" {
68+
amount = "1"
69+
auto_renew = false
70+
period = "1"
71+
auto_pay = true
72+
instance_type = "mysql.x2.xlarge.6cm"
4873
data_disk {
4974
category = "cloud_essd"
5075
size = "50"
5176
performance_level = "PL1"
5277
}
53-
54-
host_name = "1731641300"
55-
create_mode = "0"
56-
description = var.name
57-
instance_type = "mysql.x2.xlarge.6cm"
58-
password = "example@12356"
59-
amount = "1"
60-
io_optimized = "optimized"
61-
resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
62-
deployment_set_id = alicloud_ecs_deployment_set.deploymentSet.id
63-
status = "Running"
64-
system_disk {
65-
category = "cloud_essd"
66-
size = "40"
67-
}
68-
69-
auto_pay = "true"
70-
internet_max_bandwidth_out = "0"
71-
internet_charge_type = "PayByTraffic"
72-
security_group_ids = [
73-
alicloud_security_group.securityGroupId.id
74-
]
75-
instance_charge_type = "Prepaid"
76-
vswitch_id = alicloud_vswitch.vSwitchId.id
77-
key_pair_name = alicloud_ecs_key_pair.KeyPairName.key_pair_name
78+
status = "Running"
79+
security_group_ids = ["${alicloud_security_group.securityGroupId.id}"]
80+
io_optimized = "optimized"
81+
description = var.description
82+
key_pair_name = alicloud_ecs_key_pair.KeyPairName.id
7883
zone_id = var.example_zone_id
79-
auto_renew = "false"
80-
period = "1"
84+
instance_charge_type = "Prepaid"
85+
internet_max_bandwidth_out = "0"
8186
image_id = "aliyun_2_1903_x64_20G_alibase_20240628.vhd"
8287
security_enhancement_strategy = "Active"
8388
period_unit = "Month"
89+
password = "jingyiTEST@123"
90+
system_disk {
91+
size = "40"
92+
category = "cloud_essd"
93+
}
94+
host_name = "1743386110"
95+
create_mode = "0"
96+
spot_strategy = "NoSpot"
97+
vswitch_id = alicloud_vswitch.vSwitchId.id
98+
support_case = "eni"
99+
deployment_set_id = var.deploymentsetid
100+
dry_run = false
84101
}

0 commit comments

Comments
 (0)