Feature/scf function support layer (#714)

* scf function support layers

* fix layer bug

Author: hellertang

tencentcloud/resource_tc_scf_function.go

@@ -187,6 +187,25 @@ func resourceTencentCloudScfFunction() *schema.Resource {
 				Default:     false,
 				Description: "Enable L5 for SCF function, default is `false`.",
 			},
+			"layers": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Description: "The list of association layers.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"layer_name": {
+							Type: schema.TypeString,
+							Required: true,
+							Description: "The name of Layer.",
+						},
+						"layer_version": {
+							Type: schema.TypeInt,
+							Required: true,
+							Description: "The version of layer.",
+						},
+					},
+				},
+			},
 			"tags": {
 				Type:        schema.TypeMap,
 				Optional:    true,
@@ -490,6 +509,18 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 		functionInfo.cosBucketRegion = helper.String(raw.(string))
 	}
 
+	if v, ok := d.GetOk("layers"); ok {
+		layers := make([]*scf.LayerVersionSimple, 0, 10)
+		for _, item := range v.([]interface{}) {
+			m := item.(map[string]interface{})
+			layer := scf.LayerVersionSimple{}
+			layer.LayerName = helper.String(m["layer_name"].(string))
+			layer.LayerVersion = helper.IntInt64(m["layer_version"].(int))
+			layers = append(layers, &layer)
+		}
+		functionInfo.layers = layers
+	}
+
 	enablePublicNet, enablePublicNetOk := d.GetOk("enable_public_net")
 	enableEipConfig, enableEipConfigOk := d.GetOk("enable_eip_config")
 
@@ -565,9 +596,9 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 			imageConfigs = append(imageConfigs, config)
 		}
 		codeType = scfFunctionImageCode
+		functionInfo.imageConfig = imageConfigs[0]
 	}
 
-	functionInfo.imageConfig = imageConfigs[0]
 
 	switch codeType {
 	case scfFunctionCosCode:

tencentcloud/resource_tc_scf_layer.go

@@ -28,8 +28,12 @@ $ terraform import tencentcloud_scf_layer.layer layerId#layerVersion
 package tencentcloud
 
 import (
+	"encoding/base64"
 	"fmt"
+	"github.com/mitchellh/go-homedir"
+	"io/ioutil"
 	"log"
+	"os"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -114,7 +118,7 @@ func resourceTencentCloudScfLayer() *schema.Resource {
 
 			//compute
 			"layer_version": {
-				Type:        schema.TypeString,
+				Type:        schema.TypeInt,
 				Computed:    true,
 				Description: "The version of layer.",
 			},
@@ -172,17 +176,32 @@ func resourceTencentCloudScfLayerCreate(d *schema.ResourceData, meta interface{}
 		}
 		item := items[0].(map[string]interface{})
 		var content = scf.Code{}
-		if item["cos_bucket_name"] != nil {
+		if item["cos_bucket_name"] != "" {
 			content.CosBucketName = helper.String(item["cos_bucket_name"].(string))
 		}
-		if item["cos_object_name"] != nil {
+		if item["cos_object_name"] != "" {
 			content.CosObjectName = helper.String(item["cos_object_name"].(string))
 		}
-		if item["cos_bucket_region"] != nil {
+		if item["cos_bucket_region"] != "" {
 			content.CosBucketRegion = helper.String(item["cos_bucket_region"].(string))
 		}
-		if item["zip_file"] != nil {
-			content.ZipFile = helper.String(item["zip_file"].(string))
+		if item["zip_file"] != ""  {
+			path, err := homedir.Expand(item["zip_file"].(string))
+			if err != nil {
+				return fmt.Errorf("zip file (%s) homedir expand error: %s", item["zip_file"].(string), err.Error())
+			}
+			file, err := os.Open(path)
+			if err != nil {
+				return fmt.Errorf("zip file (%s) open error: %s", path, err.Error())
+			}
+			defer file.Close()
+			body, err := ioutil.ReadAll(file)
+			if err != nil {
+				return fmt.Errorf("zip file (%s) read error: %s", path, err.Error())
+			}
+
+			zipContent := base64.StdEncoding.EncodeToString(body)
+			content.ZipFile = &zipContent
 		}
 		request.Content = &content
 	}

tencentcloud/service_tencentcloud_scf.go

@@ -27,6 +27,7 @@ type scfFunctionInfo struct {
 	clsLogsetId     *string
 	clsTopicId      *string
 	namespace       *string
+	layers          []*scf.LayerVersionSimple
 	l5Enable        *bool
 	publicNetConfig *scf.PublicNetConfigIn
 
@@ -81,6 +82,7 @@ func (me *ScfService) CreateFunction(ctx context.Context, info scfFunctionInfo)
 	request.Role = info.role
 	request.ClsLogsetId = info.clsLogsetId
 	request.ClsTopicId = info.clsTopicId
+	request.Layers =info.layers
 	request.Type = helper.String(SCF_FUNCTION_TYPE_EVENT)
 
 	request.Code = &scf.Code{

website/docs/r/scf_function.html.markdown

@@ -43,6 +43,7 @@ The following arguments are supported:
 * `environment` - (Optional) Environment of the SCF function.
 * `image_config` - (Optional) Image of the SCF function, conflict with ``.
 * `l5_enable` - (Optional) Enable L5 for SCF function, default is `false`.
+* `layers` - (Optional) The list of association layers.
 * `mem_size` - (Optional) Memory size of the SCF function, unit is MB. The default is `128`MB. The range is 128M-1536M, and the ladder is 128M.
 * `namespace` - (Optional, ForceNew) Namespace of the SCF function, default is `default`.
 * `role` - (Optional) Role of the SCF function.
@@ -62,6 +63,11 @@ The `image_config` object supports the following:
 * `entry_point` - (Optional) The entrypoint of app.
 * `registry_id` - (Optional) The registry id of TCR. When image type is enterprise, it must be set.
 
+The `layers` object supports the following:
+
+* `layer_name` - (Required) The name of Layer.
+* `layer_version` - (Required) The version of layer.
+
 The `triggers` object supports the following:
 
 * `name` - (Required) Name of the SCF function trigger, if `type` is `ckafka`, the format of name must be `<ckafkaInstanceId>-<topicId>`; if `type` is `cos`, the name is cos bucket id, other In any case, it can be combined arbitrarily. It can only contain English letters, numbers, connectors and underscores. The maximum length is 100.