add resource type (#110)

Author: shawnmssu

CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 1.31.0 (Unreleased)
+
+ENHANCEMENTS:
+
+* resource/ucloud_eip_association: add `resource_type` to argument. [GH-110]
+* resource/ucloud_lb_attachment: add `resource_type` to argument. [GH-110]
+
+
 ## 1.30.0 (2021-10-26)
 
 FEATURES:

ucloud/config.go

@@ -68,7 +68,7 @@ func (c *Config) Client() (*UCloudClient, error) {
 	// enable auto retry with http/connection error
 	cfg.MaxRetries = c.MaxRetries
 	cfg.LogLevel = log.PanicLevel
-	cfg.UserAgent = "Terraform-UCloud/1.30.0"
+	cfg.UserAgent = "Terraform-UCloud/1.31.0"
 	cfg.BaseUrl = c.BaseURL
 
 	cred := auth.NewCredential()

ucloud/consts.go

@@ -92,6 +92,8 @@ const (
 )
 
 const (
+	resourceTypeInstance      = "instance"
+	resourceTypeLb            = "lb"
 	lbResourceTypeUHost       = "UHost"
 	lbMatchTypePath           = "Path"
 	lbMatchTypeDomain         = "Domain"
@@ -127,6 +129,11 @@ var lowerCaseProdCvt = newStringConverter(map[string]string{
 	"lb":       "ulb",
 })
 
+// lbBackendCaseProdCvt is used to covert one backend string to another backend string
+var lbBackendCaseProdCvt = newStringConverter(map[string]string{
+	"instance": "UHost",
+})
+
 // titleCaseProdCvt is used to covert one lower string to another string begin with uppercase letters
 var titleCaseProdCvt = newStringConverter(map[string]string{
 	"instance": "UHost",

ucloud/resource_ucloud_eip_association.go

@@ -27,11 +27,17 @@ func resourceUCloudEIPAssociation() *schema.Resource {
 			},
 
 			"resource_type": {
-				Type:       schema.TypeString,
-				Optional:   true,
-				ForceNew:   true,
-				Deprecated: "attribute `resource_type` is deprecated for optimizing parameters",
-				//ValidateFunc: validation.StringInSlice([]string{"instance", "lb"}, false),
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Computed: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if (isStringIn(old, []string{resourceTypeInstance, eipResourceTypeUHost}) && isStringIn(new, []string{resourceTypeInstance, eipResourceTypeUHost})) ||
+						(isStringIn(old, []string{resourceTypeLb, eipResourceTypeULB}) && isStringIn(new, []string{resourceTypeLb, eipResourceTypeULB})) {
+						return true
+					}
+					return false
+				},
 			},
 
 			"resource_id": {
@@ -49,42 +55,17 @@ func resourceUCloudEIPAssociationCreate(d *schema.ResourceData, meta interface{}
 
 	eipId := d.Get("eip_id").(string)
 	resourceId := d.Get("resource_id").(string)
-	//resourceType := eipResourceTypeUHost
-	//if strings.HasPrefix(resourceId, "ulb-") {
-	//	resourceType = eipResourceTypeULB
-	//}
-	//
-	//if strings.HasPrefix(resourceId, "cube-") {
-	//	resourceType = eipResourceTypeCube
-	//}
-	//
-	//if strings.HasPrefix(resourceId, "natgw-") {
-	//	resourceType = eipResourceTypeNatGateway
-	//}
-
 	var resourceType string
-	if strings.HasPrefix(resourceId, "uhost-") {
-		resourceType = eipResourceTypeUHost
-	}
-
-	if strings.HasPrefix(resourceId, "ulb-") {
-		resourceType = eipResourceTypeULB
-	}
-
-	if strings.HasPrefix(resourceId, "cube-") {
-		resourceType = eipResourceTypeCube
-	}
-
-	if strings.HasPrefix(resourceId, "natgw-") {
-		resourceType = eipResourceTypeNatGateway
-	}
-
-	if resourceType == "" && len(strings.Split(resourceId, "-")) > 0 {
+	if len(strings.Split(resourceId, "-")) > 0 {
 		resourceType = strings.Split(resourceId, "-")[0]
 	}
 
 	if v, ok := d.GetOk("resource_type"); ok {
-		resourceType = v.(string)
+		resourceType = lowerCaseProdCvt.convert(v.(string))
+	}
+
+	if len(resourceType) == 0 {
+		return fmt.Errorf("must set `resource_type` when creating eip association")
 	}
 
 	req := conn.NewBindEIPRequest()
@@ -132,7 +113,7 @@ func resourceUCloudEIPAssociationRead(d *schema.ResourceData, meta interface{})
 	client := meta.(*UCloudClient)
 
 	p := strings.Split(d.Id(), ":")
-	resource, err := client.describeEIPResourceById(p[0], p[1])
+	res, err := client.describeEIPResourceById(p[0], p[1])
 	if err != nil {
 		if isNotFoundError(err) {
 			d.SetId("")
@@ -143,8 +124,12 @@ func resourceUCloudEIPAssociationRead(d *schema.ResourceData, meta interface{})
 
 	// remote api has not returned eip
 	d.Set("eip_id", d.Get("eip_id"))
-	d.Set("resource_id", resource.ResourceID)
-	//d.Set("resource_type", lowerCaseProdCvt.unconvert(resource.ResourceType))
+	d.Set("resource_id", res.ResourceID)
+	if v, ok := d.GetOk("resource_type"); ok && isStringIn(v.(string), []string{resourceTypeInstance, resourceTypeLb}) {
+		d.Set("resource_type", lowerCaseProdCvt.unconvert(res.ResourceType))
+	} else {
+		d.Set("resource_type", res.ResourceType)
+	}
 
 	return nil
 }
@@ -158,8 +143,12 @@ func resourceUCloudEIPAssociationDelete(d *schema.ResourceData, meta interface{}
 	req.EIPId = ucloud.String(p[0])
 	req.ResourceId = ucloud.String(p[1])
 	resourceType := eipResourceTypeUHost
-	if strings.HasPrefix(p[1], "ulb-") {
-		resourceType = eipResourceTypeULB
+	if len(strings.Split(p[1], "-")) > 0 {
+		resourceType = strings.Split(p[1], "-")[0]
+	}
+
+	if v, ok := d.GetOk("resource_type"); ok {
+		resourceType = lowerCaseProdCvt.convert(v.(string))
 	}
 	req.ResourceType = ucloud.String(resourceType)
 

ucloud/resource_ucloud_lb_attachment.go

@@ -2,6 +2,7 @@ package ucloud
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -36,12 +37,16 @@ func resourceUCloudLBAttachment() *schema.Resource {
 			},
 
 			"resource_type": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ForceNew:     true,
-				Computed:     true,
-				Deprecated:   "attribute `resource_type` is deprecated for optimizing parameters",
-				ValidateFunc: validation.StringInSlice([]string{"instance"}, false),
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Computed: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					if isStringIn(old, []string{resourceTypeInstance, lbResourceTypeUHost}) && isStringIn(new, []string{resourceTypeInstance, lbResourceTypeUHost}) {
+						return true
+					}
+					return false
+				},
 			},
 
 			"resource_id": {
@@ -80,9 +85,17 @@ func resourceUCloudLBAttachmentCreate(d *schema.ResourceData, meta interface{})
 	req := conn.NewAllocateBackendRequest()
 	req.ULBId = ucloud.String(lbId)
 	req.VServerId = ucloud.String(listenerId)
-	req.ResourceType = ucloud.String(lbResourceTypeUHost)
-	req.ResourceId = ucloud.String(d.Get("resource_id").(string))
+	resourceId := d.Get("resource_id").(string)
+	req.ResourceId = ucloud.String(resourceId)
 	req.Port = ucloud.Int(d.Get("port").(int))
+	resourceType := lbResourceTypeUHost
+	if v, ok := d.GetOk("resource_type"); ok {
+		resourceType = lbBackendCaseProdCvt.convert(v.(string))
+	} else if len(strings.Split(resourceId, "-")) > 0 && strings.Split(resourceId, "-")[0] != eipResourceTypeUHost {
+		return fmt.Errorf("must set `resource_type` when creating lb attachment")
+	}
+
+	req.ResourceType = ucloud.String(resourceType)
 
 	resp, err := conn.AllocateBackend(req)
 	if err != nil {
@@ -162,11 +175,16 @@ func resourceUCloudLBAttachmentRead(d *schema.ResourceData, meta interface{}) er
 	}
 
 	d.Set("resource_id", backendSet.ResourceId)
-	d.Set("resource_type", titleCaseProdCvt.unconvert(backendSet.ResourceType))
 	d.Set("port", backendSet.Port)
 	d.Set("private_ip", backendSet.PrivateIP)
 	d.Set("status", lbAttachmentStatusCvt.convert(backendSet.Status))
 
+	if v, ok := d.GetOk("resource_type"); ok && isStringIn(v.(string), []string{resourceTypeInstance}) {
+		d.Set("resource_type", lbBackendCaseProdCvt.unconvert(backendSet.ResourceType))
+	} else {
+		d.Set("resource_type", backendSet.ResourceType)
+	}
+
 	return nil
 }
 

website/docs/r/cube_pod.html.markdown

@@ -8,7 +8,7 @@ description: |-
 
 # ucloud_cube_pod
 
-Provides a CubePod resource.
+Provides a CubePod resource(**Deprecated**, this resource has been offline).
 
 ## Example Usage
 

website/docs/r/eip_association.html.markdown

@@ -72,4 +72,4 @@ The following arguments are supported:
 
 * `eip_id` - (Required, ForceNew) The ID of EIP.
 * `resource_id` - (Required, ForceNew) The ID of resource with EIP attached.
-* `resource_type` - (**Deprecated**, ForceNew), attribute `resource_type` is deprecated for optimizing parameters.
+* `resource_type` - (Optional, ForceNew) The type of resource with EIP attached, possible values are `instance` or `uhost` as instance, `lb` or `ulb` as load balancer, `natgw` as NAT GateWay host, `udb` as database, `vpngw` as ipsec vpn host.

website/docs/r/lb_attachment.html.markdown

@@ -63,7 +63,7 @@ The following arguments are supported:
 
 - - -
 
-* `resource_type` - (**Deprecated**, ForceNew), attribute `resource_type` is deprecated for optimizing parameters.
+* `resource_type` - (Optional, ForceNew) The types of backend servers, possible values are: `instance` or `UHost` as UHost instance.
 * `port` - (Optional) The listening port of the backend server, range: 1-65535, (Default: `80`). Backend server port have the following restrictions: If the LB listener type is `request_proxy`, the backend serve can add different ports to implement different service instances of the same IP. Else if LB listener type is `packets_transmit`, the port of the backend server must be consistent with the LB listening port.
 
 ## Attributes Reference