Skip to content
This repository has been archived by the owner on Aug 25, 2020. It is now read-only.

Commit

Permalink
Fix reources' id description bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaozhu36 committed Oct 19, 2018
1 parent 25c87b5 commit b5143ad
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ IMPROVEMENTS:

BUG FIXES:

- Fix reources' id description bugs [GH-428]
- Fix alicloud_ess_scaling_configuration setting data_disk failed [GH-427]

## 1.19.0 (October 13, 2018)
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/cs_application.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The ID of the container application. It's formate is <cluster_name>:<name>
* `id` - The ID of the container application. It's formate is `<cluster_name>:<name>`.
* `cluster_name` - The name of the container cluster.
* `name` - The application name.
* `description` - The application description.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/datahub_subscription.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The ID of the datahub subscritpion as terraform resource. It was composed of project name, topic name and practical subscription ID generated from server side. Format to <project_name>:<topic_name>:<sub_id>.
* `id` - The ID of the datahub subscritpion as terraform resource. It was composed of project name, topic name and practical subscription ID generated from server side. Format to `<project_name>:<topic_name>:<sub_id>`.
* `sub_id` - The identidy of the subscritpion, generate from server side.
* `create_time` - Create time of the datahub subscription. It is a human-readable string rather than 64-bits UTC.
* `last_modify_time` - Last modify time of the datahub subscription. It is the same as *create_time* at the beginning. It is also a human-readable string rather than 64-bits UTC.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/datahub_topic.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The ID of the datahub topic. It was composed of project name and its name, and formats to <project_name>:<name>.
* `id` - The ID of the datahub topic. It was composed of project name and its name, and formats to `<project_name>:<name>`.
* `create_time` - Create time of the datahub topic. It is a human-readable string rather than 64-bits UTC.
* `last_modify_time` - Last modify time of the datahub topic. It is the same as *create_time* at the beginning. It is also a human-readable string rather than 64-bits UTC.

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/db_account.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The current account resource ID. Composed of instance ID and account name with format "<instance_id>:<name>".
* `id` - The current account resource ID. Composed of instance ID and account name with format `<instance_id>:<name>`.
* `instance_id` - The Id of DB instance.
* `name` - The name of DB account.
* `description` - The account description.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/db_account_privilege.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The current account resource ID. Composed of instance ID, account name and privilege with format "<instance_id>:<name>:<privilege>".
* `id` - The current account resource ID. Composed of instance ID, account name and privilege with format `<instance_id>:<name>:<privilege>`.
* `instance_id` - The Id of DB instance.
* `account_name` - The name of DB account.
* `privilege` - The specified account privilege.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/db_connection.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The current instance connection resource ID. Composed of instance ID and connection string with format "<instance_id>:<connection_prefix>".
* `id` - The current instance connection resource ID. Composed of instance ID and connection string with format `<instance_id>:<connection_prefix>`.
* `connection_prefix` - Prefix of a connection string.
* `port` - Connection instance port.
* `connection_string` - Connection instance string.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/db_database.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The current database resource ID. Composed of instance ID and database name with format "<instance_id>:<name>".
* `id` - The current database resource ID. Composed of instance ID and database name with format `<instance_id>:<name>`.
* `instance_id` - The Id of DB instance.
* `name` - The name of DB database.
* `character_set` - Character set that database used.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/fc_function.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ The following arguments are supported:

The following arguments are exported:

* `id` - The ID of the function. The value is formate as "<service>:<name>".
* `id` - The ID of the function. The value is formate as `<service>:<name>`.
* `last_modified` - The date this resource was last modified.

## Import
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/fc_trigger.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ The following arguments are supported:

The following arguments are exported:

* `id` - The ID of the function. The value is formate as "<service>:<function>:<name>".
* `id` - The ID of the function. The value is formate as `<service>:<function>:<name>`.
* `last_modified` - The date this resource was last modified.

## Import
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/log_machine_group.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The ID of the log machine group. It formats of "<project>:<name>".
* `id` - The ID of the log machine group. It formats of `<project>:<name>`.
* `project` - The project name.
* `name` - The machine group name.
* `identify_type` - The machine identification type.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/log_store.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The ID of the log project. It formats of "<project>:<name>".
* `id` - The ID of the log project. It formats of `<project>:<name>`.
* `project` - The project name.
* `name` - Log store name.
* `retention_period` - The data retention time.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/log_store_index.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The ID of the log store index. It formats of "<project>:<logstore>".
* `id` - The ID of the log store index. It formats of `<project>:<logstore>`.
* `project` - The project name.
* `logstore` - Log store name.
* `full_text` - The full text index config.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/ots_table.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ The following arguments are supported:

The following attributes are exported:

* `id` - The resource ID. The value is "<instance_name>:<table_name>".
* `id` - The resource ID. The value is `<instance_name>:<table_name>`.
* `instance_name` - The OTS instance name.
* `table_name` - The table name of the OTS which could not be changed.
* `primary_key` - The property of `TableMeta` which indicates the structure information of a table.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/slb.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description: |-
Provides an Application Load Balancer resource.

~> **NOTE:** Resource `alicloud_slb` has deprecated 'listener' filed from terraform-alicloud-provider [version 1.3.0](https://github.com/alibaba/terraform-provider/releases/tag/V1.3.0) . You can create new listeners for Load Balancer by resource `alicloud_slb_listener`.
If you have had several listeners in one load balancer, you can import them via the specified listener ID. In the `alicloud_slb_listener`, listener ID is consist of load balancer ID and frontend port, and its format is "<load balancer ID>:<frontend port>", like "lb-hr2fwnf32t:8080".
If you have had several listeners in one load balancer, you can import them via the specified listener ID. In the `alicloud_slb_listener`, listener ID is consist of load balancer ID and frontend port, and its format is `<load balancer ID>:<frontend port>`, like "lb-hr2fwnf32t:8080".

~> **NOTE:** At present, to avoid some unnecessary regulation confusion, SLB can not support alicloud international account to create "paybybandwidth" instance.

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/slb_listener.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ The listener mapping supports the following:

The following attributes are exported:

* `id` - The ID of the load balancer listener. It is consist of `load_balancer_id` and `frontend_port`: <load_balancer_id>:<frontend_port>.
* `id` - The ID of the load balancer listener. It is consist of `load_balancer_id` and `frontend_port`: `<load_balancer_id>:<frontend_port>`.
* `load_balancer_id` - The Load Balancer ID which is used to launch a new listener.
* `frontend_port` - Port used by the Server Load Balancer instance frontend.
* `backend_port` - Port used by the Server Load Balancer instance backend.
Expand Down

0 comments on commit b5143ad

Please sign in to comment.