Skip to content

Commit d141a93

Browse files
authored
Merge pull request #443 from Himer/master
vpc DescribeVpcs panic
2 parents 888c090 + 1842767 commit d141a93

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

tencentcloud/resource_tc_cdn_domain.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,8 @@ func resourceTencentCloudCdnDomainRead(d *schema.ResourceData, meta interface{})
567567
_ = d.Set("https_config", httpsConfigs)
568568

569569
tags, errRet := tagService.DescribeResourceTags(ctx, CDN_SERVICE_NAME, CDN_RESOURCE_NAME_DOMAIN, region, domain)
570-
if err != nil {
571-
return nil
570+
if errRet != nil {
571+
return errRet
572572
}
573573
_ = d.Set("tags", tags)
574574

tencentcloud/resource_tc_dayu_ddos_policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ func resourceTencentCloudDayuDdosPolicyUpdate(d *schema.ResourceData, meta inter
598598
d.SetPartial("name")
599599
}
600600

601-
if d.HasChange("watermark_filters") || d.HasChange("white_ips") || d.HasChange(("black_ips")) || d.HasChange("packet_filters") || d.HasChange("port_filters") || d.HasChange("drop_options") {
601+
if d.HasChange("watermark_filters") || d.HasChange("white_ips") || d.HasChange("black_ips") || d.HasChange("packet_filters") || d.HasChange("port_filters") || d.HasChange("drop_options") {
602602

603603
//set DDosPolicyDropOption
604604
dropMapping := d.Get("drop_options").([]interface{})

tencentcloud/service_tencentcloud_vpc.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ getMoreData:
239239
ratelimit.Check(request.GetAction())
240240
result, err := me.client.UseVpcClient().DescribeVpcs(request)
241241
if err != nil {
242-
log.Printf("[DEBUG]%s api[%s] , request body [%s], response body[%s]\n",
243-
logId, request.GetAction(), request.ToJsonString(), result.ToJsonString())
244242
return retryError(err, InternalError)
245243
}
246244
response = result

0 commit comments

Comments
 (0)