add

Author: SevenEarth

tencentcloud/services/scf/resource_tc_scf_function.go

@@ -523,6 +523,11 @@ func ResourceTencentCloudScfFunction() *schema.Resource {
 					},
 				},
 			},
+			"function_id": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "function ID.",
+			},
 		},
 	}
 }
@@ -535,7 +540,10 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 	client := m.(tccommon.ProviderMeta).GetAPIV3Conn()
 	scfService := ScfService{client: client}
 
-	var functionInfo scfFunctionInfo
+	var (
+		functionInfo scfFunctionInfo
+		functionId   string
+	)
 
 	functionInfo.name = d.Get("name").(string)
 	functionInfo.desc = helper.String(d.Get("description").(string))
@@ -841,12 +849,15 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 		}
 	}
 
-	_, err = scfService.DescribeFunction(ctx, functionInfo.name, *functionInfo.namespace)
+	funcResp, err := scfService.DescribeFunction(ctx, functionInfo.name, *functionInfo.namespace)
 	if err != nil {
 		log.Printf("[CRITAL]%s get function id failed: %+v", logId, err)
 		return err
 	}
 
+	functionId = *funcResp.Response.FunctionId
+	_ = d.Set("function_id", functionId)
+
 	return resourceTencentCloudScfFunctionRead(d, m)
 }
 
@@ -868,7 +879,8 @@ func resourceTencentCloudScfFunctionRead(d *schema.ResourceData, m interface{})
 	}
 	namespace, name := split[0], split[1]
 
-	response, err := service.DescribeFunction(ctx, name, namespace)
+	functionId := d.Get("function_id").(string)
+	response, err := service.DescribeFunction(ctx, name, namespace, functionId)
 	if err != nil {
 		log.Printf("[CRITAL]%s read function failed: %+v", logId, err)
 	}
@@ -901,6 +913,7 @@ func resourceTencentCloudScfFunctionRead(d *schema.ResourceData, m interface{})
 	_ = d.Set("cls_topic_id", resp.ClsTopicId)
 	_ = d.Set("func_type", resp.Type)
 	_ = d.Set("l5_enable", *resp.L5Enable == "TRUE")
+	_ = d.Set("function_id", resp.FunctionId)
 
 	tags := make(map[string]string, len(resp.Tags))
 	for _, tag := range resp.Tags {

tencentcloud/services/scf/service_tencentcloud_scf.go

@@ -2,6 +2,7 @@ package scf
 
 import (
 	"context"
+	"fmt"
 	"log"
 	"strings"
 
@@ -147,15 +148,21 @@ func (me *ScfService) CreateFunction(ctx context.Context, info scfFunctionInfo)
 	return nil
 }
 
-func (me *ScfService) DescribeFunction(ctx context.Context, name, namespace string) (resp *scf.GetFunctionResponse, err error) {
+func (me *ScfService) DescribeFunction(ctx context.Context, name, namespace string, functionId ...string) (resp *scf.GetFunctionResponse, err error) {
 	request := scf.NewGetFunctionRequest()
+	response := scf.NewGetFunctionResponse()
 	request.FunctionName = &name
 	request.Namespace = &namespace
-	var iacExtInfo connectivity.IacExtInfo
-	iacExtInfo.InstanceId = strings.Join([]string{name, namespace}, tccommon.FILED_SP)
 	if err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
 		ratelimit.Check(request.GetAction())
-		response, err := me.client.UseScfClient(iacExtInfo).GetFunction(request)
+		if len(functionId) == 1 {
+			var iacExtInfo connectivity.IacExtInfo
+			iacExtInfo.InstanceId = functionId[0]
+			response, err = me.client.UseScfClient(iacExtInfo).GetFunction(request)
+		} else {
+			response, err = me.client.UseScfClient().GetFunction(request)
+		}
+
 		if err != nil {
 			if sdkError, ok := err.(*sdkErrors.TencentCloudSDKError); ok {
 				for _, code := range SCF_FUNCTIONS_NOT_FOUND_SET {
@@ -168,6 +175,10 @@ func (me *ScfService) DescribeFunction(ctx context.Context, name, namespace stri
 			return tccommon.RetryError(errors.WithStack(err), tccommon.InternalError)
 		}
 
+		if response == nil || *response.Response.FunctionId == "" {
+			return resource.NonRetryableError(fmt.Errorf("functionId is empty"))
+		}
+
 		resp = response
 		return nil
 	}); err != nil {

website/docs/r/scf_function.html.markdown

@@ -174,6 +174,7 @@ In addition to all arguments above, the following attributes are exported:
 * `eip_fixed` - Whether EIP is a fixed IP.
 * `eips` - SCF function EIP list.
 * `err_no` - SCF function code error code.
+* `function_id` - function ID.
 * `host` - SCF function domain name.
 * `install_dependency` - Whether to automatically install dependencies.
 * `modify_time` - SCF function last modified time.