feat(ELB): add params to elb ipgroups data source

Author: houpeng80

docs/data-sources/elb_ipgroups.md

@@ -33,6 +33,8 @@ The following arguments are supported:
 
 * `description` - (Optional, String) Specifies the description of the IP address group.
 
+* `enterprise_project_id` - (Optional, String) Specifies the enterprise project ID.
+
 * `ip_address` - (Optional, String) Specifies the IP address of the IP address group.
 
 ## Attribute Reference
@@ -53,6 +55,8 @@ The `ipgroups` block supports:
 
 * `description` - The description of the IP address group.
 
+* `enterprise_project_id` - The enterprise project ID.
+
 * `project_id` - The project ID of the IP address group.
 
 * `listeners` - The IDs of listeners with which the IP address group is associated. The [listeners](#Elb_ipgroups_listeners)

huaweicloud/services/acceptance/elb/data_source_huaweicloud_elb_ipgroups_test.go

@@ -26,6 +26,7 @@ func TestAccDatasourceIpGroups_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.name"),
 					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.id"),
 					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.description"),
+					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.enterprise_project_id"),
 					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.project_id"),
 					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.ip_list.0.ip"),
 					resource.TestCheckResourceAttrSet(rName, "ipgroups.0.created_at"),
@@ -71,10 +72,10 @@ output "ipgroup_id_filter_is_useful" {
 }
 
 locals {
-  ip_address = huaweicloud_elb_ipgroup.test.ip_list[0].ip
+  ip_address = tolist(huaweicloud_elb_ipgroup.test.ip_list)[0].ip
 }
 data "huaweicloud_elb_ipgroups" "ip_address_filter" {
-  ip_address = huaweicloud_elb_ipgroup.test.ip_list[0].ip
+  ip_address = tolist(huaweicloud_elb_ipgroup.test.ip_list)[0].ip
 }
 output "ip_address_filter_is_useful" {
   value = length(data.huaweicloud_elb_ipgroups.ip_address_filter.ipgroups) > 0 && alltrue(
@@ -94,5 +95,17 @@ output "description_filter_is_useful" {
   )  
 }
 
+locals {
+  enterprise_project_id = huaweicloud_elb_ipgroup.test.enterprise_project_id
+}
+data "huaweicloud_elb_ipgroups" "enterprise_project_id_filter" {
+  enterprise_project_id = huaweicloud_elb_ipgroup.test.enterprise_project_id
+}
+output "enterprise_project_id_filter_is_useful" {
+  value = length(data.huaweicloud_elb_ipgroups.enterprise_project_id_filter.ipgroups) > 0 && alltrue(
+  [for v in data.huaweicloud_elb_ipgroups.enterprise_project_id_filter.ipgroups[*].enterprise_project_id :
+  v == local.enterprise_project_id]
+  )  
+}
 `, testAccElbV3IpGroupConfig_basic(name), name)
 }

huaweicloud/services/elb/data_source_huaweicloud_elb_ipgroups.go

@@ -37,6 +37,10 @@ func DataSourceElbIpGroups() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"enterprise_project_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"ip_address": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -69,6 +73,10 @@ func ipgroupsSchema() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"enterprise_project_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"project_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -127,7 +135,7 @@ func dataSourceElbIpGroupsRead(_ context.Context, d *schema.ResourceData, meta i
 	}
 	listIpGroupsPath := listIpGroupsClient.Endpoint + listIpGroupsHttpUrl
 	listIpGroupsPath = strings.ReplaceAll(listIpGroupsPath, "{project_id}", listIpGroupsClient.ProjectID)
-	listIpGroupsQueryParams := buildListIpGroupsQueryParams(d)
+	listIpGroupsQueryParams := buildListIpGroupsQueryParams(d, cfg.GetEnterpriseProjectID(d))
 	listIpGroupsPath += listIpGroupsQueryParams
 	listIpGroupsResp, err := pagination.ListAllItems(
 		listIpGroupsClient,
@@ -162,7 +170,7 @@ func dataSourceElbIpGroupsRead(_ context.Context, d *schema.ResourceData, meta i
 	return diag.FromErr(mErr.ErrorOrNil())
 }
 
-func buildListIpGroupsQueryParams(d *schema.ResourceData) string {
+func buildListIpGroupsQueryParams(d *schema.ResourceData, enterpriseProjectId string) string {
 	res := ""
 	if v, ok := d.GetOk("ipgroup_id"); ok {
 		res = fmt.Sprintf("%s&id=%v", res, v)
@@ -176,6 +184,9 @@ func buildListIpGroupsQueryParams(d *schema.ResourceData) string {
 	if v, ok := d.GetOk("ip_address"); ok {
 		res = fmt.Sprintf("%s&ip_list=%v", res, v)
 	}
+	if enterpriseProjectId != "" {
+		res = fmt.Sprintf("%s&enterprise_project_id=%v", res, enterpriseProjectId)
+	}
 	if res != "" {
 		res = "?" + res[1:]
 	}
@@ -194,14 +205,15 @@ func flattenListIpGroupsBody(resp interface{}) []interface{} {
 	rst := make([]interface{}, 0, len(curArray))
 	for _, v := range curArray {
 		rst = append(rst, map[string]interface{}{
-			"id":          utils.PathSearch("id", v, nil),
-			"name":        utils.PathSearch("name", v, nil),
-			"description": utils.PathSearch("description", v, nil),
-			"project_id":  utils.PathSearch("project_id", v, nil),
-			"listeners":   utils.PathSearch("listeners", v, nil),
-			"ip_list":     utils.PathSearch("ip_list", v, nil),
-			"created_at":  utils.PathSearch("created_at", v, nil),
-			"updated_at":  utils.PathSearch("updated_at", v, nil),
+			"id":                    utils.PathSearch("id", v, nil),
+			"name":                  utils.PathSearch("name", v, nil),
+			"description":           utils.PathSearch("description", v, nil),
+			"enterprise_project_id": utils.PathSearch("enterprise_project_id", v, nil),
+			"project_id":            utils.PathSearch("project_id", v, nil),
+			"listeners":             utils.PathSearch("listeners", v, nil),
+			"ip_list":               utils.PathSearch("ip_list", v, nil),
+			"created_at":            utils.PathSearch("created_at", v, nil),
+			"updated_at":            utils.PathSearch("updated_at", v, nil),
 		})
 	}
 	return rst