Feat/dayu l7 rules (#2062)

* add dayu l7 rules

* fix l7

* add changelog

Author: hellertang

.changelog/2062.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_dayu_l7_rules_v2: fix query results.
+```

tencentcloud/data_source_tc_dayu_l7_rules.go

@@ -194,9 +194,9 @@ func dataSourceTencentCloudDayuL7RulesRead(d *schema.ResourceData, meta interfac
 	list := make([]map[string]interface{}, 0, len(rules))
 	ids := make([]string, 0, len(rules))
 
-	listItem := make(map[string]interface{})
 	for k, rule := range rules {
-		health := healths[k]
+		listItem := make(map[string]interface{})
+
 		listItem["name"] = *rule.RuleName
 		listItem["domain"] = *rule.Domain
 		listItem["ssl_id"] = *rule.SSLId
@@ -217,26 +217,30 @@ func dataSourceTencentCloudDayuL7RulesRead(d *schema.ResourceData, meta interfac
 		}
 		listItem["source_list"] = helper.StringsInterfaces(sourceList)
 
-		if health.Enable != nil {
-			listItem["health_check_switch"] = *health.Enable > 0
-		}
-		if health.Url != nil {
-			listItem["health_check_path"] = *health.Url
-		}
-		if health.StatusCode != nil {
-			listItem["health_check_code"] = int(*health.StatusCode)
-		}
-		if health.Interval != nil {
-			listItem["health_check_interval"] = int(*health.Interval)
-		}
-		if health.KickNum != nil {
-			listItem["health_check_unhealth_num"] = int(*health.KickNum)
-		}
-		if health.AliveNum != nil {
-			listItem["health_check_health_num"] = int(*health.AliveNum)
-		}
-		if health.Method != nil {
-			listItem["health_check_method"] = *health.Method
+		if k < len(healths) {
+			health := healths[k]
+
+			if health.Enable != nil {
+				listItem["health_check_switch"] = *health.Enable > 0
+			}
+			if health.Url != nil {
+				listItem["health_check_path"] = *health.Url
+			}
+			if health.StatusCode != nil {
+				listItem["health_check_code"] = int(*health.StatusCode)
+			}
+			if health.Interval != nil {
+				listItem["health_check_interval"] = int(*health.Interval)
+			}
+			if health.KickNum != nil {
+				listItem["health_check_unhealth_num"] = int(*health.KickNum)
+			}
+			if health.AliveNum != nil {
+				listItem["health_check_health_num"] = int(*health.AliveNum)
+			}
+			if health.Method != nil {
+				listItem["health_check_method"] = *health.Method
+			}
 		}
 		list = append(list, listItem)
 		ids = append(ids, listItem["rule_id"].(string))

tencentcloud/data_source_tc_dayu_l7_rules_v2.go

@@ -5,9 +5,9 @@ Example Usage
 
 ```hcl
 data "tencentcloud_dayu_l7_rules_v2" "test" {
-    business = "bgpip"
-    offset = 0
-    limit = 10
+  business = "bgpip"
+  domain   = "qq.com"
+  protocol = "https"
 }
 ```
 */
@@ -50,12 +50,14 @@ func dataSourceTencentCloudDayuL7RulesV2() *schema.Resource {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Default:     0,
+				Deprecated:  "It has been deprecated from version 1.81.21.",
 				Description: "The page start offset, default is `0`.",
 			},
 			"limit": {
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Default:     10,
+				Deprecated:  "It has been deprecated from version 1.81.21.",
 				Description: "The number of pages, default is `10`.",
 			},
 			"result_output_file": {
@@ -205,16 +207,16 @@ func dataSourceTencentCloudDayuL7RulesReadV2(d *schema.ResourceData, meta interf
 	}
 
 	business := d.Get("business").(string)
-	offset := d.Get("offset").(int)
-	limit := d.Get("limit").(int)
 	domain := d.Get("domain").(string)
 	protocol := d.Get("protocol").(string)
+	ip := d.Get("ip").(string)
 
 	extendParams := make(map[string]interface{})
 	extendParams["domain"] = domain
 	extendParams["protocol"] = protocol
+	extendParams["ip"] = ip
 
-	rules, _, err := service.DescribeL7RulesV2(ctx, business, offset, limit, extendParams)
+	rules, _, err := service.DescribeL7RulesV2(ctx, business, extendParams)
 	if err != nil {
 		return err
 	}

tencentcloud/resource_tc_dayu_l7_rule_v2.go

@@ -192,7 +192,7 @@ func resourceTencentCloudDayuL7RuleUpdateV2(d *schema.ResourceData, meta interfa
 	extendParams := make(map[string]interface{})
 	extendParams["domain"] = domain
 	extendParams["protocol"] = protocol
-	rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, 0, 10, extendParams)
+	rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, extendParams)
 	if err != nil {
 		return err
 	}
@@ -278,11 +278,9 @@ func resourceTencentCloudDayuL7RuleReadV2(d *schema.ResourceData, meta interface
 	extendParams := make(map[string]interface{})
 	extendParams["domain"] = domain
 	extendParams["protocol"] = protocol
-	offset := 0
-	limit := 10
 	dayuService := DayuService{client: meta.(*TencentCloudClient).apiV3Conn}
 	for {
-		rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, offset, limit, extendParams)
+		rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, extendParams)
 		if err != nil {
 			return err
 		}
@@ -318,7 +316,7 @@ func resourceTencentCloudDayuL7RuleDeleteV2(d *schema.ResourceData, meta interfa
 	extendParams := make(map[string]interface{})
 	extendParams["domain"] = domain
 	extendParams["protocol"] = protocol
-	rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, 0, 10, extendParams)
+	rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, extendParams)
 	if err != nil {
 		return err
 	}

tencentcloud/resource_tc_dayu_l7_rule_v2_test.go

@@ -53,7 +53,7 @@ func testAccCheckDayuL7RuleV2Destroy(s *terraform.State) error {
 		extendParams["domain"] = domain
 		extendParams["protocol"] = protocol
 		dayuService := DayuService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-		rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, 0, 10, extendParams)
+		rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, extendParams)
 		if err != nil {
 			return err
 		}
@@ -101,7 +101,7 @@ func testAccCheckDayuL7RuleV2Exists(n string) resource.TestCheckFunc {
 		extendParams["domain"] = domain
 		extendParams["protocol"] = protocol
 		dayuService := DayuService{client: testAccProvider.Meta().(*TencentCloudClient).apiV3Conn}
-		rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, 0, 10, extendParams)
+		rules, _, err := dayuService.DescribeL7RulesV2(ctx, business, extendParams)
 
 		if err != nil {
 			return err

tencentcloud/service_tencentcloud_dayu.go

@@ -1827,7 +1827,7 @@ func (me *DayuService) SetSession(ctx context.Context, resourceType string, reso
 	return
 }
 
-func (me *DayuService) DescribeL7RulesV2(ctx context.Context, business string, offset int, limit int, extendParams map[string]interface{}) (rules []*dayu.NewL7RuleEntry, healths []*dayu.L7RuleHealth, errRet error) {
+func (me *DayuService) DescribeL7RulesV2(ctx context.Context, business string, extendParams map[string]interface{}) (rules []*dayu.NewL7RuleEntry, healths []*dayu.L7RuleHealth, errRet error) {
 	logId := getLogId(ctx)
 	request := dayu.NewDescribleNewL7RulesRequest()
 
@@ -1850,32 +1850,46 @@ func (me *DayuService) DescribeL7RulesV2(ctx context.Context, business string, o
 			request.Domain = &domain
 		}
 	}
-	offsetUint64 := uint64(offset)
-	request.Offset = &offsetUint64
-	limitUint64 := uint64(limit)
-	request.Limit = &limitUint64
-	var response *dayu.DescribleNewL7RulesResponse
-	errRet = resource.Retry(readRetryTimeout, func() *resource.RetryError {
+	if v, ok := extendParams["ip"]; ok {
+		ip := v.(string)
+		if ip != "" {
+			request.Ip = &ip
+		}
+	}
+
+	var (
+		offset uint64 = 0
+		limit  uint64 = 20
+	)
+
+	for {
+		request.Offset = &offset
+		request.Limit = &limit
 		ratelimit.Check(request.GetAction())
-		response, errRet = me.client.UseDayuClient().DescribleNewL7Rules(request)
+		response, err := me.client.UseDayuClient().DescribleNewL7Rules(request)
 
-		if e, ok := errRet.(*sdkError.TencentCloudSDKError); ok {
-			if e.GetCode() == "InternalError.ClusterNotFound" {
-				return nil
-			}
+		if err != nil {
+			log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n",
+				logId, request.GetAction(), request.ToJsonString(), err.Error())
+			errRet = err
+			return
 		}
-		if errRet != nil {
-			return resource.RetryableError(errRet)
+		log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n",
+			logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
+
+		if response == nil || len(response.Response.Rules) < 1 {
+			break
 		}
-		return nil
-	})
-	if errRet != nil {
-		return
+
+		rules = append(rules, response.Response.Rules...)
+		healths = append(healths, response.Response.Healths...)
+		if len(response.Response.Rules) < int(limit) {
+			break
+		}
+
+		offset += limit
 	}
-	rules = response.Response.Rules
-	healths = response.Response.Healths
 	return
-
 }
 
 func (me *DayuService) CreateL7RuleV2(ctx context.Context, business string, resourceId string, resourceIp string, ruleList []interface{}) (errRet error) {

website/docs/d/dayu_l7_rules_v2.html.markdown

@@ -16,8 +16,8 @@ Use this data source to query new dayu layer 7 rules
 ```hcl
 data "tencentcloud_dayu_l7_rules_v2" "test" {
   business = "bgpip"
-  offset   = 0
-  limit    = 10
+  domain   = "qq.com"
+  protocol = "https"
 }
 ```
 
@@ -28,8 +28,8 @@ The following arguments are supported:
 * `business` - (Required, String) Type of the resource that the layer 4 rule works for, valid values are `bgpip`, `bgp`, `bgp-multip` and `net`.
 * `domain` - (Optional, String) Domain of resource.
 * `ip` - (Optional, String) Ip of the resource.
-* `limit` - (Optional, Int) The number of pages, default is `10`.
-* `offset` - (Optional, Int) The page start offset, default is `0`.
+* `limit` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.81.21. The number of pages, default is `10`.
+* `offset` - (Optional, Int, **Deprecated**) It has been deprecated from version 1.81.21. The page start offset, default is `0`.
 * `protocol` - (Optional, String) Protocol of resource, value range [`http`, `https`].
 * `result_output_file` - (Optional, String) Used to save results.