tencentcloudstack · oliverpei · Nov 13, 2019 · Aug 28, 2019 · Aug 28, 2019 · Aug 28, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,18 @@
-## 1.22.1 (Unreleased)
+## 1.23.0 (Unreleased)
+
+FEATURES:
+
+* **New Data Source**: `tencentcloud_images`
+* **Provider TencentCloud**: add `security_token` argument
 
 ENHANCEMENTS:
 
+* All api calls now using api3.0
 * Resource: `tencentcloud_eip` add optional argument `tags`.
 * Data Source: `tencentcloud_eips` add optional argument `tags`.
 
 BUG FIXES:
+
 * Fixed docs of CAM
 
 ## 1.22.0 (November 05, 2019)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 ## Requirements
 
 * [Terraform](https://www.terraform.io/downloads.html) 0.12.x
-* [Go](https://golang.org/doc/install) 1.13 (to build the provider plugin)
+* [Go](https://golang.org/doc/install) 1.13.x (to build the provider plugin)
 
 ## Usage
 

diff --git a/examples/tencentcloud-cbs/main.tf b/examples/tencentcloud-cbs/main.tf
@@ -11,19 +11,15 @@ resource "tencentcloud_cbs_storage" "my_storage" {
   }
 }
 
-data "tencentcloud_image" "my_favorate_image" {
-  os_name = "centos"
-
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 resource "tencentcloud_instance" "my_instance" {
   instance_name     = "tf-test-instance"
   availability_zone = "${var.availability_zone}"
-  image_id          = "${data.tencentcloud_image.my_favorate_image.image_id}"
+  image_id          = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   instance_type     = "${var.instance_type}"
   system_disk_type  = "${var.storage_type}"
 }

diff --git a/examples/tencentcloud-clb/main.tf b/examples/tencentcloud-clb/main.tf
@@ -67,7 +67,7 @@ resource "tencentcloud_clb_listener" "listener_https" {
   port                 = 443
   protocol             = "HTTPS"
   certificate_ssl_mode = "UNIDIRECTIONAL"
-  certificate_id       = "VfqcL1ME"
+  certificate_id       = "VfqO4zkB"
 }
 
 resource "tencentcloud_clb_listener_rule" "rule_https" {

diff --git a/examples/tencentcloud-container-cluster-instance/main.tf b/examples/tencentcloud-container-cluster-instance/main.tf
diff --git a/examples/tencentcloud-container-cluster/main.tf b/examples/tencentcloud-container-cluster/main.tf
diff --git a/examples/tencentcloud-container-cluster/variables.tf b/examples/tencentcloud-container-cluster/variables.tf
diff --git a/examples/tencentcloud-eip-association/main.tf b/examples/tencentcloud-eip-association/main.tf
@@ -1,10 +1,6 @@
-data "tencentcloud_image" "my_favorate_image" {
-  os_name = "centos"
-
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 data "tencentcloud_instance_types" "my_favorate_instance_types" {
@@ -22,17 +18,15 @@ data "tencentcloud_availability_zones" "my_favorate_zones" {}
 resource "tencentcloud_instance" "my_instance" {
   instance_name     = "terraform_automation_test_kuruk"
   availability_zone = "${data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name}"
-  image_id          = "${data.tencentcloud_image.my_favorate_image.image_id}"
+  image_id          = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   instance_type     = "${data.tencentcloud_instance_types.my_favorate_instance_types.instance_types.0.instance_type}"
 
-  system_disk_type = "CLOUD_BASIC"
+  system_disk_type = "CLOUD_PREMIUM"
 
-  data_disks = [
-    {
-      data_disk_type = "CLOUD_BASIC"
-      data_disk_size = 70
-    },
-  ]
+  data_disks {
+    data_disk_type = "CLOUD_PREMIUM"
+    data_disk_size = 70
+  }
 
   disable_security_service = true
   disable_monitor_service  = true

diff --git a/examples/tencentcloud-eni/main.tf b/examples/tencentcloud-eni/main.tf
@@ -47,13 +47,9 @@ resource "tencentcloud_eni" "foo" {
   }
 }
 
-data "tencentcloud_image" "my_favorite_image" {
-  os_name = "centos"
-
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 data "tencentcloud_instance_types" "my_favorite_instance_types" {
@@ -69,7 +65,7 @@ data "tencentcloud_instance_types" "my_favorite_instance_types" {
 resource "tencentcloud_instance" "foo" {
   instance_name            = "ci-test-eni-attach"
   availability_zone        = "ap-guangzhou-3"
-  image_id                 = "${data.tencentcloud_image.my_favorite_image.image_id}"
+  image_id                 = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   instance_type            = "${data.tencentcloud_instance_types.my_favorite_instance_types.instance_types.0.instance_type}"
   system_disk_type         = "CLOUD_PREMIUM"
   disable_security_service = true

diff --git a/examples/tencentcloud-instance-security-groups/main.tf b/examples/tencentcloud-instance-security-groups/main.tf
@@ -1,10 +1,6 @@
-data "tencentcloud_image" "my_favorate_image" {
-  os_name = "${var.os_name}"
-
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 data "tencentcloud_instance_types" "my_favorate_instance_types" {
@@ -27,7 +23,7 @@ resource "tencentcloud_security_group" "my_sg" {
 resource "tencentcloud_security_group_rule" "web" {
   security_group_id = "${tencentcloud_security_group.my_sg.id}"
   type              = "ingress"
-  cidr_ip           = "115.158.44.225/30"
+  cidr_ip           = "115.158.44.225/32"
   ip_protocol       = "tcp"
   port_range        = "80,3000,8080"
   policy            = "accept"
@@ -36,7 +32,7 @@ resource "tencentcloud_security_group_rule" "web" {
 resource "tencentcloud_security_group_rule" "login" {
   security_group_id = "${tencentcloud_security_group.my_sg.id}"
   type              = "ingress"
-  cidr_ip           = "119.28.86.93/0"
+  cidr_ip           = "119.28.86.93/32"
   ip_protocol       = "tcp"
   port_range        = "22"
   policy            = "accept"
@@ -50,7 +46,7 @@ resource "tencentcloud_security_group" "my_sg2" {
 resource "tencentcloud_security_group_rule" "qortex" {
   security_group_id = "${tencentcloud_security_group.my_sg2.id}"
   type              = "ingress"
-  cidr_ip           = "119.28.86.93/0"
+  cidr_ip           = "119.28.86.93/32"
   ip_protocol       = "tcp"
   port_range        = "5000"
   policy            = "accept"
@@ -59,9 +55,10 @@ resource "tencentcloud_security_group_rule" "qortex" {
 resource "tencentcloud_instance" "instance-without-specified-image-id-example" {
   instance_name     = "${var.instance_name}"
   availability_zone = "${data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name}"
-  image_id          = "${data.tencentcloud_image.my_favorate_image.image_id}"
+  image_id          = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   instance_type     = "${data.tencentcloud_instance_types.my_favorate_instance_types.instance_types.0.instance_type}"
   password          = "test1234"
+  system_disk_type  = "CLOUD_PREMIUM"
 
   security_groups = [
     "${tencentcloud_security_group.my_sg.id}",

diff --git a/examples/tencentcloud-instance-vpc/main.tf b/examples/tencentcloud-instance-vpc/main.tf
@@ -1,10 +1,6 @@
-data "tencentcloud_image" "my_favorate_image" {
-  os_name = "${var.os_name}"
-
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 data "tencentcloud_instance_types" "my_favorate_instance_types" {
@@ -36,8 +32,9 @@ resource "tencentcloud_subnet" "my_subnet" {
 resource "tencentcloud_instance" "instance-vpc-example" {
   instance_name     = "${var.instance_name}"
   availability_zone = "${data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name}"
-  image_id          = "${data.tencentcloud_image.my_favorate_image.image_id}"
+  image_id          = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   instance_type     = "${data.tencentcloud_instance_types.my_favorate_instance_types.instance_types.0.instance_type}"
+  system_disk_type  = "CLOUD_PREMIUM"
 
   vpc_id    = "${tencentcloud_vpc.my_vpc.id}"
   subnet_id = "${tencentcloud_subnet.my_subnet.id}"

diff --git a/examples/tencentcloud-instance/main.tf b/examples/tencentcloud-instance/main.tf
@@ -1,10 +1,6 @@
-data "tencentcloud_image" "my_favorate_image" {
-  os_name = "${var.os_name}"
-
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 data "tencentcloud_instance_types" "my_favorate_instance_types" {
@@ -24,15 +20,13 @@ resource "tencentcloud_key_pair" "random_key" {
   public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDjd8fTnp7Dcuj4mLaQxf9Zs/ORgUL9fQxRCNKkPgP1paTy1I513maMX126i36Lxxl3+FUB52oVbo/FgwlIfX8hyCnv8MCxqnuSDozf1CD0/wRYHcTWAtgHQHBPCC2nJtod6cVC3kB18KeV4U7zsxmwFeBIxojMOOmcOBuh7+trRw=="
 }
 
-resource "tencentcloud_instance" "instance-without-specified-image-id-example" {
+resource "tencentcloud_instance" "foo" {
   instance_name     = "${var.instance_name}"
   availability_zone = "${data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name}"
-  image_id          = "${data.tencentcloud_image.my_favorate_image.image_id}"
+  image_id          = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   instance_type     = "${data.tencentcloud_instance_types.my_favorate_instance_types.instance_types.0.instance_type}"
   key_name          = "${tencentcloud_key_pair.random_key.id}"
-
-  //  instance_charge_type                = "PREPAID"
-  //  instance_charge_type_prepaid_period = 1
+  system_disk_type  = "CLOUD_PREMIUM"
 
   disable_monitor_service    = true
   internet_max_bandwidth_out = 2

diff --git a/examples/tencentcloud-nat/main.tf b/examples/tencentcloud-nat/main.tf
@@ -1,10 +1,8 @@
 data "tencentcloud_availability_zones" "my_favorate_zones" {}
 
-data "tencentcloud_image" "my_favorate_image" {
-  filter {
-    name   = "image-type"
-    values = ["PUBLIC_IMAGE"]
-  }
+data "tencentcloud_images" "my_favorate_image" {
+  image_type = ["PUBLIC_IMAGE"]
+  os_name    = "centos"
 }
 
 # Create VPC and Subnet
@@ -45,16 +43,17 @@ resource "tencentcloud_nat_gateway" "my_nat" {
 # Create CVM
 resource "tencentcloud_instance" "foo" {
   availability_zone = "${data.tencentcloud_availability_zones.my_favorate_zones.zones.0.name}"
-  image_id          = "${data.tencentcloud_image.my_favorate_image.image_id}"
+  image_id          = "${data.tencentcloud_images.my_favorate_image.images.0.image_id}"
   vpc_id            = "${tencentcloud_vpc.main.id}"
   subnet_id         = "${tencentcloud_subnet.main_subnet.id}"
+  system_disk_type  = "CLOUD_PREMIUM"
 }
 
 # Add DNAT Entry
 resource "tencentcloud_dnat" "dev_dnat" {
   vpc_id       = "${tencentcloud_nat_gateway.my_nat.vpc_id}"
   nat_id       = "${tencentcloud_nat_gateway.my_nat.id}"
-  protocol     = "tcp"
+  protocol     = "TCP"
   elastic_ip   = "${tencentcloud_eip.eip_dev_dnat.public_ip}"
   elastic_port = "80"
   private_ip   = "${tencentcloud_instance.foo.private_ip}"
@@ -64,7 +63,7 @@ resource "tencentcloud_dnat" "dev_dnat" {
 resource "tencentcloud_dnat" "test_dnat" {
   vpc_id       = "${tencentcloud_nat_gateway.my_nat.vpc_id}"
   nat_id       = "${tencentcloud_nat_gateway.my_nat.id}"
-  protocol     = "udp"
+  protocol     = "UDP"
   elastic_ip   = "${tencentcloud_eip.eip_test_dnat.public_ip}"
   elastic_port = "8080"
   private_ip   = "${tencentcloud_instance.foo.private_ip}"

diff --git a/gendoc/gendoc_test.go b/gendoc/gendoc_test.go
@@ -83,15 +83,15 @@ resource "tencentcloud_cos_bucket" "mycos" {
 func TestContainsBigSymbol(t *testing.T) {
 	cases := "中国人繁體字ａｂｃＡＢＣ～！＠＃￥％…＆（）—＋｛｝｜：“”《》？１２３４５６７８９０－＝【】＼；‘’，。、　"
 	for _, c := range cases {
-		if ContainsBigSymbol(string(c)) == "" {
+		if containsBigSymbol(string(c)) == "" {
 			t.Log(c)
 			t.Errorf("Expected %s to be Chinese symbol", string(c))
 		}
 	}
 
 	cases = "abcABC~!@#$%^&*()_+{}|:\"<>?`1234567890-=[]\\;',./ \t\r\n"
 	for _, c := range cases {
-		if ContainsBigSymbol(string(c)) != "" {
+		if containsBigSymbol(string(c)) != "" {
 			t.Errorf("Expected %s not to be Chinese symbol", string(c))
 		}
 	}