Merge pull request #439 from Himer/master

tcaplus change field name and des.

Author: likexian

CHANGELOG.md

@@ -19,6 +19,10 @@ DEPRECATED:
 * Data Source: `tencentcloud_mysql_instances`: optional argument `pay_type` is no longer supported, replace by `charge_type`.
 * Resource: `tencentcloud_mysql_instance`: optional arguments `pay_type` and `period` are no longer supported, replace by `charge_type` and `prepaid_period`.
 * Resource: `tencentcloud_mysql_readonly_instance`: optional arguments `pay_type` and `period` are no longer supported, replace by `charge_type` and `prepaid_period`.
+* Resource: `tencentcloud_tcaplus_group` replace by `tencentcloud_tcaplus_tablegroup`
+* Data Source: `tencentcloud_tcaplus_groups` replace by `tencentcloud_tcaplus_tablegroups`
+* Resource: `tencentcloud_tcaplus_tablegroup`,`tencentcloud_tcaplus_idl` and `tencentcloud_tcaplus_table`  arguments `group_id`/`group_name`  replace by `tablegroup_id`/`tablegroup_name`
+* Data Source: `tencentcloud_tcaplus_groups`,`tencentcloud_tcaplus_idls` and `tencentcloud_tcaplus_tables` arguments `group_id`/`group_name`  replace by `tablegroup_id`/`tablegroup_name`
 
 ## 1.35.1 (June 02, 2020)
 

examples/tencentcloud-tcaplus/main.tf

@@ -1,28 +1,20 @@
-resource "tencentcloud_vpc" "foo" {
-  name       = var.instance_name
-  cidr_block = var.vpc_cidr
-}
-
-resource "tencentcloud_subnet" "subnet" {
-  name              = var.instance_name
-  vpc_id            = tencentcloud_vpc.foo.id
+data "tencentcloud_vpc_subnets" "vpc" {
+  is_default        = true
   availability_zone = var.availability_zone
-  cidr_block        = var.subnet_cidr
-  is_multicast      = false
 }
 
-resource "tencentcloud_tcaplus_application" "test_app" {
+resource "tencentcloud_tcaplus_cluster" "test_cluster" {
   idl_type                 = "PROTO"
-  app_name                 = "tf_tcaplus_g_table"
-  vpc_id                   = tencentcloud_vpc.foo.id
-  subnet_id                = tencentcloud_subnet.subnet.id
+  cluster_name             = "tf_tcaplus_g_table"
+  vpc_id                   = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id
+  subnet_id                = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id
   password                 = "1qaA2k1wgvfa3ZZZ"
   old_password_expire_last = 3600
 }
 
 resource "tencentcloud_tcaplus_idl" "test_idl" {
-  app_id        = tencentcloud_tcaplus_application.test_app.id
-  zone_id       = tencentcloud_tcaplus_zone.test_zone.id
+  cluster_id    = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_id = tencentcloud_tcaplus_tablegroup.test_tablegroup.id
   file_name     = "tf_idl_test_guagua"
   file_type     = "PROTO"
   file_ext_type = "proto"
@@ -55,20 +47,20 @@ resource "tencentcloud_tcaplus_idl" "test_idl" {
     EOF
 }
 
-resource "tencentcloud_tcaplus_zone" "test_zone" {
-  app_id    = tencentcloud_tcaplus_application.test_app.id
-  zone_name = "tf_test_zone_name_guagua"
+resource "tencentcloud_tcaplus_tablegroup" "test_tablegroup" {
+  cluster_id      = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_name = "tf_test_tablegroup"
 }
 
 resource "tencentcloud_tcaplus_table" "test_table" {
-  app_id             = tencentcloud_tcaplus_application.test_app.id
-  zone_id            = tencentcloud_tcaplus_zone.test_zone.id
-  table_name         = "tb_online_guagua"
-  table_type         = "GENERIC"
-  description        = "test"
-  idl_id             = tencentcloud_tcaplus_idl.test_idl.id
-  table_idl_type     = "PROTO"
-  reserved_read_qps  = 1000
-  reserved_write_qps = 20
-  reserved_volume    = 1
+  cluster_id        = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_id     = tencentcloud_tcaplus_tablegroup.test_tablegroup.id
+  table_name        = "tb_online_guagua"
+  table_type        = "GENERIC"
+  description       = "test"
+  idl_id            = tencentcloud_tcaplus_idl.test_idl.id
+  table_idl_type    = "PROTO"
+  reserved_read_cu  = 1000
+  reserved_write_cu = 20
+  reserved_volume   = 1
 }

examples/tencentcloud-tcaplus/variables.tf

@@ -1,12 +1,3 @@
 variable "availability_zone" {
   default = "ap-shanghai-2"
-}
-variable "instance_name" {
-  default = "vpc_test"
-}
-variable "vpc_cidr" {
-  default = "10.1.0.0/16"
-}
-variable "subnet_cidr" {
-  default = "10.1.1.0/24"
-}
+}

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"github.com/hashicorp/terraform-plugin-sdk/plugin"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-
 	"github.com/terraform-providers/terraform-provider-tencentcloud/tencentcloud"
 )
 

tencentcloud/data_source_tc_tcaplus_clusters.go

@@ -1,6 +1,6 @@
 /*
 
-Use this data source to query tcaplus clusters
+Use this data source to query TcaplusDB clusters.
 
 Example Usage
 
@@ -33,88 +33,88 @@ func dataSourceTencentCloudTcaplusClusters() *schema.Resource {
 			"cluster_name": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Name of the tcaplus cluster to be query.",
+				Description: "Name of the TcaplusDB cluster to be query.",
 			},
 			"cluster_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Id of the tcaplus cluster to be query.",
+				Description: "Id of the TcaplusDB cluster to be query.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Used to save results.",
+				Description: "File for saving results.",
 			},
 			"list": {
 				Type:        schema.TypeList,
 				Computed:    true,
-				Description: "A list of tcaplus cluster. Each element contains the following attributes.",
+				Description: "A list of TcaplusDB cluster. Each element contains the following attributes.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"cluster_name": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Name of the tcaplus cluster.",
+							Description: "Name of the TcaplusDB cluster.",
 						},
 						"cluster_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Id of the tcaplus cluster.",
+							Description: "Id of the TcaplusDB cluster.",
 						},
 						"idl_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Idl type of the tcaplus cluster.",
+							Description: "IDL type of the TcaplusDB cluster.",
 						},
 						"vpc_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "VPC id of the tcaplus cluster.",
+							Description: "VPC id of the TcaplusDB cluster.",
 						},
 						"subnet_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Subnet id of the tcaplus cluster.",
+							Description: "Subnet id of the TcaplusDB cluster.",
 						},
 						"password": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Password of the tcaplus cluster.",
+							Description: "Access password of the TcaplusDB cluster.",
 						},
 						"network_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Network type of the tcaplus cluster.",
+							Description: "Network type of the TcaplusDB cluster.",
 						},
 						"create_time": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Create time of the tcaplus cluster.",
+							Description: "Create time of the TcaplusDB cluster.",
 						},
 						"password_status": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Password status of the tcaplus cluster.`unmodifiable` means:can not change password now,`modifiable` means:can change password now.",
+							Description: "Password status of the TcaplusDB cluster. Valid values: `unmodifiable`, which means the password can not be changed in this moment; `modifiable`, which means the password can be changed in this moment.",
 						},
 						"api_access_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Access id of the tcaplus cluster.For TcaplusDB SDK connect.",
+							Description: "Access id of the TcaplusDB cluster.For TcaplusDB SDK connect.",
 						},
 						"api_access_ip": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Access ip of the tcaplus cluster.For TcaplusDB SDK connect.",
+							Description: "Access ip of the TcaplusDB cluster.For TcaplusDB SDK connect.",
 						},
 						"api_access_port": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "Access port of the tcaplus cluster.For TcaplusDB SDK connect.",
+							Description: "Access port of the TcaplusDB cluster.For TcaplusDB SDK connect.",
 						},
 						"old_password_expire_time": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "This field will display the old password expiration time,if password_status is `unmodifiable` means the old password has not yet expired, otherwise `-`.",
+							Description: "Expiration time of the old password. If `password_status` is `unmodifiable`, it means the old password has not yet expired.",
 						},
 					},
 				},

tencentcloud/data_source_tc_tcaplus_idls.go

@@ -1,5 +1,5 @@
 /*
-Use this data source to query tcaplus idl files
+Use this data source to query  IDL information of the TcaplusDB table.
 
 Example Usage
 
@@ -27,23 +27,23 @@ func dataSourceTencentCloudTcaplusIdls() *schema.Resource {
 			"cluster_id": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "Id of the tcaplus cluster to be query.",
+				Description: "Id of the TcaplusDB cluster to be query.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Used to save results.",
+				Description: "File for saving results.",
 			},
 			"list": {
 				Type:        schema.TypeList,
 				Computed:    true,
-				Description: "A list of tcaplus idls. Each element contains the following attributes.",
+				Description: "A list of TcaplusDB table IDL. Each element contains the following attributes.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"idl_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Id of this idl.",
+							Description: "Id of the IDL.",
 						},
 					},
 				},

tencentcloud/data_source_tc_tcaplus_idls_test.go

@@ -36,9 +36,9 @@ data "tencentcloud_vpc_subnets" "vpc" {
     availability_zone = var.availability_zone
 }
 
-resource "tencentcloud_tcaplus_group" "test_group" {
-  cluster_id    = tencentcloud_tcaplus_cluster.test_cluster.id
-  group_name    = "tf_test_group_name_guagua"
+resource "tencentcloud_tcaplus_tablegroup" "test_group" {
+  cluster_id         = tencentcloud_tcaplus_cluster.test_cluster.id
+  tablegroup_name    = "tf_test_group_name_guagua"
 }
 
 resource "tencentcloud_tcaplus_cluster" "test_cluster" {
@@ -51,7 +51,7 @@ resource "tencentcloud_tcaplus_cluster" "test_cluster" {
 }
 resource "tencentcloud_tcaplus_idl" "test_idl" {
   cluster_id     = tencentcloud_tcaplus_cluster.test_cluster.id
-  group_id       = tencentcloud_tcaplus_group.test_group.id
+  tablegroup_id  = tencentcloud_tcaplus_tablegroup.test_group.id
   file_name      = "tf_idl_test_guagua"
   file_type      = "PROTO"
   file_ext_type  = "proto"