Merge pull request #1462 from tencentcloudstack/feat/add_cvm_hpc

Feat/add cvm hpc

Author: tongyiming

.changelog/1462.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+tencentcloud_cvm_hpc_cluster
+```

go.mod

@@ -35,8 +35,8 @@ require (
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.549
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.542

go.sum

@@ -527,8 +527,12 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.547/go.mod
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.548/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.549 h1:j/bk6BVbnhiCU9jIbIQlEwWmLn4FUzEbNPZUC/wKnVo=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.549/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553 h1:RB8GWKSifv5QdBQUUWfzCo06FU4mmqH1VG7dTWMm5nQ=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445 h1:Bh7XD0ypNMHYyBOM8hhKsSu+y0VVKUnJVS+YKKhfpGg=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445/go.mod h1:jMDD351efCFpT1+KVFbcpu6SbmP4TYmp4qkoCfr63nQ=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553 h1:Pl1kYgFhJp0QSoVFSzRsiGk+HfEAkBTQg7+O60tytNA=
+github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553/go.mod h1:dnnqPxXYK+kax3e1MKo/PI3iWJtytm6ogWKQHJS7SGE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488 h1:A1seXWtMf2atBjSNYvcwxyDoFzCMgqyVnsxnWzhqJEA=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488/go.mod h1:T8mL4dQLkPTL6VtVMeBYol3asSUS53ycP9PJf5Qp1GE=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 h1:D8qrelkK5udv8RzJJIABMzItGIyaZoYnxEVeIsYqiNw=

tencentcloud/provider.go

@@ -292,6 +292,7 @@ Cloud Virtual Machine(CVM)
     tencentcloud_placement_group
     tencentcloud_reserved_instance
     tencentcloud_image
+	tencentcloud_cvm_hpc_cluster
 
 TDSQL-C MySQL(CynosDB)
   Data Source
@@ -1498,6 +1499,7 @@ func Provider() terraform.ResourceProvider {
 			"tencentcloud_tdmq_rocketmq_environment_role":             resourceTencentCloudTdmqRocketmqEnvironmentRole(),
 			"tencentcloud_dts_migrate_job":                            resourceTencentCloudDtsMigrateJob(),
 			"tencentcloud_dts_compare_task":                           resourceTencentCloudDtsCompareTask(),
+			"tencentcloud_cvm_hpc_cluster":                            resourceTencentCloudCvmHpcCluster(),
 		},
 
 		ConfigureFunc: providerConfigure,

tencentcloud/resource_tc_cvm_hpc_cluster.go

@@ -0,0 +1,206 @@
+/*
+Provides a resource to create a cvm hpc_cluster
+
+Example Usage
+
+```hcl
+resource "tencentcloud_cvm_hpc_cluster" "hpc_cluster" {
+  zone = "ap-beijing-6"
+  name = "terraform-test"
+  remark = "create for test"
+}
+```
+
+Import
+
+cvm hpc_cluster can be imported using the id, e.g.
+
+```
+terraform import tencentcloud_cvm_hpc_cluster.hpc_cluster hpc_cluster_id
+```
+*/
+package tencentcloud
+
+import (
+	"context"
+	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+	"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
+	"log"
+)
+
+func resourceTencentCloudCvmHpcCluster() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceTencentCloudCvmHpcClusterCreate,
+		Read:   resourceTencentCloudCvmHpcClusterRead,
+		Update: resourceTencentCloudCvmHpcClusterUpdate,
+		Delete: resourceTencentCloudCvmHpcClusterDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Schema: map[string]*schema.Schema{
+			"zone": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "Available zone.",
+			},
+
+			"name": {
+				Required:    true,
+				Type:        schema.TypeString,
+				Description: "Name of Hpc Cluster.",
+			},
+
+			"remark": {
+				Optional:    true,
+				Type:        schema.TypeString,
+				Description: "Remark of Hpc Cluster.",
+			},
+		},
+	}
+}
+
+func resourceTencentCloudCvmHpcClusterCreate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_cvm_hpc_cluster.create")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	var (
+		request      = cvm.NewCreateHpcClusterRequest()
+		response     = cvm.NewCreateHpcClusterResponse()
+		hpcClusterId string
+	)
+	if v, ok := d.GetOk("zone"); ok {
+		request.Zone = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("name"); ok {
+		request.Name = helper.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("remark"); ok {
+		request.Remark = helper.String(v.(string))
+	}
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCvmClient().CreateHpcCluster(request)
+		if e != nil {
+			return retryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		response = result
+		return nil
+	})
+	if err != nil {
+		log.Printf("[CRITAL]%s create cvm hpcCluster failed, reason:%+v", logId, err)
+		return err
+	}
+
+	if len(response.Response.HpcClusterSet) < 1 {
+		return fmt.Errorf("resource `tencentcloud_cvm_hpc_cluster` create failed.")
+	}
+
+	hpcClusterId = *response.Response.HpcClusterSet[0].HpcClusterId
+	d.SetId(hpcClusterId)
+
+	return resourceTencentCloudCvmHpcClusterRead(d, meta)
+}
+
+func resourceTencentCloudCvmHpcClusterRead(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_cvm_hpc_cluster.read")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := CvmService{client: meta.(*TencentCloudClient).apiV3Conn}
+
+	hpcClusterId := d.Id()
+
+	hpcCluster, err := service.DescribeCvmHpcClusterById(ctx, hpcClusterId)
+	if err != nil {
+		return err
+	}
+
+	if hpcCluster == nil {
+		d.SetId("")
+		return fmt.Errorf("resource `tencentcloud_cvm_hpc_cluster` %s does not exist", d.Id())
+	}
+
+	if hpcCluster.Zone != nil {
+		_ = d.Set("zone", hpcCluster.Zone)
+	}
+
+	if hpcCluster.Name != nil {
+		_ = d.Set("name", hpcCluster.Name)
+	}
+
+	if hpcCluster.Remark != nil {
+		_ = d.Set("remark", hpcCluster.Remark)
+	}
+
+	return nil
+}
+
+func resourceTencentCloudCvmHpcClusterUpdate(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_cvm_hpc_cluster.update")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+
+	request := cvm.NewModifyHpcClusterAttributeRequest()
+
+	hpcClusterId := d.Id()
+
+	request.HpcClusterId = &hpcClusterId
+
+	if d.HasChange("name") {
+		if v, ok := d.GetOk("name"); ok {
+			request.Name = helper.String(v.(string))
+		}
+	}
+
+	if d.HasChange("remark") {
+		if v, ok := d.GetOk("remark"); ok {
+			request.Remark = helper.String(v.(string))
+		}
+	}
+
+	err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
+		result, e := meta.(*TencentCloudClient).apiV3Conn.UseCvmClient().ModifyHpcClusterAttribute(request)
+		if e != nil {
+			return retryError(e)
+		} else {
+			log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
+		}
+		return nil
+	})
+	if err != nil {
+		log.Printf("[CRITAL]%s create cvm hpcCluster failed, reason:%+v", logId, err)
+		return nil
+	}
+
+	return resourceTencentCloudCvmHpcClusterRead(d, meta)
+}
+
+func resourceTencentCloudCvmHpcClusterDelete(d *schema.ResourceData, meta interface{}) error {
+	defer logElapsed("resource.tencentcloud_cvm_hpc_cluster.delete")()
+	defer inconsistentCheck(d, meta)()
+
+	logId := getLogId(contextNil)
+	ctx := context.WithValue(context.TODO(), logIdKey, logId)
+
+	service := CvmService{client: meta.(*TencentCloudClient).apiV3Conn}
+	hpcClusterId := d.Id()
+
+	if err := service.DeleteCvmHpcClusterById(ctx, hpcClusterId); err != nil {
+		return nil
+	}
+
+	return nil
+}

tencentcloud/resource_tc_cvm_hpc_cluster_test.go

@@ -0,0 +1,37 @@
+package tencentcloud
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"testing"
+)
+
+func TestAccTencentCloudNeedFixCvmHpcClusterResource_basic(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCvmHpcCluster,
+				Check:  resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_cvm_hpc_cluster.hpc_cluster", "id")),
+			},
+			{
+				ResourceName:      "tencentcloud_cvm_hpc_cluster.hpc_cluster",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+const testAccCvmHpcCluster = `
+
+resource "tencentcloud_cvm_hpc_cluster" "hpc_cluster" {
+  zone = "ap-beijing-6"
+  name = "terraform-test"
+  remark = "create for test"
+}
+
+`

tencentcloud/service_tencentcloud_cvm.go

@@ -1253,3 +1253,74 @@ func (me *CvmService) ResizeInstanceDisks(ctx context.Context, request *cvm.Resi
 
 	return
 }
+
+func (me *CvmService) DescribeCvmHpcClusterById(ctx context.Context, hpcClusterId string) (hpcCluster *cvm.HpcClusterInfo, errRet error) {
+	logId := getLogId(ctx)
+
+	request := cvm.NewDescribeHpcClustersRequest()
+	request.HpcClusterIds = []*string{&hpcClusterId}
+
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
+		}
+	}()
+
+	ratelimit.Check(request.GetAction())
+
+	var (
+		offset uint64 = 0
+		limit  uint64 = 20
+	)
+	instances := make([]*cvm.HpcClusterInfo, 0)
+	for {
+		request.Offset = &offset
+		request.Limit = &limit
+		response, err := me.client.UseCvmClient().DescribeHpcClusters(request)
+		if err != nil {
+			errRet = err
+			return
+		}
+		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+		if response == nil || len(response.Response.HpcClusterSet) < 1 {
+			break
+		}
+		instances = append(instances, response.Response.HpcClusterSet...)
+		if len(response.Response.HpcClusterSet) < int(limit) {
+			break
+		}
+
+		offset += limit
+	}
+
+	if len(instances) < 1 {
+		return
+	}
+	hpcCluster = instances[0]
+	return
+}
+
+func (me *CvmService) DeleteCvmHpcClusterById(ctx context.Context, hpcClusterId string) (errRet error) {
+	logId := getLogId(ctx)
+
+	request := cvm.NewDeleteHpcClustersRequest()
+	request.HpcClusterIds = []*string{&hpcClusterId}
+
+	defer func() {
+		if errRet != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
+		}
+	}()
+
+	ratelimit.Check(request.GetAction())
+
+	response, err := me.client.UseCvmClient().DeleteHpcClusters(request)
+	if err != nil {
+		errRet = err
+		return
+	}
+	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+	return
+}