Merge pull request #1 from terraform-providers/master

update form master

Author: Himer

CHANGELOG.md

@@ -1,4 +1,11 @@
-## 1.30.2 (Unreleased)
+## 1.31.0 (Unreleased)
+## 1.30.3 (February 24, 2020)
+
+BUG FIXES:
+
+* Resource: `tencentcloud_instance` fix that classic network does not support([#339](https://github.com/terraform-providers/terraform-provider-tencentcloud/issues/339)).
+
+## 1.30.2 (February 17, 2020)
 
 ENHANCEMENTS:
 

tencentcloud/resource_tc_instance.go

@@ -445,19 +445,17 @@ func resourceTencentCloudInstanceCreate(d *schema.ResourceData, meta interface{}
 	}
 
 	// vpc
-	request.VirtualPrivateCloud = &cvm.VirtualPrivateCloud{}
 	if v, ok := d.GetOk("vpc_id"); ok {
+		request.VirtualPrivateCloud = &cvm.VirtualPrivateCloud{}
 		request.VirtualPrivateCloud.VpcId = helper.String(v.(string))
-	} else {
-		request.VirtualPrivateCloud.VpcId = helper.String("DEFAULT")
-	}
-	if v, ok := d.GetOk("subnet_id"); ok {
-		request.VirtualPrivateCloud.SubnetId = helper.String(v.(string))
-	} else {
-		request.VirtualPrivateCloud.SubnetId = helper.String("DEFAULT")
-	}
-	if v, ok := d.GetOk("private_ip"); ok {
-		request.VirtualPrivateCloud.PrivateIpAddresses = []*string{helper.String(v.(string))}
+
+		if v, ok = d.GetOk("subnet_id"); ok {
+			request.VirtualPrivateCloud.SubnetId = helper.String(v.(string))
+		}
+
+		if v, ok = d.GetOk("private_ip"); ok {
+			request.VirtualPrivateCloud.PrivateIpAddresses = []*string{helper.String(v.(string))}
+		}
 	}
 
 	if v, ok := d.GetOk("security_groups"); ok {

tencentcloud/service_tencentcloud_cvm.go

@@ -184,9 +184,11 @@ func (me *CvmService) ModifyVpc(ctx context.Context, instanceId, vpcId, subnetId
 	request := cvm.NewModifyInstancesVpcAttributeRequest()
 	request.InstanceIds = []*string{&instanceId}
 	request.VirtualPrivateCloud = &cvm.VirtualPrivateCloud{
-		VpcId:              &vpcId,
-		SubnetId:           &subnetId,
-		PrivateIpAddresses: []*string{&privateIp},
+		VpcId:    &vpcId,
+		SubnetId: &subnetId,
+	}
+	if privateIp != "" {
+		request.VirtualPrivateCloud.PrivateIpAddresses = []*string{&privateIp}
 	}
 
 	ratelimit.Check(request.GetAction())