Merge pull request tencentcloudstack#420 from Himer/master

rewrite tcaplus names.

Author: likexian

CHANGELOG.md

@@ -1,4 +1,18 @@
-## 1.34.0 (Unreleased)
+## 1.33.2 (Unreleased)
+
+DEPRECATED:
+* Data Source: `tencentcloud_tcaplus_applications` replace by `tencentcloud_tcaplus_clusters`,optional arguments `app_id` and `app_name` are no longer supported, replace by `cluster_id` and `cluster_name`
+* Data Source: `tencentcloud_tcaplus_zones` replace by `tencentcloud_tcaplus_groups`,optional arguments `app_id`,`zone_id` and `zone_name` are no longer supported, replace by `cluster_id`,`group_id` and `cluster_name`
+* Data Source: `tencentcloud_tcaplus_tables` optional arguments `app_id` and `zone_id` are no longer supported, replace by `cluster_id` and `group_id`
+* Data Source: `tencentcloud_tcaplus_idls`: optional argument `app_id` is no longer supported, replace by `cluster_id`.
+* Resource: `tencentcloud_tcaplus_application` replace by `tencentcloud_tcaplus_cluster`,input argument `app_name` is no longer supported, replace by `cluster_name`
+* Resource: `tencentcloud_tcaplus_zone` replace by `tencentcloud_tcaplus_group`, input arguments `app_id` and `zone_name` are no longer supported, replace by `cluster_id` and `group_name`
+* Resource: `tencentcloud_tcaplus_idl` input arguments `app_id` and `zone_id` are no longer supported, replace by `cluster_id` and `group_id`
+* Resource: `tencentcloud_tcaplus_table` input arguments `app_id`and `zone_id` are no longer supported, replace by `cluster_id` and `group_id`
+* Resource: `tencentcloud_redis_instance`: optional argument `type` is no longer supported, replace by `type_id`.
+* Data Source: `tencentcloud_redis_instances`: output argument `type` is no longer supported, replace by `type_id`.
+* Data Source: `tencentcloud_redis_zone_config`: output argument `type` is no longer supported, replace by `type_id`.
+
 ## 1.33.1 (May 22, 2020)
 
 ENHANCEMENTS: 

tencentcloud/data_source_tc_tcaplus_applications.go

@@ -1,19 +1,19 @@
 /*
 
-Use this data source to query tcaplus applications
+Use this data source to query tcaplus clusters
 
 Example Usage
 
 ```hcl
-data "tencentcloud_tcaplus_applications" "name" {
-  app_name = "app"
+data "tencentcloud_tcaplus_clusters" "name" {
+  cluster_name = "cluster"
 }
-data "tencentcloud_tcaplus_applications" "id" {
-  app_id = tencentcloud_tcaplus_application.test.id
+data "tencentcloud_tcaplus_clusters" "id" {
+  cluster_id = tencentcloud_tcaplus_cluster.test.id
 }
-data "tencentcloud_tcaplus_applications" "idname" {
-  app_id   = tencentcloud_tcaplus_application.test.id
-  app_name = "app"
+data "tencentcloud_tcaplus_clusters" "idname" {
+  cluster_id   = tencentcloud_tcaplus_cluster.test.id
+  cluster_name = "cluster"
 }
 ```
 */
@@ -26,19 +26,19 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
-func dataSourceTencentCloudTcaplusApplications() *schema.Resource {
+func dataSourceTencentCloudTcaplusClusters() *schema.Resource {
 	return &schema.Resource{
-		Read: dataSourceTencentCloudTcaplusApplicationsRead,
+		Read: dataSourceTencentCloudTcaplusClustersRead,
 		Schema: map[string]*schema.Schema{
-			"app_name": {
+			"cluster_name": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Name of the tcapplus application to be query.",
+				Description: "Name of the tcaplus cluster to be query.",
 			},
-			"app_id": {
+			"cluster_id": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Id of the tcapplus application to be query.",
+				Description: "Id of the tcaplus cluster to be query.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,
@@ -48,68 +48,68 @@ func dataSourceTencentCloudTcaplusApplications() *schema.Resource {
 			"list": {
 				Type:        schema.TypeList,
 				Computed:    true,
-				Description: "A list of tcaplus application. Each element contains the following attributes.",
+				Description: "A list of tcaplus cluster. Each element contains the following attributes.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-						"app_name": {
+						"cluster_name": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Name of the tcapplus application.",
+							Description: "Name of the tcaplus cluster.",
 						},
-						"app_id": {
+						"cluster_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Id of the tcapplus application.",
+							Description: "Id of the tcaplus cluster.",
 						},
 						"idl_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Idl type of the tcapplus application.",
+							Description: "Idl type of the tcaplus cluster.",
 						},
 						"vpc_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "VPC id of the tcapplus application.",
+							Description: "VPC id of the tcaplus cluster.",
 						},
 						"subnet_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Subnet id of the tcapplus application.",
+							Description: "Subnet id of the tcaplus cluster.",
 						},
 						"password": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Password of the tcapplus application.",
+							Description: "Password of the tcaplus cluster.",
 						},
 						"network_type": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Network type of the tcapplus application.",
+							Description: "Network type of the tcaplus cluster.",
 						},
 						"create_time": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Create time of the tcapplus application.",
+							Description: "Create time of the tcaplus cluster.",
 						},
 						"password_status": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Password status of the tcapplus application.`unmodifiable` means:can not change password now,`modifiable` means:can change password now.",
+							Description: "Password status of the tcaplus cluster.`unmodifiable` means:can not change password now,`modifiable` means:can change password now.",
 						},
 						"api_access_id": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Access id of the tcapplus application.For TcaplusDB SDK connect.",
+							Description: "Access id of the tcaplus cluster.For TcaplusDB SDK connect.",
 						},
 						"api_access_ip": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "Access ip of the tcapplus application.For TcaplusDB SDK connect.",
+							Description: "Access ip of the tcaplus cluster.For TcaplusDB SDK connect.",
 						},
 						"api_access_port": {
 							Type:        schema.TypeInt,
 							Computed:    true,
-							Description: "Access port of the tcapplus application.For TcaplusDB SDK connect.",
+							Description: "Access port of the tcaplus cluster.For TcaplusDB SDK connect.",
 						},
 						"old_password_expire_time": {
 							Type:        schema.TypeString,
@@ -123,8 +123,8 @@ func dataSourceTencentCloudTcaplusApplications() *schema.Resource {
 	}
 }
 
-func dataSourceTencentCloudTcaplusApplicationsRead(d *schema.ResourceData, meta interface{}) error {
-	defer logElapsed("data_source.tencentcloud_tcaplus_applications.read")()
+func dataSourceTencentCloudTcaplusClustersRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("data_source.tencentcloud_tcaplus_clusters.read")()
 
 	logId := getLogId(contextNil)
 	ctx := context.WithValue(context.TODO(), "logId", logId)
@@ -133,39 +133,39 @@ func dataSourceTencentCloudTcaplusApplicationsRead(d *schema.ResourceData, meta
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 
-	applicationId := d.Get("app_id").(string)
-	applicationName := d.Get("app_name").(string)
+	clusterId := d.Get("cluster_id").(string)
+	clusterName := d.Get("cluster_name").(string)
 
-	apps, err := service.DescribeApps(ctx, applicationId, applicationName)
+	clusters, err := service.DescribeClusters(ctx, clusterId, clusterName)
 	if err != nil {
-		apps, err = service.DescribeApps(ctx, applicationId, applicationName)
+		clusters, err = service.DescribeClusters(ctx, clusterId, clusterName)
 	}
 
 	if err != nil {
 		return err
 	}
 
-	list := make([]map[string]interface{}, 0, len(apps))
+	list := make([]map[string]interface{}, 0, len(clusters))
 
-	for _, app := range apps {
+	for _, cluster := range clusters {
 		listItem := make(map[string]interface{})
-		listItem["app_name"] = *app.ClusterName
-		listItem["app_id"] = *app.ClusterId
-		listItem["idl_type"] = *app.IdlType
-		listItem["vpc_id"] = *app.VpcId
-		listItem["subnet_id"] = *app.SubnetId
-		listItem["password"] = *app.Password
-		listItem["network_type"] = *app.NetworkType
-		listItem["create_time"] = *app.CreatedTime
-		listItem["password_status"] = *app.PasswordStatus
-		listItem["api_access_id"] = *app.ApiAccessId
-		listItem["api_access_ip"] = *app.ApiAccessIp
-		listItem["api_access_port"] = *app.ApiAccessPort
-		listItem["old_password_expire_time"] = *app.OldPasswordExpireTime
+		listItem["cluster_name"] = cluster.ClusterName
+		listItem["cluster_id"] = cluster.ClusterId
+		listItem["idl_type"] = cluster.IdlType
+		listItem["vpc_id"] = cluster.VpcId
+		listItem["subnet_id"] = cluster.SubnetId
+		listItem["password"] = cluster.Password
+		listItem["network_type"] = cluster.NetworkType
+		listItem["create_time"] = cluster.CreatedTime
+		listItem["password_status"] = cluster.PasswordStatus
+		listItem["api_access_id"] = cluster.ApiAccessId
+		listItem["api_access_ip"] = cluster.ApiAccessIp
+		listItem["api_access_port"] = cluster.ApiAccessPort
+		listItem["old_password_expire_time"] = cluster.OldPasswordExpireTime
 		list = append(list, listItem)
 	}
 
-	d.SetId("app." + applicationId + "." + applicationName)
+	d.SetId("cluster." + clusterId + "." + clusterName)
 	if e := d.Set("list", list); e != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s\n", logId, e.Error())
 		return e

tencentcloud/data_source_tc_tcaplus_applications_test.go

@@ -6,71 +6,53 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-var testDataTcaplusApplicationsName = "data.tencentcloud_tcaplus_applications.id_test"
+var testDataTcaplusClustersName = "data.tencentcloud_tcaplus_clusters.id_test"
 
-func TestAccTencentCloudDataTcaplusApplications(t *testing.T) {
+func TestAccTencentCloudDataTcaplusClusters(t *testing.T) {
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckTcaplusApplicationDestroy,
+		CheckDestroy: testAccCheckTcaplusClusterDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccTencentCloudDataTcaplusApplicationsBaic,
+				Config: testAccTencentCloudDataTcaplusClustersBaic,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					testAccCheckTcaplusApplicationExists("tencentcloud_tcaplus_application.test_app"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "app_id"),
-					resource.TestCheckResourceAttr(testDataTcaplusApplicationsName, "list.#", "1"),
-					resource.TestCheckResourceAttr(testDataTcaplusApplicationsName, "list.0.app_name", "tf_tcaplus_data_guagua"),
-					resource.TestCheckResourceAttr(testDataTcaplusApplicationsName, "list.0.idl_type", "PROTO"),
-					resource.TestCheckResourceAttr(testDataTcaplusApplicationsName, "list.0.password", "1qaA2k1wgvfa3ZZZ"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "list.0.network_type"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "list.0.create_time"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "list.0.password_status"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "list.0.api_access_id"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "list.0.api_access_ip"),
-					resource.TestCheckResourceAttrSet(testDataTcaplusApplicationsName, "list.0.api_access_port"),
+					testAccCheckTcaplusClusterExists("tencentcloud_tcaplus_cluster.test_cluster"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "cluster_id"),
+					resource.TestCheckResourceAttr(testDataTcaplusClustersName, "list.#", "1"),
+					resource.TestCheckResourceAttr(testDataTcaplusClustersName, "list.0.cluster_name", "tf_tcaplus_data_guagua"),
+					resource.TestCheckResourceAttr(testDataTcaplusClustersName, "list.0.idl_type", "PROTO"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "list.0.network_type"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "list.0.create_time"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "list.0.password_status"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "list.0.api_access_id"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "list.0.api_access_ip"),
+					resource.TestCheckResourceAttrSet(testDataTcaplusClustersName, "list.0.api_access_port"),
 				),
 			},
 		},
 	})
 }
 
-const testAccTencentCloudDataTcaplusApplicationsBaic = `
+const testAccTencentCloudDataTcaplusClustersBaic = `
 variable "availability_zone" {
  default = "ap-shanghai-2"
 }
 
-variable "instance_name" {
- default = "` + defaultInsName + `"
-}
-variable "vpc_cidr" {
- default = "` + defaultVpcCidr + `"
-}
-variable "subnet_cidr" {
- default = "` + defaultSubnetCidr + `"
+data "tencentcloud_vpc_subnets" "vpc" {
+    is_default        = true
+    availability_zone = var.availability_zone
 }
 
-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
-  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_data_guagua"
-  vpc_id                   = tencentcloud_vpc.foo.id
-  subnet_id                = tencentcloud_subnet.subnet.id
+  cluster_name             = "tf_tcaplus_data_guagua"
+  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
 }
-data "tencentcloud_tcaplus_applications" "id_test" {
-  app_id = tencentcloud_tcaplus_application.test_app.id
+data "tencentcloud_tcaplus_clusters" "id_test" {
+  cluster_id = tencentcloud_tcaplus_cluster.test_cluster.id
 }
 `

tencentcloud/data_source_tc_tcaplus_idls.go

@@ -5,7 +5,7 @@ Example Usage
 
 ```hcl
 data "tencentcloud_tcaplus_idls" "id_test" {
-   app_id    = "19162256624"
+   cluster_id    = "19162256624"
 }
 ```
 */
@@ -24,10 +24,10 @@ func dataSourceTencentCloudTcaplusIdls() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceTencentCloudTcaplusIdlsRead,
 		Schema: map[string]*schema.Schema{
-			"app_id": {
+			"cluster_id": {
 				Type:        schema.TypeString,
 				Required:    true,
-				Description: "Id of the tcapplus application to be query.",
+				Description: "Id of the tcaplus cluster to be query.",
 			},
 			"result_output_file": {
 				Type:        schema.TypeString,
@@ -62,27 +62,27 @@ func dataSourceTencentCloudTcaplusIdlsRead(d *schema.ResourceData, meta interfac
 		client: meta.(*TencentCloudClient).apiV3Conn,
 	}
 
-	applicationId := d.Get("app_id").(string)
+	clusterId := d.Get("cluster_id").(string)
 
-	apps, err := service.DescribeIdlFileInfos(ctx, applicationId)
+	infos, err := service.DescribeIdlFileInfos(ctx, clusterId)
 	if err != nil {
-		apps, err = service.DescribeIdlFileInfos(ctx, applicationId)
+		infos, err = service.DescribeIdlFileInfos(ctx, clusterId)
 	}
 	if err != nil {
 		return err
 	}
 
-	list := make([]map[string]interface{}, 0, len(apps))
+	list := make([]map[string]interface{}, 0, len(infos))
 
-	for _, app := range apps {
+	for _, info := range infos {
 		listItem := make(map[string]interface{})
 		var tcaplusIdlId TcaplusIdlId
-		tcaplusIdlId.ApplicationId = applicationId
-		tcaplusIdlId.FileName = *app.FileName
-		tcaplusIdlId.FileType = *app.FileType
-		tcaplusIdlId.FileExtType = *app.FileExtType
-		tcaplusIdlId.FileSize = *app.FileSize
-		tcaplusIdlId.FileId = *app.FileId
+		tcaplusIdlId.ClusterId = clusterId
+		tcaplusIdlId.FileName = *info.FileName
+		tcaplusIdlId.FileType = *info.FileType
+		tcaplusIdlId.FileExtType = *info.FileExtType
+		tcaplusIdlId.FileSize = *info.FileSize
+		tcaplusIdlId.FileId = *info.FileId
 		id, err := json.Marshal(tcaplusIdlId)
 		if err != nil {
 			return fmt.Errorf("format idl id fail,%s", err.Error())
@@ -91,7 +91,7 @@ func dataSourceTencentCloudTcaplusIdlsRead(d *schema.ResourceData, meta interfac
 		list = append(list, listItem)
 	}
 
-	d.SetId("idl." + applicationId)
+	d.SetId("idl." + clusterId)
 	if e := d.Set("list", list); e != nil {
 		log.Printf("[CRITAL]%s provider set list fail, reason:%s\n", logId, e.Error())
 		return e