Skip to content

quickstarts: improve the examples; remove the deprecated attributes #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2024
Merged

quickstarts: improve the examples; remove the deprecated attributes #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-account-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ resource "alicloud_gpdb_instance" "default" {
zone_id = data.alicloud_gpdb_zones.default.ids.0
instance_network_type = "VPC"
instance_spec = "2C16G"
master_node_num = 1
payment_type = "PayAsYouGo"
private_ip_address = "1.1.1.1"
seg_storage_type = "cloud_essd"
seg_node_num = 4
storage_size = 50
Expand Down
2 changes: 0 additions & 2 deletions quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-backup-policy-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ resource "alicloud_gpdb_instance" "default" {
zone_id = data.alicloud_gpdb_zones.default.ids.0
instance_network_type = "VPC"
instance_spec = "2C16G"
master_node_num = 1
payment_type = "PayAsYouGo"
private_ip_address = "1.1.1.1"
seg_storage_type = "cloud_essd"
seg_node_num = 4
storage_size = 50
Expand Down
2 changes: 0 additions & 2 deletions quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-connection-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ resource "alicloud_gpdb_instance" "default" {
zone_id = data.alicloud_gpdb_zones.default.ids.0
instance_network_type = "VPC"
instance_spec = "2C16G"
master_node_num = 1
payment_type = "PayAsYouGo"
private_ip_address = "1.1.1.1"
seg_storage_type = "cloud_essd"
seg_node_num = 4
storage_size = 50
Expand Down
13 changes: 4 additions & 9 deletions quickstarts/AnalyticDB_for_PostgreSQL(GPDB)/101-gpdb-db-instance-plan-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ resource "alicloud_gpdb_instance" "default" {
zone_id = data.alicloud_gpdb_zones.default.ids.0
instance_network_type = "VPC"
instance_spec = "2C16G"
master_node_num = 1
payment_type = "PayAsYouGo"
private_ip_address = "1.1.1.1"
seg_storage_type = "cloud_essd"
seg_node_num = 4
storage_size = 50
Expand All @@ -43,13 +41,15 @@ resource "alicloud_gpdb_instance" "default" {
}
}

resource "time_static" "example" {}

resource "alicloud_gpdb_db_instance_plan" "default" {
db_instance_plan_name = var.name
plan_desc = var.name
plan_type = "PauseResume"
plan_schedule_type = "Regular"
plan_start_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(timestamp(), "1h"))
plan_end_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(timestamp(), "24h"))
plan_start_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(time_static.example.rfc3339, "1h"))
plan_end_date = formatdate("YYYY-MM-DD'T'hh:mm:ss'Z'", timeadd(time_static.example.rfc3339, "24h"))
plan_config {
resume {
plan_cron_time = "0 0 0 1/1 * ? "
Expand All @@ -59,9 +59,4 @@ resource "alicloud_gpdb_db_instance_plan" "default" {
}
}
db_instance_id = alicloud_gpdb_instance.default.id

# for test
lifecycle {
ignore_changes = [plan_start_date, plan_end_date]
}
}
34 changes: 17 additions & 17 deletions ...Address(Eipanycast)/101-eipanycast-anycast-eip-address-attachment-docs-Example-02/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,45 @@ provider "alicloud" {
}

data "alicloud_zones" "default" {
provider = "alicloud.beijing"
provider = alicloud.beijing
available_disk_category = "cloud_efficiency"
available_resource_creation = "VSwitch"
}

data "alicloud_images" "default" {
provider = "alicloud.beijing"
provider = alicloud.beijing
name_regex = "^ubuntu_18.*64"
most_recent = true
owners = "system"
}

data "alicloud_instance_types" "default" {
provider = "alicloud.beijing"
provider = alicloud.beijing
availability_zone = data.alicloud_zones.default.zones[0].id
cpu_core_count = 1
memory_size = 2
}

resource "alicloud_vpc" "defaultVpc" {
provider = "alicloud.beijing"
provider = alicloud.beijing
vpc_name = var.name
cidr_block = "192.168.0.0/16"
}

resource "alicloud_vswitch" "defaultVsw" {
provider = "alicloud.beijing"
provider = alicloud.beijing
vpc_id = alicloud_vpc.defaultVpc.id
cidr_block = "192.168.0.0/24"
zone_id = data.alicloud_zones.default.zones.0.id
}

resource "alicloud_security_group" "defaultuBsECI" {
provider = "alicloud.beijing"
provider = alicloud.beijing
vpc_id = alicloud_vpc.defaultVpc.id
}

resource "alicloud_instance" "default9KDlN7" {
provider = "alicloud.beijing"
provider = alicloud.beijing
image_id = data.alicloud_images.default.images[0].id
instance_type = data.alicloud_instance_types.default.instance_types[0].id
instance_name = var.name
Expand All @@ -63,50 +63,50 @@ resource "alicloud_instance" "default9KDlN7" {
}

resource "alicloud_eipanycast_anycast_eip_address" "defaultXkpFRs" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
service_location = "ChineseMainland"
}

resource "alicloud_vpc" "defaultVpc2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
vpc_name = "${var.name}6"
cidr_block = "192.168.0.0/16"
}

data "alicloud_zones" "default2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
available_disk_category = "cloud_efficiency"
available_resource_creation = "VSwitch"
}

data "alicloud_images" "default2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
name_regex = "^ubuntu_18.*64"
most_recent = true
owners = "system"
}

data "alicloud_instance_types" "default2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
availability_zone = data.alicloud_zones.default2.zones[0].id
cpu_core_count = 1
memory_size = 2
}

resource "alicloud_vswitch" "defaultdsVsw2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
vpc_id = alicloud_vpc.defaultVpc2.id
cidr_block = "192.168.0.0/24"
zone_id = data.alicloud_zones.default2.zones.1.id
}

resource "alicloud_security_group" "defaultuBsECI2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
vpc_id = alicloud_vpc.defaultVpc2.id
}

resource "alicloud_instance" "defaultEcs2" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
image_id = data.alicloud_images.default2.images[0].id
instance_type = data.alicloud_instance_types.default2.instance_types[0].id
instance_name = var.name
Expand All @@ -118,7 +118,7 @@ resource "alicloud_instance" "defaultEcs2" {
}

resource "alicloud_eipanycast_anycast_eip_address_attachment" "defaultEfYBJY" {
provider = "alicloud.beijing"
provider = alicloud.beijing
bind_instance_id = alicloud_instance.default9KDlN7.network_interface_id
bind_instance_type = "NetworkInterface"
bind_instance_region_id = "cn-beijing"
Expand All @@ -127,7 +127,7 @@ resource "alicloud_eipanycast_anycast_eip_address_attachment" "defaultEfYBJY" {
}

resource "alicloud_eipanycast_anycast_eip_address_attachment" "normal" {
provider = "alicloud.hangzhou"
provider = alicloud.hangzhou
bind_instance_id = alicloud_instance.defaultEcs2.network_interface_id
bind_instance_type = "NetworkInterface"
bind_instance_region_id = "cn-hangzhou"
Expand Down
12 changes: 7 additions & 5 deletions quickstarts/Api_Gateway/101-api-gateway-access-control-list-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ resource "alicloud_api_gateway_instance" "defaultxywS8c" {

resource "alicloud_api_gateway_access_control_list" "default" {
access_control_list_name = var.name
acl_entrys {
acl_entry_ip = "128.0.0.1/32"
acl_entry_comment = "example comment"
}
address_ip_version = "ipv4"
address_ip_version = "ipv4"
}

resource "alicloud_api_gateway_acl_entry_attachment" "default" {
acl_id = alicloud_api_gateway_access_control_list.default.id
entry = "128.0.0.1/32"
comment = "example comment"
}
1 change: 1 addition & 0 deletions quickstarts/Api_Gateway/101-api-gateway-instance-docs-Example/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ No modules.
| Name | Type |
|------|------|
| [alicloud_api_gateway_instance.default](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/api_gateway_instance) | resource |
| [alicloud_vpc.vpc](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc) | resource |

## Inputs

Expand Down
8 changes: 7 additions & 1 deletion quickstarts/Api_Gateway/101-api-gateway-instance-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ provider "alicloud" {
}


resource "alicloud_vpc" "vpc" {
cidr_block = "172.16.0.0/12"
vpc_name = var.name
}


resource "alicloud_api_gateway_instance" "default" {
instance_name = var.name

instance_spec = "api.s1.small"
https_policy = "HTTPS2_TLS1_0"
zone_id = "cn-hangzhou-MAZ6"
payment_type = "PayAsYouGo"
user_vpc_id = "1709116870"
user_vpc_id = alicloud_vpc.vpc.id
instance_type = "normal"
}
2 changes: 1 addition & 1 deletion quickstarts/CDN/101-cdn-real-time-log-delivery-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resource "alicloud_log_project" "default" {
}

resource "alicloud_log_store" "default" {
project_name = alicloud_log_project.default.name
project_name = alicloud_log_project.default.project_name
logstore_name = "example-store"
shard_count = 3
auto_split = true
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Classic_Load_Balancer(SLB)/101-slb-attachment-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data "alicloud_images" "default" {
}

resource "alicloud_vpc" "default" {
name = var.name
vpc_name = var.name
cidr_block = "172.16.0.0/16"
}

Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Click_House/101-click-house-account-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ 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_click_house_regions.default.regions.0.zone_ids.0.zone_id
zone_id = data.alicloud_click_house_regions.default.regions.0.zone_ids.1.zone_id
}

resource "alicloud_click_house_db_cluster" "default" {
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Click_House/101-click-house-backup-policy-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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_click_house_regions.default.regions.0.zone_ids.0.zone_id
zone_id = data.alicloud_click_house_regions.default.regions.0.zone_ids.1.zone_id
}

resource "alicloud_click_house_db_cluster" "default" {
Expand Down
2 changes: 1 addition & 1 deletion quickstarts/Click_House/101-click-house-db-cluster-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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_click_house_regions.default.regions.0.zone_ids.0.zone_id
zone_id = data.alicloud_click_house_regions.default.regions.0.zone_ids.1.zone_id
}

resource "alicloud_click_house_db_cluster" "default" {
Expand Down
8 changes: 4 additions & 4 deletions quickstarts/Cloud_Config(Config)/101-config-aggregate-delivery-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ resource "alicloud_config_aggregator" "default" {

resource "random_uuid" "default" {}
resource "alicloud_log_project" "default" {
name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
project_name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
}
resource "alicloud_log_store" "default" {
name = var.name
project = alicloud_log_project.default.name
logstore_name = var.name
project_name = alicloud_log_project.default.project_name
}
resource "alicloud_config_aggregate_delivery" "default" {
aggregator_id = alicloud_config_aggregator.default.id
configuration_item_change_notification = true
non_compliant_notification = true
delivery_channel_name = var.name
delivery_channel_target_arn = "acs:log:${data.alicloud_regions.this.ids.0}:${data.alicloud_account.this.id}:project/${alicloud_log_project.default.name}/logstore/${alicloud_log_store.default.name}"
delivery_channel_target_arn = "acs:log:${data.alicloud_regions.this.ids.0}:${data.alicloud_account.this.id}:project/${alicloud_log_project.default.project_name}/logstore/${alicloud_log_store.default.logstore_name}"
delivery_channel_type = "SLS"
description = var.name
}
8 changes: 4 additions & 4 deletions quickstarts/Cloud_Config(Config)/101-config-delivery-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ data "alicloud_regions" "this" {
}

resource "alicloud_log_project" "default" {
name = var.name
project_name = var.name
}
resource "alicloud_log_store" "default" {
name = var.name
project = alicloud_log_project.default.name
logstore_name = var.name
project_name = alicloud_log_project.default.project_name
}

resource "alicloud_config_delivery" "default" {
configuration_item_change_notification = true
non_compliant_notification = true
delivery_channel_name = var.name
delivery_channel_target_arn = "acs:log:${data.alicloud_regions.this.ids.0}:${data.alicloud_account.this.id}:project/${alicloud_log_project.default.name}/logstore/${alicloud_log_store.default.name}"
delivery_channel_target_arn = "acs:log:${data.alicloud_regions.this.ids.0}:${data.alicloud_account.this.id}:project/${alicloud_log_project.default.project_name}/logstore/${alicloud_log_store.default.logstore_name}"
delivery_channel_type = "SLS"
description = var.name
}
6 changes: 5 additions & 1 deletion quickstarts/Cloud_Config(Config)/101-config-remediation-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ resource "random_integer" "default" {

resource "alicloud_oss_bucket" "default" {
bucket = "${var.name}-${random_integer.default.result}"
acl = "public-read"
tags = {
For = "example"
}
}

resource "alicloud_oss_bucket_acl" "name" {
bucket = alicloud_oss_bucket.default.bucket
acl = "public-read"
}

resource "alicloud_config_rule" "default" {
description = "If the ACL policy of the OSS bucket denies read access from the Internet, the configuration is considered compliant."
source_owner = "ALIYUN"
Expand Down
10 changes: 5 additions & 5 deletions quickstarts/Cloud_Monitor_Service/101-cms-hybrid-monitor-sls-task-docs-Example/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ data "alicloud_regions" "default" {
resource "random_uuid" "default" {
}
resource "alicloud_log_project" "default" {
name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
project_name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
}

resource "alicloud_log_store" "default" {
project = alicloud_log_project.default.name
name = var.name
project_name = alicloud_log_project.default.project_name
logstore_name = var.name
shard_count = 3
auto_split = true
max_split_shard_count = 60
Expand All @@ -23,8 +23,8 @@ resource "alicloud_log_store" "default" {
resource "alicloud_cms_sls_group" "default" {
sls_group_config {
sls_user_id = data.alicloud_account.default.id
sls_logstore = alicloud_log_store.default.name
sls_project = alicloud_log_project.default.name
sls_logstore = alicloud_log_store.default.logstore_name
sls_project = alicloud_log_project.default.project_name
sls_region = data.alicloud_regions.default.regions.0.id
}
sls_group_description = var.name
Expand Down
Loading
Loading