Skip to content

Commit

Permalink
docs: fix examples for adb, gpdb, mse, ros, service_mesh
Browse files Browse the repository at this point in the history
  • Loading branch information
@shanye997 @ChenHanZhang
shanye997 authored and ChenHanZhang committed Mar 6, 2024
1 parent 2713f2b commit e226224
Show file tree
Hide file tree
Showing 32 changed files with 263 additions and 218 deletions.
10 changes: 8 additions & 2 deletions website/docs/r/actiontrail_trail.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@ Provides a ActionTrail Trail resource. For information about alicloud actiontrai
variable "name" {
default = "tf-example"
}
resource "random_integer" "default" {
min = 10000
max = 99999
}
data "alicloud_regions" "example" {
current = true
}
data "alicloud_account" "example" {}
resource "alicloud_log_project" "example" {
name = var.name
description = "tf actiontrail example"
project_name = "${var.name}-${random_integer.default.result}"
description = "tf actiontrail example"
}
data "alicloud_ram_roles" "example" {
Expand Down
50 changes: 20 additions & 30 deletions website/docs/r/adb_account.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,48 +16,38 @@ Provides a [ADB](https://www.alibabacloud.com/help/en/analyticdb-for-mysql/lates
## Example Usage

```terraform
variable "creation" {
default = "ADB"
}
variable "name" {
default = "tf_example"
default = "tfexample"
}
data "alicloud_adb_zones" "default" {
data "alicloud_adb_zones" "default" {}
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
data "alicloud_resource_manager_resource_groups" "default" {
status = "OK"
data "alicloud_vswitches" "default" {
vpc_id = data.alicloud_vpcs.default.ids.0
zone_id = data.alicloud_adb_zones.default.ids.0
}
resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "10.4.0.0/16"
}
resource "alicloud_vswitch" "default" {
vpc_id = alicloud_vpc.default.id
cidr_block = "10.4.0.0/24"
zone_id = data.alicloud_adb_zones.default.zones[0].id
vswitch_name = var.name
locals {
vswitch_id = data.alicloud_vswitches.default.ids.0
}
resource "alicloud_adb_db_cluster" "default" {
db_cluster_category = "Cluster"
db_node_class = "C8"
db_node_count = "4"
db_node_storage = "400"
mode = "reserver"
db_cluster_version = "3.0"
payment_type = "PayAsYouGo"
vswitch_id = alicloud_vswitch.default.id
resource "alicloud_adb_db_cluster" "cluster" {
db_cluster_category = "MixedStorage"
mode = "flexible"
compute_resource = "8Core32GB"
vswitch_id = local.vswitch_id
description = var.name
maintain_time = "23:00Z-00:00Z"
resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
security_ips = ["10.168.1.12", "10.168.1.11"]
tags = {
Created = "TF",
For = "example",
}
}
resource "alicloud_adb_account" "default" {
db_cluster_id = alicloud_adb_db_cluster.default.id
db_cluster_id = alicloud_adb_db_cluster.cluster.id
account_name = var.name
account_password = "tf_example123"
account_description = var.name
Expand Down
45 changes: 17 additions & 28 deletions website/docs/r/adb_backup_policy.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,32 @@ variable "name" {
data "alicloud_adb_zones" "default" {
}
data "alicloud_resource_manager_resource_groups" "default" {
status = "OK"
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "10.4.0.0/16"
data "alicloud_vswitches" "default" {
vpc_id = data.alicloud_vpcs.default.ids.0
zone_id = data.alicloud_adb_zones.default.ids.0
}
resource "alicloud_vswitch" "default" {
vpc_id = alicloud_vpc.default.id
cidr_block = "10.4.0.0/24"
zone_id = data.alicloud_adb_zones.default.zones[0].id
vswitch_name = var.name
locals {
vswitch_id = data.alicloud_vswitches.default.ids.0
}
resource "alicloud_adb_db_cluster" "default" {
db_cluster_category = "Cluster"
db_node_class = "C8"
db_node_count = "4"
db_node_storage = "400"
mode = "reserver"
db_cluster_version = "3.0"
payment_type = "PayAsYouGo"
vswitch_id = alicloud_vswitch.default.id
resource "alicloud_adb_db_cluster" "cluster" {
db_cluster_category = "MixedStorage"
mode = "flexible"
compute_resource = "8Core32GB"
vswitch_id = local.vswitch_id
description = var.name
maintain_time = "23:00Z-00:00Z"
resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
security_ips = ["10.168.1.12", "10.168.1.11"]
tags = {
Created = "TF",
For = "example",
}
}
resource "alicloud_adb_backup_policy" "default" {
db_cluster_id = alicloud_adb_db_cluster.default.id
preferred_backup_period = ["Tuesday", "Thursday", "Saturday"]
db_cluster_id = alicloud_adb_db_cluster.cluster.id
preferred_backup_period = ["Tuesday", "Wednesday"]
preferred_backup_time = "10:00Z-11:00Z"
}
```
Expand Down
44 changes: 15 additions & 29 deletions website/docs/r/adb_connection.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,30 @@ variable "name" {
default = "terraform-example"
}
data "alicloud_adb_zones" "default" {
data "alicloud_adb_zones" "default" {}
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
data "alicloud_resource_manager_resource_groups" "default" {
status = "OK"
data "alicloud_vswitches" "default" {
vpc_id = data.alicloud_vpcs.default.ids.0
zone_id = data.alicloud_adb_zones.default.ids.0
}
resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "10.4.0.0/16"
}
resource "alicloud_vswitch" "default" {
vpc_id = alicloud_vpc.default.id
cidr_block = "10.4.0.0/24"
zone_id = data.alicloud_adb_zones.default.zones[0].id
vswitch_name = var.name
locals {
vswitch_id = data.alicloud_vswitches.default.ids.0
}
resource "alicloud_adb_db_cluster" "default" {
db_cluster_category = "Cluster"
db_node_class = "C8"
db_node_count = "4"
db_node_storage = "400"
mode = "reserver"
db_cluster_version = "3.0"
payment_type = "PayAsYouGo"
vswitch_id = alicloud_vswitch.default.id
resource "alicloud_adb_db_cluster" "cluster" {
db_cluster_category = "MixedStorage"
mode = "flexible"
compute_resource = "8Core32GB"
vswitch_id = local.vswitch_id
description = var.name
maintain_time = "23:00Z-00:00Z"
resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
security_ips = ["10.168.1.12", "10.168.1.11"]
tags = {
Created = "TF",
For = "example",
}
}
resource "alicloud_adb_connection" "default" {
db_cluster_id = alicloud_adb_db_cluster.default.id
db_cluster_id = alicloud_adb_db_cluster.cluster.id
connection_prefix = "example"
}
```
Expand Down
42 changes: 14 additions & 28 deletions website/docs/r/adb_db_cluster.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,40 +24,26 @@ variable "name" {
default = "terraform-example"
}
data "alicloud_adb_zones" "default" {
data "alicloud_adb_zones" "default" {}
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
data "alicloud_resource_manager_resource_groups" "default" {
status = "OK"
data "alicloud_vswitches" "default" {
vpc_id = data.alicloud_vpcs.default.ids.0
zone_id = data.alicloud_adb_zones.default.ids.0
}
resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "10.4.0.0/16"
}
resource "alicloud_vswitch" "default" {
vpc_id = alicloud_vpc.default.id
cidr_block = "10.4.0.0/24"
zone_id = data.alicloud_adb_zones.default.zones[0].id
vswitch_name = var.name
locals {
vswitch_id = data.alicloud_vswitches.default.ids.0
}
resource "alicloud_adb_db_cluster" "default" {
db_cluster_category = "Cluster"
db_node_class = "C8"
db_node_count = "4"
db_node_storage = "400"
mode = "reserver"
db_cluster_version = "3.0"
payment_type = "PayAsYouGo"
vswitch_id = alicloud_vswitch.default.id
resource "alicloud_adb_db_cluster" "cluster" {
db_cluster_category = "MixedStorage"
mode = "flexible"
compute_resource = "8Core32GB"
vswitch_id = local.vswitch_id
description = var.name
maintain_time = "23:00Z-00:00Z"
resource_group_id = data.alicloud_resource_manager_resource_groups.default.ids.0
security_ips = ["10.168.1.12", "10.168.1.11"]
tags = {
Created = "TF",
For = "example",
}
}
```

Expand Down
10 changes: 9 additions & 1 deletion website/docs/r/alb_listener_additional_certificate_attachment.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ For information about Application Load Balancer (ALB) Listener Additional Certif
Basic Usage

```terraform
provider "alicloud" {
region = "cn-hangzhou"
}
variable "name" {
default = "tf_example"
}
Expand Down Expand Up @@ -96,9 +99,14 @@ resource "alicloud_alb_listener" "default" {
}
}
resource "random_integer" "default" {
min = 10000
max = 99999
}
resource "alicloud_ssl_certificates_service_certificate" "default" {
count = 2
certificate_name = join("", [var.name, count.index])
certificate_name = join("-", [var.name, random_integer.default.result, count.index])
cert = <<EOF
-----BEGIN CERTIFICATE-----
MIIDRjCCAq+gAwIBAgIJAJn3ox4K13PoMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/drds_polardbx_instance.html.markdown
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "DRDS"
subcategory: "Distributed Relational Database Service (DRDS)"
layout: "alicloud"
page_title: "Alicloud: alicloud_drds_polardbx_instance"
description: |-
Expand Down
25 changes: 13 additions & 12 deletions website/docs/r/gpdb_account.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,22 @@ For information about GPDB Account and how to use it, see [What is Account](http
Basic Usage

```terraform
provider "alicloud" {
region = "cn-hangzhou"
}
variable "name" {
default = "tf-example"
default = "terraform-example"
}
data "alicloud_resource_manager_resource_groups" "default" {}
data "alicloud_gpdb_zones" "default" {}
resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "10.4.0.0/16"
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
resource "alicloud_vswitch" "default" {
vswitch_name = var.name
cidr_block = "10.4.0.0/24"
vpc_id = alicloud_vpc.default.id
zone_id = data.alicloud_gpdb_zones.default.ids.0
data "alicloud_vswitches" "default" {
vpc_id = data.alicloud_vpcs.default.ids.0
zone_id = data.alicloud_gpdb_zones.default.ids.0
}
resource "alicloud_gpdb_instance" "default" {
Expand All @@ -53,8 +54,8 @@ resource "alicloud_gpdb_instance" "default" {
seg_storage_type = "cloud_essd"
seg_node_num = 4
storage_size = 50
vpc_id = alicloud_vpc.default.id
vswitch_id = alicloud_vswitch.default.id
vpc_id = data.alicloud_vpcs.default.ids.0
vswitch_id = data.alicloud_vswitches.default.ids[0]
ip_whitelist {
security_ip_list = "127.0.0.1"
}
Expand Down
1 change: 0 additions & 1 deletion website/docs/r/gpdb_backup_policy.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ provider "alicloud" {
region = "cn-hangzhou"
}
data "alicloud_resource_manager_resource_groups" "default" {}
data "alicloud_gpdb_zones" "default" {}
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
Expand Down
17 changes: 7 additions & 10 deletions website/docs/r/gpdb_connection.html.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,12 @@ variable "name" {
data "alicloud_resource_manager_resource_groups" "default" {}
data "alicloud_gpdb_zones" "default" {}
resource "alicloud_vpc" "default" {
vpc_name = var.name
cidr_block = "10.4.0.0/16"
data "alicloud_vpcs" "default" {
name_regex = "^default-NODELETING$"
}
resource "alicloud_vswitch" "default" {
vswitch_name = var.name
cidr_block = "10.4.0.0/24"
vpc_id = alicloud_vpc.default.id
zone_id = data.alicloud_gpdb_zones.default.ids.0
data "alicloud_vswitches" "default" {
vpc_id = data.alicloud_vpcs.default.ids.0
zone_id = data.alicloud_gpdb_zones.default.ids.0
}
resource "alicloud_gpdb_instance" "default" {
Expand All @@ -52,8 +49,8 @@ resource "alicloud_gpdb_instance" "default" {
seg_storage_type = "cloud_essd"
seg_node_num = 4
storage_size = 50
vpc_id = alicloud_vpc.default.id
vswitch_id = alicloud_vswitch.default.id
vpc_id = data.alicloud_vpcs.default.ids.0
vswitch_id = data.alicloud_vswitches.default.ids[0]
ip_whitelist {
security_ip_list = "127.0.0.1"
}
Expand Down
Loading

0 comments on commit e226224

Please sign in to comment.