Skip to content

Commit 12133c5

Browse files
shanye997shanye997
committed
quickstarts: improve the examples; remove the deprecated attributes
1 parent 68d7373 commit 12133c5

File tree

79 files changed

+359
-261
lines changed
  • quickstarts
    • AnalyticDB_for_PostgreSQL(GPDB)
      • 101-gpdb-account-docs-Example
      • 101-gpdb-backup-policy-docs-Example
      • 101-gpdb-connection-docs-Example
      • 101-gpdb-db-instance-plan-docs-Example
    • Anycast_Elastic_IP_Address(Eipanycast)/101-eipanycast-anycast-eip-address-attachment-docs-Example-02
    • Api_Gateway
    • CDN/101-cdn-real-time-log-delivery-docs-Example
    • Classic_Load_Balancer(SLB)/101-slb-attachment-docs-Example
    • Click_House
      • 101-click-house-account-docs-Example
      • 101-click-house-backup-policy-docs-Example
      • 101-click-house-db-cluster-docs-Example
    • Cloud_Config(Config)
      • 101-config-aggregate-delivery-docs-Example
      • 101-config-delivery-docs-Example
      • 101-config-remediation-docs-Example
    • Cloud_Monitor_Service
      • 101-cms-hybrid-monitor-sls-task-docs-Example
      • 101-cms-sls-group-docs-Example
    • Cloud_Storage_Gateway
      • 101-cloud-storage-gateway-express-sync-docs-Example
      • 101-cloud-storage-gateway-express-sync-share-attachment-docs-Example
      • 101-cloud-storage-gateway-gateway-block-volume-docs-Example
      • 101-cloud-storage-gateway-gateway-logging-docs-Example
    • Container_Service_for_Kubernetes(ACK)
      • 101-cs-kubernetes-node-pool-docs-Example
      • 101-use-case-create-a-managed-Kubernetes-cluster-part1
      • 101-use-case-create-a-managed-Kubernetes-cluster-part2
    • Data_Security_Center(SDDP)/101-sddp-data-limit-docs-Example
    • Data_Transmission_Service(DTS)
      • 101-dts-consumer-channel-docs-Example
      • 101-dts-job-monitor-rule-docs-Example
      • 101-dts-subscription-job-docs-Example
    • Database_File_System(DBFS)/101-dbfs-instance-docs-Example
    • ECS
      • 101-auto-provisioning-group-docs-Example
      • 101-ecs-snapshot-docs-Example
    • Function_Compute_Service(FC)
      • 101-fc-function-async-invoke-config-docs-Example
      • 101-fc-function-docs-Example
      • 101-fc-service-docs-Example
      • 101-fc-trigger-docs-Example-03
    • Log_Service(SLS)
      • 101-log-alert-docs-Example-02
      • 101-log-alert-docs-Example-03
      • 101-log-dashboard-docs-Example
      • 101-log-etl-docs-Example
      • 101-log-ingestion-docs-Example
      • 101-log-machine-group-docs-Example
      • 101-log-oss-export-docs-Example
      • 101-log-project-docs-Example-01
      • 101-log-project-docs-Example-02
      • 101-log-store-docs-Example-01
      • 101-log-store-docs-Example-02
      • 101-log-store-index-docs-Example
      • 101-logtail-attachment-docs-Example
      • 101-logtail-config-docs-Example
      • 101-sls-alert-docs-Example
      • 101-sls-scheduled-sql-docs-Example
    • Network_Load_Balancer(NLB)
      • 101-nlb-load-balancer-complete
      • 101-nlb-server-group-docs-Example
    • OSS
      • 101-oss-bucket-docs-Example-01
      • 101-oss-bucket-docs-Example-03
      • 101-oss-bucket-docs-Example-04
      • 101-oss-bucket-docs-Example-05
      • 101-oss-bucket-docs-Example-06
      • 101-oss-bucket-docs-Example-08
      • 101-oss-bucket-docs-Example-09
      • 101-oss-bucket-docs-Example-10
      • 101-oss-bucket-object-docs-Example-01
      • 101-oss-bucket-object-docs-Example-02
      • 101-oss-bucket-replication-docs-Example
      • 101-use-case-manage-a-bucket
    • Operation_Orchestration_Service(OOS)/101-oos-service-setting-docs-Example
    • Private_Zone/101-pvtz-zone-record-docs-Example
    • RAM
      • 101-ram-group-policy-attachment-complete
      • 101-ram-role-policy-attachment-complete
    • RDS/101-db-account-privilege-docs-Example
    • RocketMQ(Ons)
    • VPC
      • 101-havip-attachment-docs-Example
      • 101-route-table-attachment-docs-Example
      • 101-use-case-create-a-vpc
      • 101-vpc-flow-log-docs-Example
      • 101-vpc-ipv6-internet-bandwidth-docs-Example
      • 101-vpc-traffic-mirror-filter-ingress-rule-docs-Example

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+359
-261
lines changed

‎quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-account-docs-Example/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ resource "alicloud_gpdb_instance" "default" {
2626
zone_id = data.alicloud_gpdb_zones.default.ids.0
2727
instance_network_type = "VPC"
2828
instance_spec = "2C16G"
29-
master_node_num = 1
3029
payment_type = "PayAsYouGo"
31-
private_ip_address = "1.1.1.1"
3230
seg_storage_type = "cloud_essd"
3331
seg_node_num = 4
3432
storage_size = 50

‎quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-backup-policy-docs-Example/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ resource "alicloud_gpdb_instance" "default" {
3535
zone_id = data.alicloud_gpdb_zones.default.ids.0
3636
instance_network_type = "VPC"
3737
instance_spec = "2C16G"
38-
master_node_num = 1
3938
payment_type = "PayAsYouGo"
40-
private_ip_address = "1.1.1.1"
4139
seg_storage_type = "cloud_essd"
4240
seg_node_num = 4
4341
storage_size = 50

‎quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-connection-docs-Example/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ resource "alicloud_gpdb_instance" "default" {
2222
zone_id = data.alicloud_gpdb_zones.default.ids.0
2323
instance_network_type = "VPC"
2424
instance_spec = "2C16G"
25-
master_node_num = 1
2625
payment_type = "PayAsYouGo"
27-
private_ip_address = "1.1.1.1"
2826
seg_storage_type = "cloud_essd"
2927
seg_node_num = 4
3028
storage_size = 50

‎quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-db-instance-plan-docs-Example/main.tf

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ resource "alicloud_gpdb_instance" "default" {
3030
zone_id = data.alicloud_gpdb_zones.default.ids.0
3131
instance_network_type = "VPC"
3232
instance_spec = "2C16G"
33-
master_node_num = 1
3433
payment_type = "PayAsYouGo"
35-
private_ip_address = "1.1.1.1"
3634
seg_storage_type = "cloud_essd"
3735
seg_node_num = 4
3836
storage_size = 50
@@ -43,13 +41,15 @@ resource "alicloud_gpdb_instance" "default" {
4341
}
4442
}
4543

44+
resource "time_static" "example" {}
45+
4646
resource "alicloud_gpdb_db_instance_plan" "default" {
4747
db_instance_plan_name = var.name
4848
plan_desc = var.name
4949
plan_type = "PauseResume"
5050
plan_schedule_type = "Regular"
51-
plan_start_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(timestamp(), "1h"))
52-
plan_end_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(timestamp(), "24h"))
51+
plan_start_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(time_static.example.rfc3339, "1h"))
52+
plan_end_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(time_static.example.rfc3339, "24h"))
5353
plan_config {
5454
resume {
5555
plan_cron_time = "0 0 0 1/1 * ? "
@@ -59,9 +59,4 @@ resource "alicloud_gpdb_db_instance_plan" "default" {
5959
}
6060
}
6161
db_instance_id = alicloud_gpdb_instance.default.id
62-
63-
# for test
64-
lifecycle {
65-
ignore_changes = [plan_start_date, plan_end_date]
66-
}
6762
}

‎quickstarts/Anycast_Elastic_IP_Address(Eipanycast)/101-eipanycast-anycast-eip-address-attachment-docs-Example-02/main.tf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,45 @@ provider "alicloud" {
1313
}
1414

1515
data "alicloud_zones" "default" {
16-
provider = "alicloud.beijing"
16+
provider = alicloud.beijing
1717
available_disk_category = "cloud_efficiency"
1818
available_resource_creation = "VSwitch"
1919
}
2020

2121
data "alicloud_images" "default" {
22-
provider = "alicloud.beijing"
22+
provider = alicloud.beijing
2323
name_regex = "^ubuntu_18.*64"
2424
most_recent = true
2525
owners = "system"
2626
}
2727

2828
data "alicloud_instance_types" "default" {
29-
provider = "alicloud.beijing"
29+
provider = alicloud.beijing
3030
availability_zone = data.alicloud_zones.default.zones[0].id
3131
cpu_core_count = 1
3232
memory_size = 2
3333
}
3434

3535
resource "alicloud_vpc" "defaultVpc" {
36-
provider = "alicloud.beijing"
36+
provider = alicloud.beijing
3737
vpc_name = var.name
3838
cidr_block = "192.168.0.0/16"
3939
}
4040

4141
resource "alicloud_vswitch" "defaultVsw" {
42-
provider = "alicloud.beijing"
42+
provider = alicloud.beijing
4343
vpc_id = alicloud_vpc.defaultVpc.id
4444
cidr_block = "192.168.0.0/24"
4545
zone_id = data.alicloud_zones.default.zones.0.id
4646
}
4747

4848
resource "alicloud_security_group" "defaultuBsECI" {
49-
provider = "alicloud.beijing"
49+
provider = alicloud.beijing
5050
vpc_id = alicloud_vpc.defaultVpc.id
5151
}
5252

5353
resource "alicloud_instance" "default9KDlN7" {
54-
provider = "alicloud.beijing"
54+
provider = alicloud.beijing
5555
image_id = data.alicloud_images.default.images[0].id
5656
instance_type = data.alicloud_instance_types.default.instance_types[0].id
5757
instance_name = var.name
@@ -63,50 +63,50 @@ resource "alicloud_instance" "default9KDlN7" {
6363
}
6464

6565
resource "alicloud_eipanycast_anycast_eip_address" "defaultXkpFRs" {
66-
provider = "alicloud.hangzhou"
66+
provider = alicloud.hangzhou
6767
service_location = "ChineseMainland"
6868
}
6969

7070
resource "alicloud_vpc" "defaultVpc2" {
71-
provider = "alicloud.hangzhou"
71+
provider = alicloud.hangzhou
7272
vpc_name = "${var.name}6"
7373
cidr_block = "192.168.0.0/16"
7474
}
7575

7676
data "alicloud_zones" "default2" {
77-
provider = "alicloud.hangzhou"
77+
provider = alicloud.hangzhou
7878
available_disk_category = "cloud_efficiency"
7979
available_resource_creation = "VSwitch"
8080
}
8181

8282
data "alicloud_images" "default2" {
83-
provider = "alicloud.hangzhou"
83+
provider = alicloud.hangzhou
8484
name_regex = "^ubuntu_18.*64"
8585
most_recent = true
8686
owners = "system"
8787
}
8888

8989
data "alicloud_instance_types" "default2" {
90-
provider = "alicloud.hangzhou"
90+
provider = alicloud.hangzhou
9191
availability_zone = data.alicloud_zones.default2.zones[0].id
9292
cpu_core_count = 1
9393
memory_size = 2
9494
}
9595

9696
resource "alicloud_vswitch" "defaultdsVsw2" {
97-
provider = "alicloud.hangzhou"
97+
provider = alicloud.hangzhou
9898
vpc_id = alicloud_vpc.defaultVpc2.id
9999
cidr_block = "192.168.0.0/24"
100100
zone_id = data.alicloud_zones.default2.zones.1.id
101101
}
102102

103103
resource "alicloud_security_group" "defaultuBsECI2" {
104-
provider = "alicloud.hangzhou"
104+
provider = alicloud.hangzhou
105105
vpc_id = alicloud_vpc.defaultVpc2.id
106106
}
107107

108108
resource "alicloud_instance" "defaultEcs2" {
109-
provider = "alicloud.hangzhou"
109+
provider = alicloud.hangzhou
110110
image_id = data.alicloud_images.default2.images[0].id
111111
instance_type = data.alicloud_instance_types.default2.instance_types[0].id
112112
instance_name = var.name
@@ -118,7 +118,7 @@ resource "alicloud_instance" "defaultEcs2" {
118118
}
119119

120120
resource "alicloud_eipanycast_anycast_eip_address_attachment" "defaultEfYBJY" {
121-
provider = "alicloud.beijing"
121+
provider = alicloud.beijing
122122
bind_instance_id = alicloud_instance.default9KDlN7.network_interface_id
123123
bind_instance_type = "NetworkInterface"
124124
bind_instance_region_id = "cn-beijing"
@@ -127,7 +127,7 @@ resource "alicloud_eipanycast_anycast_eip_address_attachment" "defaultEfYBJY" {
127127
}
128128

129129
resource "alicloud_eipanycast_anycast_eip_address_attachment" "normal" {
130-
provider = "alicloud.hangzhou"
130+
provider = alicloud.hangzhou
131131
bind_instance_id = alicloud_instance.defaultEcs2.network_interface_id
132132
bind_instance_type = "NetworkInterface"
133133
bind_instance_region_id = "cn-hangzhou"

‎quickstarts/Api_Gateway/101-api-gateway-access-control-list-docs-Example/main.tf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ resource "alicloud_api_gateway_instance" "defaultxywS8c" {
1717

1818
resource "alicloud_api_gateway_access_control_list" "default" {
1919
access_control_list_name = var.name
20-
acl_entrys {
21-
acl_entry_ip = "128.0.0.1/32"
22-
acl_entry_comment = "example comment"
23-
}
24-
address_ip_version = "ipv4"
20+
address_ip_version = "ipv4"
21+
}
22+
23+
resource "alicloud_api_gateway_acl_entry_attachment" "default" {
24+
acl_id = alicloud_api_gateway_access_control_list.default.id
25+
entry = "128.0.0.1/32"
26+
comment = "example comment"
2527
}

‎quickstarts/Api_Gateway/101-api-gateway-instance-docs-Example/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ No modules.
1818
| Name | Type |
1919
|------|------|
2020
| [alicloud_api_gateway_instance.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/api_gateway_instance) | resource |
21+
| [alicloud_vpc.vpc](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc) | resource |
2122

2223
## Inputs
2324

‎quickstarts/Api_Gateway/101-api-gateway-instance-docs-Example/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ provider "alicloud" {
77
}
88

99

10+
resource "alicloud_vpc" "vpc" {
11+
cidr_block = "172.16.0.0/12"
12+
vpc_name = var.name
13+
}
14+
15+
1016
resource "alicloud_api_gateway_instance" "default" {
1117
instance_name = var.name
1218

1319
instance_spec = "api.s1.small"
1420
https_policy = "HTTPS2_TLS1_0"
1521
zone_id = "cn-hangzhou-MAZ6"
1622
payment_type = "PayAsYouGo"
17-
user_vpc_id = "1709116870"
23+
user_vpc_id = alicloud_vpc.vpc.id
1824
instance_type = "normal"
1925
}

‎quickstarts/CDN/101-cdn-real-time-log-delivery-docs-Example/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ resource "alicloud_log_project" "default" {
2323
}
2424

2525
resource "alicloud_log_store" "default" {
26-
project_name = alicloud_log_project.default.name
26+
project_name = alicloud_log_project.default.project_name
2727
logstore_name = "example-store"
2828
shard_count = 3
2929
auto_split = true

‎quickstarts/Classic_Load_Balancer(SLB)/101-slb-attachment-docs-Example/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ data "alicloud_images" "default" {
2020
}
2121

2222
resource "alicloud_vpc" "default" {
23-
name = var.name
23+
vpc_name = var.name
2424
cidr_block = "172.16.0.0/16"
2525
}
2626

0 commit comments

Comments
 (0)