Merge pull request #602 from junchuguo/master

add cfs and tcr attribute

Author: gailwang

CHANGELOG.md

@@ -3,6 +3,8 @@
 ENHANCEMENTS:
 
 * Resource `tencentcloud_instance` add `cam_role_name` to support binding role to cvm instance.
+* Resource `tencentcloud_tcr_instance` add `open_public_network` to control public network access.
+* Resource `tencentcloud_cfs_file_system` add `storage_type` to change file service StorageType.
 
 BUG FIXES:
 

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/tencentcloud/tencentcloud-sdk-go v1.0.112
+	github.com/tencentcloud/tencentcloud-sdk-go v1.0.119
 	github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

go.sum

@@ -443,6 +443,8 @@ github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0K
 github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.112 h1:/vDVXeIWSVteNNJULedeWnqrcQxJlMDSQfxdwkc2XgI=
 github.com/tencentcloud/tencentcloud-sdk-go v1.0.112/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.119 h1:wjidEbe8rWoQNfUEzILykgi4SO1LYjC4tNRY7RN8chI=
+github.com/tencentcloud/tencentcloud-sdk-go v1.0.119/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
 github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=

tencentcloud/extension_cfs.go

@@ -4,6 +4,9 @@ const (
 	CFS_PROTOCOL_NFS  = "NFS"
 	CFS_PROTOCOL_CIFS = "CIFS"
 
+	CFS_STORAGETYPE_SD = "SD"
+	CFS_STORAGETYPE_HP = "HP"
+
 	CFS_FILE_SYSTEM_STATUS_CREATING = "creating"
 	CFS_FILE_SYSTEM_STATUS_SUCCESS  = "available"
 	CFS_FILE_SYSTEM_STATUS_FAILED   = "create_failed"
@@ -17,6 +20,11 @@ const (
 	CFS_USER_PERMISSION_NO_ROOT_SQUASH = "no_root_squash"
 )
 
+var CFS_STORAGETYPE = []string{
+	CFS_STORAGETYPE_SD,
+	CFS_STORAGETYPE_HP,
+}
+
 var CFS_PROTOCOL = []string{
 	CFS_PROTOCOL_NFS,
 	CFS_PROTOCOL_CIFS,

tencentcloud/resource_tc_cfs_file_system.go

@@ -72,6 +72,14 @@ func resourceTencentCloudCfsFileSystem() *schema.Resource {
 				ForceNew:     true,
 				Description:  "File service protocol. Valid values are `NFS` and `CIFS`. and the default is `NFS`.",
 			},
+			"storage_type": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     CFS_STORAGETYPE_SD,
+				ForceNew:    true,
+				Description: "File service StorageType. Valid values are `SD` and `HP`. and the default is `SD`.",
+			},
+
 			"vpc_id": {
 				Type:        schema.TypeString,
 				Required:    true,
@@ -121,14 +129,15 @@ func resourceTencentCloudCfsFileSystemCreate(d *schema.ResourceData, meta interf
 	request.Protocol = helper.String(d.Get("protocol").(string))
 	request.VpcId = helper.String(d.Get("vpc_id").(string))
 	request.SubnetId = helper.String(d.Get("subnet_id").(string))
+	request.StorageType = helper.String(d.Get("storage_type").(string))
 	if v, ok := d.GetOk("name"); ok {
 		request.FsName = helper.String(v.(string))
 	}
 	if v, ok := d.GetOk("mount_ip"); ok {
 		request.MountIP = helper.String(v.(string))
 	}
 	request.NetInterface = helper.String("VPC")
-	request.StorageType = helper.String("SD")
+	request.StorageType = helper.String(d.Get("storage_type").(string))
 
 	fsId := ""
 	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -218,6 +227,7 @@ func resourceTencentCloudCfsFileSystemRead(d *schema.ResourceData, meta interfac
 	_ = d.Set("access_group_id", fileSystem.PGroup.PGroupId)
 	_ = d.Set("protocol", fileSystem.Protocol)
 	_ = d.Set("create_time", fileSystem.CreationTime)
+	_ = d.Set("storage_type", fileSystem.StorageType)
 
 	var mountTarget *cfs.MountInfo
 	err = resource.Retry(readRetryTimeout, func() *resource.RetryError {

tencentcloud/resource_tc_cfs_file_system_test.go

@@ -143,6 +143,7 @@ resource "tencentcloud_cfs_file_system" "foo" {
   protocol = "NFS"
   vpc_id = tencentcloud_vpc.vpc.id
   subnet_id = tencentcloud_subnet.subnet.id
+  storage_type = "SD"
 }
 `
 
@@ -172,6 +173,7 @@ resource "tencentcloud_cfs_file_system" "foo" {
   protocol = "NFS"
   vpc_id = tencentcloud_vpc.vpc.id
   subnet_id = tencentcloud_subnet.subnet.id
+  storage_type = "SD"
   
   tags = {
 	  test = "test-tf"

tencentcloud/resource_tc_tcr_instance.go

@@ -62,12 +62,24 @@ func resourceTencentCloudTcrInstance() *schema.Resource {
 				ForceNew:    true,
 				Description: "The available tags within this TCR instance.",
 			},
+			"open_public_operation": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				ForceNew:    true,
+				Default:     false,
+				Description: "Control public network access.",
+			},
 			//Computed values
 			"status": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "Status of the TCR instance.",
 			},
+			"public_status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Status of the TCR instance public network access.",
+			},
 			"public_domain": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -97,11 +109,13 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac
 	tcrService := TCRService{client: meta.(*TencentCloudClient).apiV3Conn}
 
 	var (
-		name          = d.Get("name").(string)
-		insType       = d.Get("instance_type").(string)
-		tags          = helper.GetTags(d, "tags")
-		outErr, inErr error
-		instanceId    string
+		name           = d.Get("name").(string)
+		insType        = d.Get("instance_type").(string)
+		tags           = helper.GetTags(d, "tags")
+		outErr, inErr  error
+		instanceId     string
+		instanceStatus string
+		operation      bool
 	)
 
 	outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
@@ -123,6 +137,7 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac
 		if err != nil {
 			return retryError(err)
 		} else if has && *instance.Status == "Running" {
+			instanceStatus = "Running"
 			return nil
 		} else if !has {
 			return resource.NonRetryableError(fmt.Errorf("create tcr instance fail"))
@@ -134,6 +149,25 @@ func resourceTencentCloudTcrInstanceCreate(d *schema.ResourceData, meta interfac
 	if err != nil {
 		return err
 	}
+	if instanceStatus == "Running" {
+		outErr = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+			if v, ok := d.GetOk("open_public_operation"); ok {
+				operation = v.(bool)
+				if operation {
+					inErr = tcrService.ManageTCRExternalEndpoint(ctx, instanceId, "Create")
+				} else {
+					inErr = tcrService.ManageTCRExternalEndpoint(ctx, instanceId, "Delete")
+				}
+				if inErr != nil {
+					return retryError(inErr)
+				}
+			}
+			return nil
+		})
+		if outErr != nil {
+			return outErr
+		}
+	}
 
 	return resourceTencentCloudTcrInstanceRead(d, meta)
 }
@@ -164,11 +198,35 @@ func resourceTencentCloudTcrInstanceRead(d *schema.ResourceData, meta interface{
 		return nil
 	}
 
+	publicStatus, has, outErr := tcrService.DescribeExternalEndpointStatus(ctx, d.Id())
+	if outErr != nil {
+		outErr = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			publicStatus, has, inErr = tcrService.DescribeExternalEndpointStatus(ctx, d.Id())
+			if inErr != nil {
+				return retryError(inErr)
+			}
+			return nil
+		})
+	}
+	if outErr != nil {
+		return outErr
+	}
+	if !has {
+		d.SetId("")
+		return nil
+	}
+	if publicStatus == "Opening" || publicStatus == "Opened" {
+		_ = d.Set("open_public_operation", true)
+	} else if publicStatus == "Closed" {
+		_ = d.Set("open_public_operation", false)
+	}
+
 	_ = d.Set("name", instance.RegistryName)
 	_ = d.Set("instance_type", instance.RegistryType)
 	_ = d.Set("status", instance.Status)
 	_ = d.Set("public_domain", instance.PublicDomain)
 	_ = d.Set("internal_end_point", instance.InternalEndpoint)
+	_ = d.Set("public_status", publicStatus)
 
 	tags := make(map[string]string, len(instance.TagSpecification.Tags))
 	for _, tag := range instance.TagSpecification.Tags {

tencentcloud/resource_tc_tcr_instance_test.go

@@ -18,7 +18,7 @@ func TestAccTencentCloudTCRInstance_basic_and_update(t *testing.T) {
 			{
 				Config: testAccTCRInstance_basic,
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "name", "testacctcrinstance"),
+					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "name", "testacctcrinstance1"),
 					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "instance_type", "basic"),
 					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "tags.test", "test"),
 					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "delete_bucket", "true"),
@@ -38,8 +38,9 @@ func TestAccTencentCloudTCRInstance_basic_and_update(t *testing.T) {
 				Config: testAccTCRInstance_basic_update_remark,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckTCRInstanceExists("tencentcloud_tcr_instance.mytcr_instance"),
-					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "tags.tf", "tf"),
+					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "tags.test", "test"),
 					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "delete_bucket", "true"),
+					resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "open_public_operation", "true"),
 				),
 			},
 		},
@@ -93,7 +94,7 @@ func testAccCheckTCRInstanceExists(n string) resource.TestCheckFunc {
 
 const testAccTCRInstance_basic = `
 resource "tencentcloud_tcr_instance" "mytcr_instance" {
-  name        = "testacctcrinstance"
+  name        = "testacctcrinstance1"
   instance_type = "basic"
   delete_bucket = true
 
@@ -104,11 +105,11 @@ resource "tencentcloud_tcr_instance" "mytcr_instance" {
 
 const testAccTCRInstance_basic_update_remark = `
 resource "tencentcloud_tcr_instance" "mytcr_instance" {
-  name        = "testacctcrinstance"
+  name        = "testacctcrinstance1"
   instance_type = "basic"
   delete_bucket = true
-
+  open_public_operation = true
   tags ={
-	tf = "tf"
+	test = "test"
   }
 }`

tencentcloud/service_tencentcloud_tcr.go

@@ -51,6 +51,59 @@ func (me *TCRService) CreateTCRInstance(ctx context.Context, name string, instan
 	return
 }
 
+func (me *TCRService) ManageTCRExternalEndpoint(ctx context.Context, instanceId, operation string) (errRet error) {
+	logId := getLogId(ctx)
+	request := tcr.NewManageExternalEndpointRequest()
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), errRet.Error())
+		}
+	}()
+	request.Operation = &operation
+	request.RegistryId = &instanceId
+
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseTCRClient().ManageExternalEndpoint(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	if response == nil || response.Response == nil || response.Response.RegistryId == nil {
+		errRet = fmt.Errorf("TencentCloud SDK return nil response, %s", request.GetAction())
+	}
+
+	return
+}
+
+func (me *TCRService) DescribeExternalEndpointStatus(ctx context.Context, instanceId string) (status string, has bool, errRet error) {
+	logId := getLogId(ctx)
+	request := tcr.NewDescribeExternalEndpointStatusRequest()
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail,reason[%s]", logId, request.GetAction(), errRet.Error())
+		}
+	}()
+	request.RegistryId = &instanceId
+
+	ratelimit.Check(request.GetAction())
+	response, err := me.client.UseTCRClient().DescribeExternalEndpointStatus(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	if response == nil || response.Response == nil {
+		errRet = fmt.Errorf("TencentCloud SDK return nil response, %s", request.GetAction())
+		return
+	}
+	if response.Response.Status == nil {
+		errRet = fmt.Errorf("TencentCloud SDK return more than one instances, instanceId %s, %s", instanceId, request.GetAction())
+		return
+	}
+	has = true
+	status = *response.Response.Status
+	return
+}
+
 func (me *TCRService) DescribeTCRInstanceById(ctx context.Context, instanceId string) (instance *tcr.Registry, has bool, errRet error) {
 	logId := getLogId(ctx)
 	request := tcr.NewDescribeInstancesRequest()