Merge remote-tracking branch 'upstream/master'

docs/data-sources/rds_flavors_v3.md

@@ -19,6 +19,9 @@ data "flexibleengine_rds_flavors_v3" "flavor" {
 
 ## Argument Reference
 
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
+
 * `db_type` - (Required, String) Specifies the DB engine. Value: MySQL, PostgreSQL, SQLServer.
 
 * `db_version` - (Required, String) Specifies the database version. MySQL databases support MySQL 5.6
@@ -42,21 +45,29 @@ data "flexibleengine_rds_flavors_v3" "flavor" {
 
 * `availability_zone` - (Optional, String) Specifies the availability zone which the RDS flavor belongs to.
 
-## Attributes Reference
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The data source ID.
 
-* `flavors` - Indicates the flavors information. Structure is documented below.
+* `flavors` - Indicates the flavors information. The [flavors](#rds_flavors) object structure is documented below.
 
+<a name="rds_flavors"></a>
 The `flavors` block contains:
 
 * `id` - The ID of the rds flavor.
+
 * `name` - The name of the rds flavor.
+
 * `vcpus` - The CPU size.
+
 * `memory` - The memory size in GB.
+
 * `group_type` - The performance specification.
+
 * `instance_mode` - The mode of instance.
+
 * `availability_zones` - The availability zones which the RDS flavor belongs to.
+
 * `db_versions` - The Available versions of the database.

docs/data-sources/rts_software_config_v1.md

@@ -26,19 +26,22 @@ resource "flexibleengine_rts_software_deployment_v1" "mydeployment" {
 
 The following arguments are supported:
 
-* `id` - (Optional) The id of the software configuration.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `name` - (Optional) The name of the software configuration.
+* `id` - (Optional, String) The id of the software configuration.
 
-## Attributes Reference
+* `name` - (Optional, String) The name of the software configuration.
+
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `group` - The namespace that groups this software configuration by when it is delivered to a server.
 
-* `inputs` -  A list of software configuration inputs.
+* `input_values` -  A list of software configuration inputs.
 
-* `outputs` - A list of software configuration outputs.
+* `output_values` - A list of software configuration outputs.
 
 * `config` - The software configuration code.
 

docs/data-sources/rts_stack_resource_v1.md

@@ -22,15 +22,18 @@ data "flexibleengine_rts_stack_resource_v1" "stackresource" {
 
 The following arguments are supported:
 
-* `stack_name` - (Required) The unique stack name.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `resource_name` - (Optional) The name of a resource in the stack.
+* `stack_name` - (Required, String) The unique stack name.
 
-* `physical_resource_id` - (Optional) The physical resource ID.
+* `resource_name` - (Optional, String) The name of a resource in the stack.
 
-* `resource_type` - (Optional) The resource type.
+* `physical_resource_id` - (Optional, String) The physical resource ID.
 
-## Attributes Reference
+* `resource_type` - (Optional, String) The resource type.
+
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 

docs/data-sources/rts_stack_v1.md

@@ -20,9 +20,12 @@ data "flexibleengine_rts_stack_v1" "mystack" {
 
 The following arguments are supported:
 
-* `name` - (Required) The name of the stack.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-## Attributes Reference
+* `name` - (Required, String) The name of the stack.
+
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 

docs/data-sources/sdrs_domain_v1.md

@@ -18,12 +18,11 @@ data "flexibleengine_sdrs_domain_v1" "dom_1" {
 
 ## Argument Reference
 
-* `name` - (Optional) Specifies the name of an active-active domain. Currently only support SDRS_HypeDomain01.
+* `name` - (Optional, String) Specifies the name of an active-active domain. Currently only support SDRS_HypeDomain01.
 
-## Attributes Reference
+## Attribute Reference
 
 `id` is set to the ID of the active-active domain. In addition, the following attributes
 are exported:
 
-* `name` - See Argument Reference above.
 * `description` - Specifies the description of an active-active domain.

docs/data-sources/sfs_file_system_v2.md

@@ -21,25 +21,30 @@ data "flexibleengine_sfs_file_system_v2" "shared_file"
 
 The following arguments are supported:
 
-* `name` - (Optional) The name of the shared file system.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `id` - (Optional) The UUID of the shared file system.
+* `name` - (Optional, String) The name of the shared file system.
 
-* `status` - (Optional) The status of the shared file system.
+* `id` - (Optional, String) The UUID of the shared file system.
 
-## Attributes Reference
+* `status` - (Optional, String) The status of the shared file system.
 
-The following attributes are exported:
+## Attribute Reference
+
+In addition to all arguments above, the following attributes are exported:
 
 * `availability_zone` - The availability zone name.
 
+* `description` - The description of the shared file system.
+
+* `project_id` - The project ID of the operating user.
+
 * `size` - The size (GB) of the shared file system.
 
 * `share_type` - The storage service type for the shared file system, such as high-performance storage (composed of SSDs)
   or large-capacity storage (composed of SATA disks).
 
-* `status` - The status of the shared file system.
-
 * `host` - The host name of the shared file system.
 
 * `is_public` - The level of visibility for the shared file system.
@@ -56,8 +61,6 @@ The following attributes are exported:
 
 * `access_level` - The level of the access rule.
 
-* `access_rules_status` - The status of the share access rule.
-
 * `access_type` - The type of the share access rule.
 
 * `access_to` - The access that the back end grants or denies.

docs/data-sources/sfs_turbos.md

@@ -20,28 +20,31 @@ data "flexibleengine_sfs_turbos" "test" {
 
 The following arguments are supported:
 
-* `region` - (Optional, String) Specifies the region in which to obtain the SFS turbo file systems.
-  If omitted, the provider-level region will be used.
+* `region` - (Optional, String) The region in which to query the SFS turbo file systems. If omitted, the provider-level
+  region will be used.
 
 * `name` - (Optional, String) Specifies the name of the SFS turbo file system.
 
 * `size` - (Optional, Int) Specifies the capacity of the SFS turbo file system, in GB.
-  The value ranges from `500` to `32,768`, and must be large than `10,240` for an enhanced file system.
+  The value ranges from `500` to `32,768`, and must be larger than `10,240` for an enhanced file system.
 
 * `share_proto` - (Optional, String) Specifies the protocol of the SFS turbo file system. The valid value is **NFS**.
 
 * `share_type` - (Optional, String) Specifies the type of the SFS turbo file system.
   The valid values are **STANDARD** and **PERFORMANCE**.
 
-## Attributes Reference
+* `enterprise_project_id` - (Optional, String) Specifies the enterprise project id of the SFS turbo file systems
+  resource.
+
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The data source ID.
 
-* `turbos` - The list of the SFS turbo file systems. The [object](#turbo) structure is documented below.
+* `turbos` - The list of the SFS turbo file systems. The [turbos](#sfs_turbo) object structure is documented below.
 
-<a name="turbo"></a>
+<a name="sfs_turbo"></a>
 The `turbos` block supports:
 
 * `id` - The resource ID of the SFS turbo file system.
@@ -71,3 +74,5 @@ The `turbos` block supports:
 * `subnet_id` - The ID of the VPC Subnet to which the SFS turbo belongs.
 
 * `security_group_id` - The ID of the security group to which the SFS turbo belongs.
+
+* `enterprise_project_id` - The enterprise project id to which the SFS turbo belongs.

docs/data-sources/waf_dedicated_instances.md

@@ -27,12 +27,18 @@ The following arguments are supported:
 
 * `name` - (Optional, String) The name of WAF dedicated instance.
 
-## Attributes Reference
+* `enterprise_project_id` - (Optional, String) Specifies the enterprise project id of the  WAF dedicated instance.
+
+## Attribute Reference
+
+In addition to all arguments above, the following attributes are exported:
 
 * `id` - The data source ID in UUID format.
 
-The following attributes are exported:
+* `instances` - An array of available WAF dedicated instances. The [instances](#waf_instances) object structure is
+  documented below.
 
+<a name="waf_instances"></a>
 The `instances` block supports:
 
 * `id` - The id of WAF dedicated instance.
@@ -41,11 +47,6 @@ The `instances` block supports:
 
 * `available_zone` - The available zone names for the WAF dedicated instances.
 
-* `specification_code` - The specification code of instance.
-  Different specifications have different throughput. Values are:
-  + `waf.instance.professional` - The professional edition, throughput: 100 Mbit/s; QPS: 2,000 (Reference only).
-  +`waf.instance.enterprise` - The enterprise edition, throughput: 500 Mbit/s; QPS: 10,000 (Reference only).
-
 * `cpu_architecture` - The ECS cpu architecture of WAF dedicated instance.
 
 * `ecs_flavor` - The flavor of the ECS used by the WAF instance.

docs/resources/dli_global_variable.md

@@ -0,0 +1,48 @@
+---
+subcategory: "Data Lake Insight (DLI)"
+---
+
+# flexibleengine_dli_global_variable
+
+Manages a DLI global variable resource within FlexibleEngine.  
+
+## Example Usage
+
+```hcl
+resource "flexibleengine_dli_global_variable" "test" {
+  name  = "demo"
+  value = "abc"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `region` - (Optional, String, ForceNew) Specifies the region in which to create the resource.
+  If omitted, the provider-level region will be used. Changing this parameter will create a new resource.
+
+* `name` - (Required, String, ForceNew) The name of a global variable.
+  This parameter can contain a maximum of 128 characters, which may consist of digits, letters, and underscores (\_),
+  but cannot start with an underscore (\_) or contain only digits.
+
+  Changing this parameter will create a new resource.
+
+* `value` - (Required, String) The value of global variable.
+
+* `is_sensitive` - (Optional, Bool, ForceNew) Whether to set a variable as a sensitive variable. The default value is
+  **false**. Changing this parameter will create a new resource.
+
+## Attribute Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `id` - The resource ID which equals the name.
+
+## Import
+
+The global variable can be imported using the `id` which equals the name, e.g.
+
+```shell
+terraform import flexibleengine_dli_global_variable.test demo_name
+```

docs/resources/rds_account.md

@@ -24,8 +24,8 @@ resource "flexibleengine_rds_account" "test" {
 
 The following arguments are supported:
 
-* `region` - (Optional, String, ForceNew) The region in which to create the rds account resource. If omitted, the
-  provider-level region will be used. Changing this creates a new resource.
+* `region` - (Optional, String, ForceNew) Specifies the region in which to create the RDS account resource.
+  If omitted, the provider-level region will be used. Changing this will create a new RDS account resource.
 
 * `instance_id` - (Required, String, ForceNew) Specifies the rds instance id. Changing this will create a new resource.
 
@@ -38,12 +38,20 @@ The following arguments are supported:
   long and contain only letters(case-sensitive), digits, and special characters(~!@#$%^*-_=+?,()&). The value must be
   different from name or name spelled backwards.
 
-## Attributes Reference
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The resource ID of account which is formatted `<instance_id>/<account_name>`.
 
+## Timeouts
+
+This resource provides the following timeouts configuration options:
+
+* `create` - Default is 10 minutes.
+* `update` - Default is 10 minutes.
+* `delete` - Default is 10 minutes.
+
 ## Import
 
 RDS account can be imported using the `instance id` and `account name`, e.g.:

docs/resources/rds_database.md

@@ -24,8 +24,8 @@ resource "flexibleengine_rds_database" "test" {
 
 The following arguments are supported:
 
-* `region` - (Optional, String, ForceNew) The region in which to create the RDS database resource. If omitted, the
-  provider-level region will be used. Changing this creates a new resource.
+* `region` - (Optional, String, ForceNew) Specifies the region in which to create the RDS database resource.
+  If omitted, the provider-level region will be used. Changing this will create a new RDS database resource.
 
 * `instance_id` - (Required, String, ForceNew) Specifies the RDS instance ID. Changing this will create a new resource.
 
@@ -37,12 +37,24 @@ The following arguments are supported:
 * `character_set` - (Required, String, ForceNew) Specifies the character set used by the database, For example **utf8**,
   **gbk**, **ascii**, etc. Changing this will create a new resource.
 
-## Attributes Reference
+* `description` - (Optional, String) Specifies the database description. The value can contain **0** to **512**
+  characters. This parameter takes effect only for DB instances whose kernel versions are at least **5.6.51.3**,
+  **5.7.33.1**, or **8.0.21.4**.
+
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - The resource ID of database which is formatted `<instance_id>/<database_name>`.
 
+## Timeouts
+
+This resource provides the following timeouts configuration options:
+
+* `create` - Default is 10 minutes.
+* `update` - Default is 10 minutes.
+* `delete` - Default is 10 minutes.
+
 ## Import
 
 RDS database can be imported using the `instance id` and `database name`, e.g.