feat(fgs/function): lts parameters can be set to empty

Author: Lance52259

Diff for: huaweicloud/services/acceptance/fgs/resource_huaweicloud_fgs_function_test.go

@@ -904,6 +904,8 @@ func TestAccFunction_logConfig(t *testing.T) {
 					// The empty strings of the LTS group and stream will be returned, but the nil values returned for
 					// their names.
 					resource.TestCheckResourceAttr(withoutLtsParams, "log_group_id", ""),
+					// When a parameter is not configured in the ReadContext phase and has never been configured in the
+					// script, its value in tfstate is null after creation.
 					resource.TestCheckNoResourceAttr(withoutLtsParams, "log_group_name"),
 					resource.TestCheckResourceAttr(withoutLtsParams, "log_stream_id", ""),
 					resource.TestCheckNoResourceAttr(withoutLtsParams, "log_stream_name"),
@@ -946,15 +948,27 @@ func TestAccFunction_logConfig(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					rcWithLtsParams.CheckResourceExists(),
 					resource.TestCheckResourceAttr(withLtsParams, "functiongraph_version", "v1"),
-					resource.TestCheckResourceAttrPair(withLtsParams, "log_group_id",
-						"huaweicloud_lts_group.test.1", "id"),
-					resource.TestCheckResourceAttrPair(withLtsParams, "log_group_name",
-						"huaweicloud_lts_group.test.1", "group_name"),
-					resource.TestCheckResourceAttrPair(withLtsParams, "log_stream_id",
-						"huaweicloud_lts_stream.test.1", "id"),
-					resource.TestCheckResourceAttrPair(withLtsParams, "log_stream_name",
-						"huaweicloud_lts_stream.test.1", "stream_name"),
+					// The empty strings of the LTS group and stream will be returned, but the nil values returned for
+					// their names.
+					resource.TestCheckResourceAttr(withLtsParams, "log_group_id", ""),
+					// When a parameter is not configured in the ReadContext phase and has been configured in the
+					// script, its value in tfstate is the corresponding null value instead of null after it is changed
+					// to null or empty value.
+					resource.TestCheckResourceAttr(withLtsParams, "log_group_name", ""),
+					resource.TestCheckResourceAttr(withLtsParams, "log_stream_id", ""),
+					resource.TestCheckResourceAttr(withLtsParams, "log_stream_name", ""),
 					resource.TestCheckResourceAttr(withLtsParams, "lts_custom_tag.%", "0"),
+					rcWithoutLtsParams.CheckResourceExists(),
+					resource.TestCheckResourceAttr(withoutLtsParams, "functiongraph_version", "v1"),
+					// The empty strings of the LTS group and stream will be returned, but the nil values returned for
+					// their names.
+					resource.TestCheckResourceAttr(withoutLtsParams, "log_group_id", ""),
+					resource.TestCheckResourceAttr(withoutLtsParams, "log_group_name", ""),
+					resource.TestCheckResourceAttr(withoutLtsParams, "log_stream_id", ""),
+					resource.TestCheckResourceAttr(withoutLtsParams, "log_stream_name", ""),
+					resource.TestCheckResourceAttr(withoutLtsParams, "lts_custom_tag.%", "2"),
+					resource.TestCheckResourceAttr(withoutLtsParams, "lts_custom_tag.foo", "bar"),
+					resource.TestCheckResourceAttr(withoutLtsParams, "lts_custom_tag.key", "value"),
 				),
 			},
 		},
@@ -1088,11 +1102,24 @@ resource "huaweicloud_fgs_function" "create_with_lts_params" {
   func_code             = base64encode(var.script_content)
   description           = "Created by terraform script"
   functiongraph_version = "v1"
+}
+
+resource "huaweicloud_fgs_function" "create_without_lts_params" {
+  name                  = "%[2]s_without_lts_params"
+  memory_size           = 128
+  runtime               = "Python2.7"
+  timeout               = 3
+  app                   = "default"
+  handler               = "index.handler"
+  code_type             = "inline"
+  func_code             = base64encode(var.script_content)
+  description           = "Created by terraform script"
+  functiongraph_version = "v1"
 
-  log_group_id    = huaweicloud_lts_group.test[1].id
-  log_stream_id   = huaweicloud_lts_stream.test[1].id
-  log_group_name  = huaweicloud_lts_group.test[1].group_name
-  log_stream_name = huaweicloud_lts_stream.test[1].stream_name
+  lts_custom_tag = {
+    foo = "bar"
+    key = "value"
+  }
 }
 `, testAccFunction_logConfig_base(name), name)
 }

Diff for: huaweicloud/services/fgs/resource_huaweicloud_fgs_function.go

@@ -392,7 +392,6 @@ func ResourceFgsFunction() *schema.Resource {
 			"log_group_id": {
 				Type:     schema.TypeString,
 				Optional: true,
-				Computed: true,
 				RequiredWith: []string{
 					"log_stream_id",
 					"log_group_name",
@@ -403,21 +402,18 @@ func ResourceFgsFunction() *schema.Resource {
 			"log_group_name": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
 				RequiredWith: []string{"log_group_id"},
 				Description:  `The LTS group name for collecting logs.`,
 			},
 			"log_stream_id": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
 				RequiredWith: []string{"log_group_id"},
 				Description:  `The LTS stream ID for collecting logs.`,
 			},
 			"log_stream_name": {
 				Type:         schema.TypeString,
 				Optional:     true,
-				Computed:     true,
 				RequiredWith: []string{"log_group_id"},
 				Description:  `The LTS stream name for collecting logs.`,
 			},
@@ -680,15 +676,15 @@ func buildFunctionLogConfig(d *schema.ResourceData) map[string]interface{} {
 	// LTS stream (group will also be created) and associate it with the function.
 	// So, the tfstate records will always have the log group ID and the log stream ID.
 	groupName, ok := d.GetOk("log_group_name") // Only log group name and the log stream name are specified by users.
-	if !ok {
+	if !ok && d.IsNewResource() {
 		return nil
 	}
 
 	return map[string]interface{}{
 		"group_id":    d.Get("log_group_id"),
 		"group_name":  groupName,
 		"stream_id":   d.Get("log_stream_id"),
-		"stream_name": utils.ValueIgnoreEmpty(d.Get("log_stream_name")),
+		"stream_name": d.Get("log_stream_name"),
 	}
 }