diff --git a/.changelog/3555.txt b/.changelog/3555.txt new file mode 100644 index 0000000000..aed5d24242 --- /dev/null +++ b/.changelog/3555.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_wedata_script: optmize code logic +``` diff --git a/tencentcloud/services/wedata/resource_tc_wedata_function.go b/tencentcloud/services/wedata/resource_tc_wedata_function.go index 793c75379b..55c70f9a54 100644 --- a/tencentcloud/services/wedata/resource_tc_wedata_function.go +++ b/tencentcloud/services/wedata/resource_tc_wedata_function.go @@ -188,13 +188,13 @@ func resourceTencentCloudWedataFunctionCreate(d *schema.ResourceData, meta inter log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, createCustomFunctionRequest.GetAction(), createCustomFunctionRequest.ToJsonString(), result.ToJsonString()) } - if result == nil || result.Response.FunctionId == nil { - e = fmt.Errorf("wedata function not exists") + if result == nil || result.Response == nil || result.Response.FunctionId == nil { + eMsg := fmt.Errorf("wedata function not exists") if result.Response.ErrorMessage != nil { - e = fmt.Errorf(*result.Response.ErrorMessage) + eMsg = fmt.Errorf(*result.Response.ErrorMessage) } - return resource.NonRetryableError(e) + return resource.NonRetryableError(eMsg) } createCustomFunctionResponse = result diff --git a/tencentcloud/services/wedata/resource_tc_wedata_script.go b/tencentcloud/services/wedata/resource_tc_wedata_script.go index 154dad6786..64edf2c717 100644 --- a/tencentcloud/services/wedata/resource_tc_wedata_script.go +++ b/tencentcloud/services/wedata/resource_tc_wedata_script.go @@ -235,6 +235,7 @@ func resourceTencentCloudWedataScriptUpdate(d *schema.ResourceData, meta interfa extraInfoBytes, _ := json.Marshal(ExtraInfoObj) extraInfoStr := string(extraInfoBytes) scriptRequestInfo.ExtraInfo = helper.String(extraInfoStr) + request.ScriptRequestInfo = &scriptRequestInfo err := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseWedataClient().UploadContent(request)