Updated filter on comp report (#255)

IsaiasA1 · web-flow · commit d48b5d53191e · 2024-12-05T14:40:08.000-06:00
diff --git a/docs/data-sources/compliance_report_resource_group.md b/docs/data-sources/compliance_report_resource_group.md
@@ -47,86 +47,33 @@ limitations under the License.
 */
 
 # commands to run this tf file : terraform init && terraform apply --auto-approve
-
-# To get the resource_group_id you can use the powerflex_resource_group data source as shown below:
-
 # Get all Resource Group details present in the PowerFlex
-data "powerflex_resource_group" "example1" {
-}
-
-# Get Resource Group details using the Name of the Resource Group
-data "powerflex_resource_group" "example3" {
-  resource_group_names = ["Name_1", "Name_2"]
-}
-
-# Get all compliance report details for the given resource group
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
+data "powerflex_compliance_report_resource_group" "example1" {
 }
 
-# Get compliance report details for the given resource group filtered by given ipaddresses
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    ip_addresses = ["10.xxx.xxx.xx", "10.xxx.xxx.xx"]
-  }
-}
-
-# Get compliance report details for the given resource group filtered by resource ids and compliant status
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    resource_ids = ["resourceid1", "resourceid2"]
-    compliant    = true
-  }
-}
-
-# Get compliance report details for the given resource group filtered by compliant resources
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    compliant = true
-  }
-}
-
-# Get compliance report details for the given resource group filtered by hostnames
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    host_names = ["hostname1", "hostname2"]
-  }
-}
-
-# Get compliance report details for the given resource group filtered by service tags
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    service_tags = ["servicetag1", "servicetag2"]
-  }
-}
-
-# Get compliance report details for the given resource group filtered by resource ids
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    resource_ids = ["resourceid1", "resourceid2"]
-  }
-}
+# this datasource supports multiple filters like ip_address, host_name, service_tag, compliant,etc.
+# Note: If both filters are used simultaneously, the results will include any records that match either of the filters.
+# data "powerflex_compliance_report_resource_group" "complianceReport" {
+#   filter {
+#      firmware_repository_name = ["name1", "name2"]
+#      device_type  = ["devicetype1", "devicetype2"]
+#      model = ["model1", "model2"]
+#      resource_ids = ["resourceid1", "resourceid2"]
+#      service_tag = ["servicetag1", "servicetag2"]
+#      compliant = true
+#      embedded_report = true
+#      can_update = true
+#      available = true
+#      device_state  = ["devicestate1", "devicestate2"]
+#      managed_state = ["managedstate1", "managedstate2"]
+#      host_name = ["hostname1", "hostname2"]
+#      id = ["id1", "id2"]
+#      ip_address = ["ip1", "ip2"]
+#   }
+# }
 
 output "result" {
-  value = data.powerflex_compliance_report_resource_group.complianceReport
+  value = data.powerflex_compliance_report_resource_group.example1
 }
 ```
 
@@ -135,10 +82,6 @@ After the successful execution of above said block, we can see the output by exe
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
-### Required
-
-- `resource_group_id` (String) Unique id Of resource group for which you want to get the compliance report. Conflicts with resource_group_name
-
 ### Optional
 
 - `filter` (Block, Optional) (see [below for nested schema](#nestedblock--filter))
@@ -153,11 +96,19 @@ After the successful execution of above said block, we can see the output by exe
 
 Optional:
 
-- `compliant` (Boolean) Compliant status for resources.
-- `host_names` (Set of String) List of host names for resources.
-- `ip_addresses` (Set of String) List of Ip Address for resources.
-- `resource_ids` (Set of String) List of resource ids.
-- `service_tags` (Set of String) List of service tags for resources.
+- `available` (Boolean) Value for available
+- `can_update` (Boolean) Value for can_update
+- `compliant` (Boolean) Value for compliant
+- `device_state` (Set of String) List of device_state
+- `device_type` (Set of String) List of device_type
+- `embedded_report` (Boolean) Value for embedded_report
+- `firmware_repository_name` (Set of String) List of firmware_repository_name
+- `host_name` (Set of String) List of host_name
+- `id` (Set of String) List of id
+- `ip_address` (Set of String) List of ip_address
+- `managed_state` (Set of String) List of managed_state
+- `model` (Set of String) List of model
+- `service_tag` (Set of String) List of service_tag
 
 
 <a id="nestedatt--compliance_reports"></a>
diff --git a/examples/data-sources/powerflex_compliance_report_resource_group/data-source.tf b/examples/data-sources/powerflex_compliance_report_resource_group/data-source.tf
@@ -16,84 +16,31 @@ limitations under the License.
 */
 
 # commands to run this tf file : terraform init && terraform apply --auto-approve
-
-# To get the resource_group_id you can use the powerflex_resource_group data source as shown below:
-
 # Get all Resource Group details present in the PowerFlex
-data "powerflex_resource_group" "example1" {
-}
-
-# Get Resource Group details using the Name of the Resource Group
-data "powerflex_resource_group" "example3" {
-  resource_group_names = ["Name_1", "Name_2"]
-}
-
-# Get all compliance report details for the given resource group
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-}
-
-# Get compliance report details for the given resource group filtered by given ipaddresses
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    ip_addresses = ["10.xxx.xxx.xx", "10.xxx.xxx.xx"]
-  }
-}
-
-# Get compliance report details for the given resource group filtered by resource ids and compliant status
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    resource_ids = ["resourceid1", "resourceid2"]
-    compliant    = true
-  }
-}
-
-# Get compliance report details for the given resource group filtered by compliant resources
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    compliant = true
-  }
-}
-
-# Get compliance report details for the given resource group filtered by hostnames
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    host_names = ["hostname1", "hostname2"]
-  }
-}
-
-# Get compliance report details for the given resource group filtered by service tags
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    service_tags = ["servicetag1", "servicetag2"]
-  }
-}
-
-# Get compliance report details for the given resource group filtered by resource ids
-data "powerflex_compliance_report_resource_group" "complianceReport" {
-  resource_group_id = "ID"
-  # this datasource supports multiple filters like ip_addresses, host_names, service_tags, resource_ids, compliant
-  # and gives an intersection of the results
-  filter {
-    resource_ids = ["resourceid1", "resourceid2"]
-  }
-}
+data "powerflex_compliance_report_resource_group" "example1" {
+}
+
+# this datasource supports multiple filters like ip_address, host_name, service_tag, compliant,etc.
+# Note: If both filters are used simultaneously, the results will include any records that match either of the filters.
+# data "powerflex_compliance_report_resource_group" "complianceReport" {
+#   filter {
+#      firmware_repository_name = ["name1", "name2"]
+#      device_type  = ["devicetype1", "devicetype2"]
+#      model = ["model1", "model2"]
+#      resource_ids = ["resourceid1", "resourceid2"]
+#      service_tag = ["servicetag1", "servicetag2"]
+#      compliant = true
+#      embedded_report = true
+#      can_update = true
+#      available = true
+#      device_state  = ["devicestate1", "devicestate2"]
+#      managed_state = ["managedstate1", "managedstate2"]
+#      host_name = ["hostname1", "hostname2"]
+#      id = ["id1", "id2"]
+#      ip_address = ["ip1", "ip2"]
+#   }
+# }
 
 output "result" {
-  value = data.powerflex_compliance_report_resource_group.complianceReport
+  value = data.powerflex_compliance_report_resource_group.example1
 }
diff --git a/powerflex/helper/compliance_report_resource_group_helper.go b/powerflex/helper/compliance_report_resource_group_helper.go
@@ -18,7 +18,6 @@ limitations under the License.
 package helper
 
 import (
-	"fmt"
 	"terraform-provider-powerflex/powerflex/models"
 
 	scaleiotypes "github.com/dell/goscaleio/types/v1"
@@ -81,26 +80,3 @@ func GetComplianceReportComponentVersionInfo(versionInfo scaleiotypes.Compliance
 		FirmwareLevel:      types.StringValue(versionInfo.FirmwareLevel),
 	}
 }
-
-// GetFilteredComplianceReports returns a list of compliance reports that match the filter
-func GetFilteredComplianceReports(complianceReports []scaleiotypes.ComplianceReport, filter models.ComplianceReportFilterType) ([]scaleiotypes.ComplianceReport, error) {
-	var matchingReports []scaleiotypes.ComplianceReport
-
-	for _, report := range complianceReports {
-		ipAddressesMatch := filter.IPAddresses.IsNull() || SetContains(filter.IPAddresses, report.IPAddress)
-		serviceTagsMatch := filter.ServiceTags.IsNull() || SetContains(filter.ServiceTags, report.ServiceTag)
-		hostNamesMatch := filter.HostNames.IsNull() || SetContains(filter.HostNames, report.HostName)
-		resourceIDsMatch := filter.ResourceIDs.IsNull() || SetContains(filter.ResourceIDs, report.ID)
-		compliantMatch := filter.Compliant.IsNull() || filter.Compliant.ValueBool() == report.Compliant
-
-		if ipAddressesMatch && serviceTagsMatch && hostNamesMatch && resourceIDsMatch && compliantMatch {
-			matchingReports = append(matchingReports, report)
-		}
-	}
-
-	if len(matchingReports) == 0 {
-		return nil, fmt.Errorf("no compliance reports found matching the filter: %+v", filter)
-	}
-
-	return matchingReports, nil
-}
diff --git a/powerflex/models/complaince_report_resource_group.go b/powerflex/models/complaince_report_resource_group.go
@@ -25,17 +25,24 @@ import (
 type ComplianceReportResourceGroupDatasource struct {
 	ComplianceReports      []ComplianceReportResourceGroup `tfsdk:"compliance_reports"`
 	ID                     types.String                    `tfsdk:"id"`
-	ResourceGroupID        types.String                    `tfsdk:"resource_group_id"`
 	ComplianceReportFilter *ComplianceReportFilterType     `tfsdk:"filter"`
 }
 
 // ComplianceReportFilterType defines the filter for datasource
 type ComplianceReportFilterType struct {
-	IPAddresses types.Set  `tfsdk:"ip_addresses"`
-	ServiceTags types.Set  `tfsdk:"service_tags"`
-	Compliant   types.Bool `tfsdk:"compliant"`
-	HostNames   types.Set  `tfsdk:"host_names"`
-	ResourceIDs types.Set  `tfsdk:"resource_ids"`
+	ServiceTag             []types.String `tfsdk:"service_tag"`
+	IPAddress              []types.String `tfsdk:"ip_address"`
+	FirmwareRepositoryName []types.String `tfsdk:"firmware_repository_name"`
+	Compliant              types.Bool     `tfsdk:"compliant"`
+	DeviceType             []types.String `tfsdk:"device_type"`
+	Model                  []types.String `tfsdk:"model"`
+	Available              types.Bool     `tfsdk:"available"`
+	ManagedState           []types.String `tfsdk:"managed_state"`
+	EmbeddedReport         types.Bool     `tfsdk:"embedded_report"`
+	DeviceState            []types.String `tfsdk:"device_state"`
+	ID                     []types.String `tfsdk:"id"`
+	HostName               []types.String `tfsdk:"host_name"`
+	CanUpdate              types.Bool     `tfsdk:"can_update"`
 }
 
 // ComplianceReportResourceGroup defines the compliance report for a service.
diff --git a/powerflex/provider/compliance_report_resource_group_datasource.go b/powerflex/provider/compliance_report_resource_group_datasource.go
@@ -78,6 +78,7 @@ func (d *complianceReportResourceGroupDataSource) Configure(_ context.Context, r
 func (d *complianceReportResourceGroupDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
 	tflog.Info(ctx, "Started compliance report data source read method")
 
+	var complianceReports, complianceReportAll []scaleiotypes.ComplianceReport
 	var state models.ComplianceReportResourceGroupDatasource
 
 	diags := req.Config.Get(ctx, &state)
@@ -86,29 +87,45 @@ func (d *complianceReportResourceGroupDataSource) Read(ctx context.Context, req
 		return
 	}
 
-	// Get all Compliance Reports
-	complianceReportList, err := d.gatewayClient.GetServiceComplianceDetails(state.ResourceGroupID.ValueString())
+	//Get all resource groups
+	serviceDetails, err := d.gatewayClient.GetAllServiceDetails()
 	if err != nil {
-		resp.Diagnostics.AddError(
-			"Error in getting compliance report for resource group.",
-			err.Error(),
-		)
+		resp.Diagnostics.AddError("Error in getting service details", err.Error())
 		return
 	}
-	complianceReports := make([]scaleiotypes.ComplianceReport, 0)
+
+	for _, service := range serviceDetails {
+		resourceGroupID := types.StringValue(service.ID)
+		// Get all Compliance Reports
+		complianceReport, err := d.gatewayClient.GetServiceComplianceDetails(resourceGroupID.ValueString())
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Error in getting compliance report(s) for resource group.",
+				err.Error(),
+			)
+			return
+		}
+
+		complianceReportAll = append(complianceReportAll, complianceReport...)
+	}
+
 	if state.ComplianceReportFilter == nil {
 		// add all reports
-		complianceReports = append(complianceReports, complianceReportList...)
+		complianceReports = append(complianceReports, complianceReportAll...)
 	} else {
 		// Get filtered reports
-		complianceReports, err = helper.GetFilteredComplianceReports(complianceReportList, *state.ComplianceReportFilter)
+		complianceReportsFiltered, err := helper.GetDataSourceByValue(*state.ComplianceReportFilter, complianceReportAll)
 		if err != nil {
 			resp.Diagnostics.AddError(
 				"Error in getting compliance report for resource group for given filter.",
 				err.Error(),
 			)
 			return
 		}
+		// Convert filtered reports to compliance reports
+		for _, val := range complianceReportsFiltered {
+			complianceReports = append(complianceReports, val.(scaleiotypes.ComplianceReport))
+		}
 	}
 
 	state.ComplianceReports = helper.GetComplianceReportsModel(complianceReports)
diff --git a/powerflex/provider/compliance_report_resource_group_datasource_test.go b/powerflex/provider/compliance_report_resource_group_datasource_test.go
diff --git a/powerflex/provider/compliance_report_resource_group_schema.go b/powerflex/provider/compliance_report_resource_group_schema.go
