add spt feature (#88)

Author: shawnmssu

CHANGELOG.md

@@ -1,4 +1,10 @@
 ## 1.25.0 (Unreleased)
+
+ENHANCEMENTS:
+
+* resource/ucloud_lb: add `listen_type` to the argument. [GH-88]
+* datasource/ucloud_subnets: add `vpc_id` to the attributes. [GH-88]
+
 ## 1.24.1 (2020-11-06)
 
 BUG FIXES:

ucloud/config.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"time"
 
 	"github.com/ucloud/ucloud-sdk-go/external"
 	"github.com/ucloud/ucloud-sdk-go/private/protocol/http"
@@ -62,7 +63,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.24.1"
+	cfg.UserAgent = "Terraform-UCloud/1.25.0"
 	cfg.BaseUrl = c.BaseURL
 
 	cred := auth.NewCredential()
@@ -116,20 +117,23 @@ func (c *Config) Client() (*UCloudClient, error) {
 	}
 
 	// initialize client connections
-	client.uhostconn = uhost.NewClient(&cfg, &cred)
 	client.unetconn = unet.NewClient(&cfg, &cred)
 	client.ulbconn = ulb.NewClient(&cfg, &cred)
 	client.vpcconn = vpc.NewClient(&cfg, &cred)
 	client.uaccountconn = uaccount.NewClient(&cfg, &cred)
 	client.udiskconn = udisk.NewClient(&cfg, &cred)
 	client.udpnconn = udpn.NewClient(&cfg, &cred)
-	client.udbconn = udb.NewClient(&cfg, &cred)
 	client.umemconn = umem.NewClient(&cfg, &cred)
 	client.ipsecvpnClient = ipsecvpn.NewClient(&cfg, &cred)
 
 	// initialize client connections for private usage
 	client.pumemconn = pumem.NewClient(&cfg, &cred)
 
+	longtimeCfg := cfg
+	longtimeCfg.Timeout = 60 * time.Second
+	client.udbconn = udb.NewClient(&longtimeCfg, &cred)
+	client.uhostconn = uhost.NewClient(&longtimeCfg, &cred)
+
 	if cloudShellCredHandler != nil {
 		client.uhostconn.AddHttpRequestHandler(cloudShellCredHandler)
 		client.unetconn.AddHttpRequestHandler(cloudShellCredHandler)

ucloud/data_source_ucloud_subnets.go

@@ -57,7 +57,6 @@ func dataSourceUCloudSubnets() *schema.Resource {
 				Computed: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-
 						"id": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -87,6 +86,11 @@ func dataSourceUCloudSubnets() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+
+						"vpc_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -158,11 +162,11 @@ func dataSourceUCloudSubnetsRead(d *schema.ResourceData, meta interface{}) error
 }
 
 func dataSourceUCloudSubnetsSave(d *schema.ResourceData, subnets []vpc.VPCSubnetInfoSet) error {
-	ids := []string{}
-	data := []map[string]interface{}{}
+	ids := make([]string, 0)
+	data := make([]map[string]interface{}, 0)
 
 	for _, subnet := range subnets {
-		ids = append(ids, string(subnet.SubnetId))
+		ids = append(ids, subnet.SubnetId)
 
 		data = append(data, map[string]interface{}{
 			"id":          subnet.SubnetId,
@@ -171,6 +175,7 @@ func dataSourceUCloudSubnetsSave(d *schema.ResourceData, subnets []vpc.VPCSubnet
 			"remark":      subnet.Remark,
 			"tag":         subnet.Tag,
 			"cidr_block":  fmt.Sprintf("%s/%s", subnet.Subnet, subnet.Netmask),
+			"vpc_id":      subnet.VPCId,
 		})
 	}
 
@@ -182,7 +187,9 @@ func dataSourceUCloudSubnetsSave(d *schema.ResourceData, subnets []vpc.VPCSubnet
 	}
 
 	if outputFile, ok := d.GetOk("output_file"); ok && outputFile.(string) != "" {
-		writeToFile(outputFile.(string), data)
+		if err := writeToFile(outputFile.(string), data); err != nil {
+			return err
+		}
 	}
 
 	return nil

ucloud/resource_ucloud_lb.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -19,6 +21,9 @@ func resourceUCloudLB() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
+		CustomizeDiff: customdiff.All(
+			diffValidateInternalWithSubnetId,
+		),
 
 		Schema: map[string]*schema.Schema{
 			"internal": {
@@ -81,6 +86,17 @@ func resourceUCloudLB() *schema.Resource {
 				Computed: true,
 			},
 
+			"listen_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Computed: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					"request_proxy",
+					"packets_transmit",
+				}, false),
+			},
+
 			"ip_set": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -124,6 +140,10 @@ func resourceUCloudLBCreate(d *schema.ResourceData, meta interface{}) error {
 
 	req := conn.NewCreateULBRequest()
 
+	if v, ok := d.GetOk("listen_type"); ok {
+		req.ListenType = ucloud.String(upperCamelCvt.unconvert(v.(string)))
+	}
+
 	if v, ok := d.GetOk("name"); ok {
 		req.ULBName = ucloud.String(v.(string))
 	} else {
@@ -265,6 +285,11 @@ func resourceUCloudLBRead(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("error on reading lb %q, %s", d.Id(), err)
 	}
 
+	listenType := upperCamelCvt.convert(lbSet.ListenType)
+	if listenType == "request_proxy" || listenType == "packets_transmit" {
+		d.Set("listen_type", listenType)
+	}
+
 	d.Set("name", lbSet.Name)
 	d.Set("tag", lbSet.Tag)
 	d.Set("remark", lbSet.Remark)
@@ -351,3 +376,21 @@ func lbWaitForState(client *UCloudClient, id string) *resource.StateChangeConf {
 		},
 	}
 }
+
+func diffValidateInternalWithSubnetId(diff *schema.ResourceDiff, meta interface{}) error {
+	var internal bool
+	var subnetId string
+
+	if v, ok := diff.GetOk("internal"); ok {
+		internal = v.(bool)
+	}
+	if v, ok := diff.GetOk("subnet_id"); ok {
+		subnetId = v.(string)
+	}
+
+	if !internal && subnetId != "" {
+		return fmt.Errorf("the lb instance cannot set %q, When the %q is true", "subnet_id", "internal")
+	}
+
+	return nil
+}

ucloud/resource_ucloud_lb_listener.go

@@ -154,16 +154,23 @@ func resourceUCloudLBListenerCreate(d *schema.ResourceData, meta interface{}) er
 
 	req := conn.NewCreateVServerRequest()
 	if v, ok := d.GetOk("listen_type"); ok {
+		if isStringIn(upperCamelCvt.convert(lbSet.ListenType), []string{"request_proxy", "packets_transmit"}) && upperCamelCvt.convert(lbSet.ListenType) != v.(string) {
+			return fmt.Errorf("the %q of lb listenr must be same as the lb's %q, got %q", "listen_type", upperCamelCvt.convert(lbSet.ListenType), v.(string))
+		}
 		err := availableLBChoices.validate(lbSet.ULBType, protocol, v.(string))
 		if err != nil {
 			return err
 		}
 		req.ListenType = ucloud.String(upperCamelCvt.unconvert(v.(string)))
 	} else {
 		if choices := availableLBChoices.availableChoices(lbSet.ULBType, protocol); len(choices) == 0 {
-			return fmt.Errorf("The protocol can only be one of %q, %q when lb is intranet, got %q", "tcp", "udp", protocol)
+			return fmt.Errorf("the protocol can only be one of %q, %q when lb is intranet, got %q", "tcp", "udp", protocol)
 		} else {
-			req.ListenType = ucloud.String(upperCamelCvt.unconvert(choices[0]))
+			if isStringIn(upperCamelCvt.convert(lbSet.ListenType), []string{"request_proxy", "packets_transmit"}) {
+				req.ListenType = ucloud.String(lbSet.ListenType)
+			} else {
+				req.ListenType = ucloud.String(upperCamelCvt.unconvert(choices[0]))
+			}
 		}
 	}
 

ucloud/resource_ucloud_lb_ssl_attachment.go

@@ -65,7 +65,7 @@ func resourceUCloudLBSSLAttachmentCreate(d *schema.ResourceData, meta interface{
 			sslSet, err := client.describeLBSSLAttachmentById(sslId, lbId, listenerId)
 			if err != nil {
 				if isNotFoundError(err) {
-					return sslSet, statusPending, nil
+					return nil, statusPending, nil
 				}
 				return nil, "", err
 			}

ucloud/resource_ucloud_memcache_instance.go

@@ -311,7 +311,7 @@ func (c *UCloudClient) waitActiveStandbyMemcacheRunning(id string) error {
 		}
 
 		if resp.State != statusRunning {
-			return nil, statusPending, nil
+			return resp, statusPending, nil
 		}
 		return resp, statusInitialized, nil
 	}

ucloud/resource_ucloud_redis_instance.go

@@ -581,7 +581,7 @@ func (c *UCloudClient) waitActiveStandbyRedisRunning(id string) error {
 		}
 
 		if resp.State != statusRunning {
-			return nil, statusPending, nil
+			return resp, statusPending, nil
 		}
 		return resp, statusInitialized, nil
 	}
@@ -600,7 +600,7 @@ func (c *UCloudClient) waitDistributedRedisRunning(id string) error {
 		}
 
 		if resp.State != statusRunning {
-			return nil, statusPending, nil
+			return resp, statusPending, nil
 		}
 		return resp, statusInitialized, nil
 	}

ucloud/service_ucloud_umem.go

@@ -74,9 +74,9 @@ func (c *UCloudClient) describeActiveStandbyMemcacheById(id string) (*pumem.UMem
 
 func waitForMemoryInstance(refresh func() (interface{}, string, error)) error {
 	conf := resource.StateChangeConf{
-		Timeout:    5 * time.Minute,
-		Delay:      2 * time.Second,
-		MinTimeout: 1 * time.Second,
+		Timeout:    10 * time.Minute,
+		Delay:      3 * time.Second,
+		MinTimeout: 2 * time.Second,
 		Target:     []string{statusInitialized},
 		Pending:    []string{statusPending},
 		Refresh:    refresh,

website/docs/d/subnets.html.markdown

@@ -47,4 +47,5 @@ The attribute (`subnets`) support the following:
 * `cidr_block` - The cidr block of the desired Subnet.
 * `create_time` - The time of creation of Subnet, formatted in RFC3339 time string.
 * `remark` - The remark of the Subnet.
-* `tag` - A tag assigned to Subnet.
+* `tag` - A tag assigned to Subnet.
+* `vpc_id` - The id of the VPC that the desired Subnet belongs to.

website/docs/r/lb.html.markdown

@@ -31,6 +31,7 @@ The following arguments are supported:
 * `tag` - (Optional) A tag assigned to load balancer, which contains at most 63 characters and only support Chinese, English, numbers, '-', '_', and '.'. If it is not filled in or a empty string is filled in, then default tag will be assigned. (Default: `Default`).
 * `remark` - (Optional) The remarks of the load balancer. (Default: `""`).
 * `security_group` - (Optional) The ID of the associated security group. The security_group only takes effect for ULB instances of request_proxy mode and extranet mode at present.
+* `listen_type` - (Optional, ForceNew) The type of listener. Possible values are `request_proxy` and `packets_transmit`. When `packets_transmit` was specified, you need to config the instances by yourself if the instances attach to the load balancer. You may refer to [configuration instruction](https://docs.ucloud.cn/network/ulb/fast/createulb/vservertype).
 
 ## Attributes Reference