Merge pull request #1531 from tencentcloudstack/feat/fix_scf_func_state

fix scf func state change

Author: tongyiming

.changelog/1531.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_scf_function: keep state consistent when vpc_id is not set
+```

tencentcloud/resource_tc_scf_function.go

@@ -233,13 +233,13 @@ func resourceTencentCloudScfFunction() *schema.Resource {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     false,
-				Description: "Indicates whether public net config enabled. NOTE: only `vpc_id` specified can disable public net config.",
+				Description: "Indicates whether public net config enabled. Default `false`. NOTE: only `vpc_id` specified can disable public net config.",
 			},
 			"enable_eip_config": {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Default:     false,
-				Description: "Indicates whether EIP config set to `ENABLE` when `enable_public_net` was true.",
+				Description: "Indicates whether EIP config set to `ENABLE` when `enable_public_net` was true. Default `false`.",
 			},
 			// cos code
 			"cos_bucket_name": {
@@ -593,10 +593,10 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 		functionInfo.layers = layers
 	}
 
-	enablePublicNet, enablePublicNetOk := d.GetOk("enable_public_net")
-	enableEipConfig, enableEipConfigOk := d.GetOk("enable_eip_config")
+	enablePublicNet, _ := d.GetOk("enable_public_net")
+	enableEipConfig, _ := d.GetOk("enable_eip_config")
 
-	if enablePublicNetOk {
+	if enablePublicNet != nil {
 		enable := enablePublicNet.(bool)
 		publicNetStatus := helper.String("ENABLE")
 		if !enable {
@@ -610,7 +610,7 @@ func resourceTencentCloudScfFunctionCreate(d *schema.ResourceData, m interface{}
 		}
 	}
 
-	if enableEipConfigOk {
+	if enableEipConfig != nil {
 		enableEip := enableEipConfig.(bool)
 		eipStatus := "DISABLE"
 		if enableEip {
@@ -1156,7 +1156,7 @@ func resourceTencentCloudScfFunctionUpdate(d *schema.ResourceData, m interface{}
 		updateAttrs = append(updateAttrs, "enable_eip_config")
 	}
 
-	if raw, ok := d.GetOk("enable_public_net"); ok {
+	if raw, _ := d.GetOk("enable_public_net"); raw != nil {
 		enablePublicNet := raw.(bool)
 		publicNetStatus := helper.String("ENABLE")
 		if !enablePublicNet {
@@ -1170,7 +1170,7 @@ func resourceTencentCloudScfFunctionUpdate(d *schema.ResourceData, m interface{}
 		}
 	}
 
-	if raw, ok := d.GetOk("enable_eip_config"); ok {
+	if raw, _ := d.GetOk("enable_eip_config"); raw != nil {
 		status := "DISABLE"
 		enablePublicNet := d.Get("enable_public_net").(bool)
 		if raw.(bool) {

website/docs/r/scf_function.html.markdown

@@ -58,8 +58,8 @@ The following arguments are supported:
 * `cos_bucket_region` - (Optional, String) Cos bucket region of the SCF function, conflict with `zip_file`.
 * `cos_object_name` - (Optional, String) Cos object name of the SCF function, should have suffix `.zip` or `.jar`, conflict with `zip_file`.
 * `description` - (Optional, String) Description of the SCF function. Description supports English letters, numbers, spaces, commas, newlines, periods and Chinese, the maximum length is 1000.
-* `enable_eip_config` - (Optional, Bool) Indicates whether EIP config set to `ENABLE` when `enable_public_net` was true.
-* `enable_public_net` - (Optional, Bool) Indicates whether public net config enabled. NOTE: only `vpc_id` specified can disable public net config.
+* `enable_eip_config` - (Optional, Bool) Indicates whether EIP config set to `ENABLE` when `enable_public_net` was true. Default `false`.
+* `enable_public_net` - (Optional, Bool) Indicates whether public net config enabled. Default `false`. NOTE: only `vpc_id` specified can disable public net config.
 * `environment` - (Optional, Map) Environment of the SCF function.
 * `image_config` - (Optional, List) Image of the SCF function, conflict with ``.
 * `l5_enable` - (Optional, Bool) Enable L5 for SCF function, default is `false`.