aliyun · ChenHanZhang · Jul 30, 2024 · Jul 4, 2024
diff --git a/website/docs/r/adb_resource_group.html.markdown b/website/docs/r/adb_resource_group.html.markdown
@@ -21,41 +21,53 @@ Basic Usage
 
 ```terraform
 variable "name" {
-  default = "terraform-example"
+  default = "tf_example"
 }
 
 data "alicloud_adb_zones" "default" {
 }
+data "alicloud_resource_manager_resource_groups" "default" {
+  status = "OK"
+}
 
 resource "alicloud_vpc" "default" {
   vpc_name   = var.name
-  cidr_block = "192.168.0.0/16"
+  cidr_block = "10.4.0.0/16"
 }
-
 resource "alicloud_vswitch" "default" {
-  vswitch_name = var.name
   vpc_id       = alicloud_vpc.default.id
-  cidr_block   = "192.168.192.0/24"
-  zone_id      = data.alicloud_adb_zones.default.zones.0.id
+  cidr_block   = "10.4.0.0/24"
+  zone_id      = data.alicloud_adb_zones.default.zones[0].id
+  vswitch_name = var.name
 }
 
 resource "alicloud_adb_db_cluster" "default" {
-  compute_resource    = "32Core128GB"
+  compute_resource    = "48Core192GB"
   db_cluster_category = "MixedStorage"
+  db_cluster_version  = "3.0"
+  db_node_class       = "E32"
+  db_node_storage     = 100
   description         = var.name
   elastic_io_resource = 1
+  maintain_time       = "04:00Z-05:00Z"
   mode                = "flexible"
   payment_type        = "PayAsYouGo"
+  resource_group_id   = data.alicloud_resource_manager_resource_groups.default.ids.0
+  security_ips        = ["10.168.1.12", "10.168.1.11"]
   vpc_id              = alicloud_vpc.default.id
   vswitch_id          = alicloud_vswitch.default.id
-  zone_id             = data.alicloud_adb_zones.default.zones.0.id
+  zone_id             = data.alicloud_adb_zones.default.zones[0].id
+  tags = {
+    Created = "TF",
+    For     = "example",
+  }
 }
 
 resource "alicloud_adb_resource_group" "default" {
-  db_cluster_id = alicloud_adb_db_cluster.default.id
-  group_name    = var.name
+  group_name    = "TF_EXAMPLE"
   group_type    = "batch"
-  node_num      = 1
+  node_num      = 0
+  db_cluster_id = alicloud_adb_db_cluster.default.id
 }
 ```
 

diff --git a/website/docs/r/alb_listener.html.markdown b/website/docs/r/alb_listener.html.markdown
@@ -37,7 +37,7 @@ data "alicloud_instance_types" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/alb_server_group.html.markdown b/website/docs/r/alb_server_group.html.markdown
@@ -38,7 +38,7 @@ data "alicloud_instance_types" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/api_gateway_vpc_access.html.markdown b/website/docs/r/api_gateway_vpc_access.html.markdown
@@ -51,7 +51,7 @@ resource "alicloud_security_group" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/cen_route_entry.html.markdown b/website/docs/r/cen_route_entry.html.markdown
@@ -32,7 +32,7 @@ data "alicloud_instance_types" "example" {
   memory_size       = 2
 }
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/cloud_monitor_service_monitoring_agent_process.html.markdown b/website/docs/r/cloud_monitor_service_monitoring_agent_process.html.markdown
@@ -34,7 +34,7 @@ data "alicloud_instance_types" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/cloud_storage_gateway_gateway.html.markdown b/website/docs/r/cloud_storage_gateway_gateway.html.markdown
@@ -24,29 +24,26 @@ variable "name" {
   default = "tf-example"
 }
 
-data "alicloud_zones" "default" {
-  available_resource_creation = "VSwitch"
-}
-
 resource "random_uuid" "default" {
 }
+resource "alicloud_cloud_storage_gateway_storage_bundle" "default" {
+  storage_bundle_name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
+}
 
 resource "alicloud_vpc" "default" {
   vpc_name   = var.name
   cidr_block = "172.16.0.0/12"
 }
-
+data "alicloud_zones" "default" {
+  available_resource_creation = "VSwitch"
+}
 resource "alicloud_vswitch" "default" {
   vpc_id       = alicloud_vpc.default.id
   cidr_block   = "172.16.0.0/21"
   zone_id      = data.alicloud_zones.default.zones[0].id
   vswitch_name = var.name
 }
 
-resource "alicloud_cloud_storage_gateway_storage_bundle" "default" {
-  storage_bundle_name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
-}
-
 resource "alicloud_cloud_storage_gateway_gateway" "default" {
   gateway_name             = var.name
   description              = var.name
@@ -55,6 +52,7 @@ resource "alicloud_cloud_storage_gateway_gateway" "default" {
   payment_type             = "PayAsYouGo"
   vswitch_id               = alicloud_vswitch.default.id
   release_after_expiration = false
+  public_network_bandwidth = 40
   storage_bundle_id        = alicloud_cloud_storage_gateway_storage_bundle.default.id
   location                 = "Cloud"
 }

diff --git a/website/docs/r/cloud_storage_gateway_gateway_cache_disk.html.markdown b/website/docs/r/cloud_storage_gateway_gateway_cache_disk.html.markdown
@@ -24,42 +24,43 @@ variable "name" {
   default = "tf-example"
 }
 
-data "alicloud_cloud_storage_gateway_stocks" "default" {
-  gateway_class = "Standard"
+resource "random_uuid" "default" {
+}
+resource "alicloud_cloud_storage_gateway_storage_bundle" "default" {
+  storage_bundle_name = substr("tf-example-${replace(random_uuid.default.result, "-", "")}", 0, 16)
 }
 
 resource "alicloud_vpc" "default" {
   vpc_name   = var.name
-  cidr_block = "172.16.0.0/16"
+  cidr_block = "172.16.0.0/12"
+}
+data "alicloud_cloud_storage_gateway_stocks" "default" {
+  gateway_class = "Standard"
 }
-
 resource "alicloud_vswitch" "default" {
   vpc_id       = alicloud_vpc.default.id
-  cidr_block   = "172.16.0.0/24"
+  cidr_block   = "172.16.0.0/21"
   zone_id      = data.alicloud_cloud_storage_gateway_stocks.default.stocks.0.zone_id
   vswitch_name = var.name
 }
 
-resource "alicloud_cloud_storage_gateway_storage_bundle" "default" {
-  storage_bundle_name = var.name
-}
-
 resource "alicloud_cloud_storage_gateway_gateway" "default" {
+  gateway_name             = var.name
   description              = var.name
   gateway_class            = "Standard"
   type                     = "File"
   payment_type             = "PayAsYouGo"
   vswitch_id               = alicloud_vswitch.default.id
   release_after_expiration = true
+  public_network_bandwidth = 40
   storage_bundle_id        = alicloud_cloud_storage_gateway_storage_bundle.default.id
   location                 = "Cloud"
-  gateway_name             = var.name
 }
 
 resource "alicloud_cloud_storage_gateway_gateway_cache_disk" "default" {
+  cache_disk_category   = "cloud_efficiency"
   gateway_id            = alicloud_cloud_storage_gateway_gateway.default.id
   cache_disk_size_in_gb = 50
-  cache_disk_category   = "cloud_efficiency"
 }
 ```
 

diff --git a/website/docs/r/cms_metric_rule_black_list.html.markdown b/website/docs/r/cms_metric_rule_black_list.html.markdown
@@ -32,7 +32,7 @@ data "alicloud_instance_types" "default" {
   memory_size       = 2
 }
 data "alicloud_images" "default" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/common_bandwidth_package.html.markdown b/website/docs/r/common_bandwidth_package.html.markdown
@@ -21,10 +21,6 @@ For information about CBWP Common Bandwidth Package and how to use it, see [What
 Basic Usage
 
 ```terraform
-provider "alicloud" {
-  region = "cn-hangzhou"
-}
-
 variable "name" {
   default = "terraform-example"
 }

diff --git a/website/docs/r/ddos_basic_threshold.html.markdown b/website/docs/r/ddos_basic_threshold.html.markdown
@@ -35,7 +35,7 @@ data "alicloud_instance_types" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/ddosbgp_ip.html.markdown b/website/docs/r/ddosbgp_ip.html.markdown
@@ -28,7 +28,6 @@ variable "name" {
   default = "tf-example"
 }
 data "alicloud_resource_manager_resource_groups" "default" {}
-data "alicloud_account" "current" {}
 resource "alicloud_ddosbgp_instance" "instance" {
   name             = var.name
   base_bandwidth   = 20
@@ -47,7 +46,6 @@ resource "alicloud_ddosbgp_ip" "default" {
   instance_id       = alicloud_ddosbgp_instance.instance.id
   ip                = alicloud_eip_address.default.ip_address
   resource_group_id = data.alicloud_resource_manager_resource_groups.default.groups.0.id
-  member_uid        = data.alicloud_account.current.id
 }
 ```
 

diff --git a/website/docs/r/ecs_disk_attachment.html.markdown b/website/docs/r/ecs_disk_attachment.html.markdown
@@ -52,7 +52,7 @@ resource "alicloud_security_group" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/ecs_image_pipeline.html.markdown b/website/docs/r/ecs_image_pipeline.html.markdown
@@ -27,7 +27,7 @@ data "alicloud_zones" "default" {
   available_resource_creation = "VSwitch"
 }
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/ecs_instance_set.html.markdown b/website/docs/r/ecs_instance_set.html.markdown
@@ -40,7 +40,7 @@ data "alicloud_instance_types" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/ecs_invocation.html.markdown b/website/docs/r/ecs_invocation.html.markdown
@@ -32,7 +32,7 @@ data "alicloud_instance_types" "default" {
   availability_zone = data.alicloud_zones.default.zones.0.id
 }
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/ecs_key_pair_attachment.html.markdown b/website/docs/r/ecs_key_pair_attachment.html.markdown
@@ -31,7 +31,7 @@ data "alicloud_instance_types" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/ecs_launch_template.html.markdown b/website/docs/r/ecs_launch_template.html.markdown
@@ -29,7 +29,7 @@ data "alicloud_instance_types" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/ecs_network_interface_attachment.html.markdown b/website/docs/r/ecs_network_interface_attachment.html.markdown
@@ -52,7 +52,7 @@ resource "alicloud_security_group" "default" {
 }
 
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/ecs_snapshot.html.markdown b/website/docs/r/ecs_snapshot.html.markdown
@@ -32,7 +32,7 @@ data "alicloud_instance_types" "default" {
   availability_zone = data.alicloud_zones.default.zones.0.id
 }
 data "alicloud_images" "default" {
-  name_regex  = "^ubuntu"
+  name_regex  = "^ubuntu_18.*64"
   most_recent = true
   owners      = "system"
 }

diff --git a/website/docs/r/edas_instance_cluster_attachment.html.markdown b/website/docs/r/edas_instance_cluster_attachment.html.markdown
@@ -29,7 +29,7 @@ data "alicloud_zones" "default" {
   available_resource_creation = "VSwitch"
 }
 data "alicloud_images" "default" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 data "alicloud_instance_types" "default" {

diff --git a/website/docs/r/eip_association.html.markdown b/website/docs/r/eip_association.html.markdown
@@ -41,9 +41,8 @@ data "alicloud_instance_types" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex    = "^ubuntu_[0-9]+_[0-9]+_x64*"
-  owners        = "system"
-  instance_type = data.alicloud_instance_types.example.instance_types.0.id
+  name_regex = "^ubuntu_18.*64"
+  owners     = "system"
 }
 
 resource "alicloud_vpc" "example" {

diff --git a/website/docs/r/ga_basic_accelerator.html.markdown b/website/docs/r/ga_basic_accelerator.html.markdown
@@ -21,13 +21,13 @@ Basic Usage
 
 ```terraform
 resource "alicloud_ga_basic_accelerator" "default" {
-  bandwidth_billing_type = "BandwidthPackage"
-  auto_pay               = true
   duration               = 1
   pricing_cycle          = "Month"
-  auto_use_coupon        = "true"
   basic_accelerator_name = "tf-example-value"
   description            = "tf-example-value"
+  bandwidth_billing_type = "BandwidthPackage"
+  auto_pay               = true
+  auto_use_coupon        = "true"
 }
 ```
 

diff --git a/website/docs/r/havip.html.markdown b/website/docs/r/havip.html.markdown
@@ -15,6 +15,8 @@ Provides a HaVip resource, see [What is HAVIP](https://www.alibabacloud.com/help
 
 -> **NOTE:** Available since v1.18.0.
 
+-> **DEPRECATED:**  This resource has been renamed to [alicloud_vpc_ha_vip](https://registry.terraform.io/providers/aliyun/alicloud/latest/docs/resources/vpc_ha_vip) from version 1.205.0.
+
 ## Example Usage
 
 Basic Usage

diff --git a/website/docs/r/havip_attachment.html.markdown b/website/docs/r/havip_attachment.html.markdown
@@ -34,7 +34,7 @@ data "alicloud_instance_types" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/hbr_ecs_backup_client.html.markdown b/website/docs/r/hbr_ecs_backup_client.html.markdown
@@ -31,7 +31,7 @@ data "alicloud_instance_types" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }
 

diff --git a/website/docs/r/hbr_ecs_backup_plan.html.markdown b/website/docs/r/hbr_ecs_backup_plan.html.markdown
@@ -31,7 +31,7 @@ data "alicloud_instance_types" "example" {
 }
 
 data "alicloud_images" "example" {
-  name_regex = "^ubuntu_[0-9]+_[0-9]+_x64*"
+  name_regex = "^ubuntu_18.*64"
   owners     = "system"
 }