Merge branch 'master' into fix_docs_GaussDB

CHANGELOG.md

@@ -1,5 +1,33 @@
 # CHANGELOG
 
+## 1.42.0 (September 28, 2023)
+
+FEATURES:
+
+* **New Resource:**
+  - `flexibleengine_ddm_instance` [GH-998]
+  - `flexibleengine_ddm_schema` [GH-998]
+  - `flexibleengine_ddm_account` [GH-998]
+
+* **New Data Source:**
+  - `flexibleengine_ddm_accounts` [GH-998]
+  - `flexibleengine_ddm_engines` [GH-998]
+  - `flexibleengine_ddm_flavors` [GH-998]
+  - `flexibleengine_ddm_instance_nodes` [GH-998]
+  - `flexibleengine_ddm_instances` [GH-998]
+  - `flexibleengine_ddm_schemas` [GH-998]
+
+ENHANCEMENTS:
+
+* `resource/flexibleengine_lb_loadbalancer_v3`: Support `autoscaling_enabled` and `min_l7_flavor_id` parameters [GH-1019]
+* `resource/flexibleengine_cce_cluster`: Support cluster hibernation feature [GH-1022]
+
+DEPRECATED:
+
+* `resource/flexibleengine_mrs_cluster_v1` [GH-1028]
+* `resource/flexibleengine_mrs_hybrid_cluster_v1` [GH-1028]
+* `resource/flexibleengine_mrs_job_v1` [GH-1028]
+
 ## 1.41.0 (September 6, 2023)
 
 FEATURES:

docs/data-sources/as_groups.md

@@ -7,8 +7,7 @@ subcategory: "Auto Scaling (AS)"
 Use this data source to get a list of AS groups.
 
 ```hcl
-data "flexibleengine_as_groups" "groups" {
-}
+data "flexibleengine_as_groups" "groups" {}
 ```
 
 ## Argument Reference
@@ -30,6 +29,9 @@ The following arguments are supported:
   - **DELETING**: indicates that the AS group is being deleted.
   - **FREEZED**: indicates that the AS group has been frozen.
 
+* `enterprise_project_id` - (Optional, String) Specifies the enterprise project id of the AS group.
+  Changing this will create a new resource.
+
 ## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:

docs/data-sources/availability_zones.md

@@ -1,3 +1,9 @@
+---
+subcategory: "Data Sources"
+description: ""
+page_title: "flexibleengine_availability_zones"
+---
+
 # flexibleengine_availability_zones
 
 Use this data source to get a list of availability zones from FlexibleEngine.
@@ -10,11 +16,12 @@ data "flexibleengine_availability_zones" "zones" {}
 
 ## Argument Reference
 
-* `region` - (Optional) The `region` to fetch availability zones from, defaults to the provider's `region`.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `state` - (Optional) The `state` of the availability zones to match, default ("available").
+* `state` - (Optional, String) The `state` of the availability zones to match, default ("available").
 
-## Attributes Reference
+## Attribute Reference
 
 `id` is set to hash of the returned zone list. In addition, the following attributes are exported:
 

docs/data-sources/cce_addon_template.md

@@ -24,6 +24,9 @@ data "flexibleengine_cce_addon_template" "test" {
 
 The following arguments are supported:
 
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
+
 * `cluster_id` - (Required, String) Specifies the ID of CCE cluster.
 
 * `name` - (Required, String) Specifies the add-on name. The supported addons are as follows:
@@ -42,7 +45,7 @@ The following arguments are supported:
 
 * `version` - (Required, String) Specifies the add-on version.
 
-## Attributes Reference
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
@@ -54,6 +57,12 @@ In addition to all arguments above, the following attributes are exported:
 
 * `stable` - Whether the add-on template is a stable version.
 
-* `support_version/virtual_machine` - The cluster (Virtual Machine) version that the add-on template supported.
+* `support_version` - The cluster information.
+The [support_version](#cce_support_version) object structure is documented below.
+
+<a name="cce_support_version"></a>
+The `support_version` block supports:
+
+* `virtual_machine` - The cluster (Virtual Machine) version that the add-on template supported.
 
-* `support_version/bare_metal` - The cluster (Bare Metal) version that the add-on template supported.
+* `bare_metal` - The cluster (Bare Metal) version that the add-on template supported.

docs/data-sources/cce_cluster_v3.md

@@ -21,15 +21,20 @@ data "flexibleengine_cce_cluster_v3" "cluster" {
 
 The following arguments are supported:
 
-* `name` -  (Optional)The Name of the cluster resource.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `id` - (Optional) The ID of container cluster.
+* `name` - (Optional, String)The Name of the cluster resource.
 
-* `status` - (Optional) The state of the cluster.
+* `id` - (Optional, String) The ID of container cluster.
 
-* `cluster_type` - (Optional) Type of the cluster. Possible values: VirtualMachine, BareMetal or Windows
+* `status` - (Optional, String) The state of the cluster.
 
-## Attributes Reference
+* `cluster_type` - (Optional, String) Type of the cluster. Possible values: VirtualMachine, BareMetal or Windows
+
+* `vpc_id` - (Optional, String) The ID of the VPC used to create the node.
+
+## Attribute Reference
 
 All above argument parameters can be exported as attribute parameters along with attribute reference:
 
@@ -69,8 +74,10 @@ All above argument parameters can be exported as attribute parameters along with
 
 * `authentication_mode` - Authentication mode of the cluster, possible values are x509 and rbac.
 
-* `masters` - Advanced configuration of master nodes. Structure is documented below.
+* `masters` - Advanced configuration of master nodes.
+  The [masters](#cce_masters) object structure is documented below.
 
+<a name="cce_masters"></a>
 The `masters` block supports:
 
 * `availability_zone` - The availability zone (AZ) of the master node.

docs/data-sources/cce_clusters.md

@@ -36,16 +36,18 @@ The following arguments are supported:
 
 * `status` - (Optional, String) Specifies the status of the cluster.
 
-## Attributes Reference
+## Attribute Reference
 
 In addition to all arguments above, the following attributes are exported:
 
 * `id` - Indicates a data source ID.
 
 * `ids` - Indicates a list of IDs of all CCE clusters found.
 
-* `clusters` - Indicates a list of CCE clusters found. Structure is documented below.
+* `clusters` - Indicates a list of CCE clusters found.
+  The [clusters](#cce_clusters) object structure is documented below.
 
+<a name="cce_clusters"></a>
 The `clusters` block supports:
 
 * `name` - The name of the cluster.
@@ -76,26 +78,33 @@ The `clusters` block supports:
 
 * `authentication_mode` - The authentication mode of the cluster, possible values are x509 and rbac. Defaults to **rbac**.
 
-* `masters` - The advanced configuration of master nodes.
+* `masters` - The advanced configuration of master nodes.The [masters](#cce_masters) object structure is documented below.
 
 * `security_group_id` - The security group ID of the cluster.
 
 * `vpc_id` - The vpc ID of the cluster.
 
 * `subnet_id` - The ID of the VPC Subnet used to create the node.
 
-* `highway_subnet_id` - The ID of the high speed network used to create bare metal nodes.
-
 * `enterprise_project_id` - The enterprise project ID of the CCE cluster.
 
-* `endpoints` - The access addresses of kube-apiserver in the cluster. Structure is documented below.
+* `endpoints` - The access addresses of kube-apiserver in the cluster.
+  The [endpoints](#cce_endpoints) object structure is documented below.
 
-* `certificate_clusters` - The certificate clusters. Structure is documented below.
+* `certificate_clusters` - The certificate clusters.
+  The [certificate_clusters](#cce_certificate_clusters) object structure is documented below.
 
-* `certificate_users` - The certificate users. Structure is documented below.
+* `certificate_users` - The certificate users
+  The [certificate_users](#cce_certificate_users) object structure is documented below.
 
 * `kube_config_raw` - The raw Kubernetes config to be used by kubectl and other compatible tools.
 
+<a name="cce_masters"></a>
+The `masters` block supports:
+
+* `availability_zone` - The availability zone (AZ) of the master node.
+
+<a name="cce_endpoints"></a>
 The `endpoints` block supports:
 
 * `url` - The URL of the cluster access address.
@@ -104,6 +113,7 @@ The `endpoints` block supports:
   + **Internal**: The user's subnet access address.
   + **External**: The public network access address.
 
+<a name="cce_certificate_clusters"></a>
 The `certificate_clusters` block supports:
 
 * `name` - The cluster name.
@@ -112,6 +122,7 @@ The `certificate_clusters` block supports:
 
 * `certificate_authority_data` - The certificate data.
 
+<a name="cce_certificate_users"></a>
 The `certificate_users` block supports:
 
 * `name` - The user name.

docs/data-sources/cce_node_ids_v3.md

@@ -21,9 +21,12 @@ data "flexibleengine_cce_node_ids_v3" "node_ids" {
 
 The following arguments are supported:
 
-* `cluster_id` (Required) - Specifies the CCE cluster ID used as the query filter.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-## Attributes Reference
+* `cluster_id` (Required, String) - Specifies the CCE cluster ID used as the query filter.
+
+## Attribute Reference
 
 The following attributes are exported:
 

docs/data-sources/cce_node_v3.md

@@ -22,15 +22,18 @@ data "flexibleengine_cce_node_v3" "node" {
 
 The following arguments are supported:
 
-* `cluster_id` - (Required) The id of container cluster.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `name` - (Optional) - Name of the node.
+* `cluster_id` - (Required, String) The id of container cluster.
 
-* `node_id` - (Optional) - The id of the node.
+* `name` - (Optional, String) - Name of the node.
 
-* `status` - (Optional) - The state of the node.
+* `node_id` - (Optional, String) - The id of the node.
 
-## Attributes Reference
+* `status` - (Optional, String) - The state of the node.
+
+## Attribute Reference
 
 All above argument parameters can be exported as attribute parameters along with attribute reference:
 
@@ -53,13 +56,14 @@ All above argument parameters can be exported as attribute parameters along with
 * `ip_type` - Elastic IP address type.
 
 * `share_type` - Bandwidth sharing type.
+
 * `bandwidth_size` - Bandwidth (Mbit/s), in the range of [1, 2000].
+
 * `charge_mode` - Bandwidth billing type.
 
-* `root_volume` - It corresponds to the system disk related configuration.
+* `disk_size` - Disk size in GB.
 
-  + `disk_size` - Disk size in GB.
-  + `volume_type` - Disk type.
+* `volume_type` - Disk type.
 
 * `data_volumes` - Represents the data disk to be created.
 

docs/data-sources/compute_bms_flavors_v2.md

@@ -18,23 +18,28 @@ data "flexibleengine_compute_bms_flavors_v2" "BMS_flavor" {
 
 The arguments of this data source act as filters for querying the BMSs details.
 
-* `name` (Optional) - Specifies the name of the BMS flavor.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `vcpus` (Optional) - Specifies the number of CPU cores in the BMS flavor.
+* `name` (Optional, String) - Specifies the name of the BMS flavor.
 
-* `min_ram` (Optional) - Specifies the minimum memory size in MB. Only the BMSs with the memory size
+* `id` - (Optional, String) - The ID of the flavor.
+
+* `vcpus` (Optional, Int) - Specifies the number of CPU cores in the BMS flavor.
+
+* `min_ram` (Optional, Int) - Specifies the minimum memory size in MB. Only the BMSs with the memory size
   greater than or equal to the minimum size can be queried.
 
-* `min_disk` (Optional) - Specifies the minimum disk size in GB. Only the BMSs with a disk size
+* `min_disk` (Optional, Int) - Specifies the minimum disk size in GB. Only the BMSs with a disk size
   greater than or equal to the minimum size can be queried.
 
-* `sort_key` (Optional) - The sorting field. The default value is **flavorid**.
+* `sort_key` (Optional, String) - The sorting field. The default value is **flavorid**.
   The available values are **name**, **memory_mb**, **vcpus**, **root_gb**, or **flavorid**.
 
-* `sort_dir` (Optional) - The sorting order, which can be **asc** (ascending) or **desc** (descending).
+* `sort_dir` (Optional, String) - The sorting order, which can be **asc** (ascending) or **desc** (descending).
   The default value is **asc**.
 
-## Attributes Reference
+## Attribute Reference
 
 All of the argument attributes are also exported as result attributes.
 

docs/data-sources/compute_bms_keypairs_v2.md

@@ -20,9 +20,12 @@ data "flexibleengine_compute_bms_keypairs_v2" "keypair" {
 
 The arguments of this data source act as filters for querying the BMSs details.
 
-* `name` - (Required) - It is the key pair name.
+* `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) - It is the key pair name.
+
+## Attribute Reference
 
 All of the argument attributes are also exported as result attributes.
 

docs/data-sources/compute_bms_nic_v2.md

@@ -22,18 +22,29 @@ data "flexibleengine_compute_bms_nic_v2" "nic" {
 
 The arguments of this data source act as filters for querying the BMSs details.
 
-* `server_id` - (Required) - This is the unique BMS id.
+* `region` - (Optional, String) The region in which to query the data source. If omitted, the provider-level region
+  will be used.
 
-* `id` - (Optional) - The ID of the NIC.
+* `server_id` - (Required, String) - This is the unique BMS id.
 
-* `status` - (Optional) - The NIC port status.
+* `id` - (Optional, String) - The ID of the NIC.
 
-## Attributes Reference
+* `status` - (Optional, String) - The NIC port status.
+
+## Attribute Reference
 
 All of the argument attributes are also exported as result attributes.
 
 * `mac_address` - It is NIC's mac address.
 
 * `fixed_ips` - The NIC IP address.
+    The [fixed_ips](#<a name="bms_fixed_ips"></a>) object structure is documented below.
 
 * `network_id` - The ID of the network to which the NIC port belongs.
+
+<a name="bms_fixed_ips"></a>
+The `fixed_ips` block supports:
+
+* `ip_address` - Specifies the NIC private IP address.
+
+* `subnet_id` - Specifies the ID of the subnet (subnet_id) corresponding to the private IP address of the NIC.