Add an option to group posture results by control

deepfence_frontend/apps/dashboard/api-spec.json

@@ -6870,6 +6870,118 @@
         "security": [{ "bearer_token": [] }]
       }
     },
+    "/deepfence/scan/results/count/group/cloud-compliance": {
+      "post": {
+        "tags": ["Compliance"],
+        "summary": "Count Cloud Compliance Results by Control ID",
+        "description": "Count Cloud Compliance Results grouped by Control ID",
+        "operationId": "groupResultsCloudCompliance",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModelComplinaceScanResultsGroupReq"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModelComplinaceScanResultsGroupResp"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
+              }
+            }
+          },
+          "401": { "description": "Unauthorized" },
+          "403": { "description": "Forbidden" },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal Server Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
+              }
+            }
+          }
+        },
+        "security": [{ "bearer_token": [] }]
+      }
+    },
+    "/deepfence/scan/results/count/group/compliance": {
+      "post": {
+        "tags": ["Compliance"],
+        "summary": "Count Compliance Results by Control ID",
+        "description": "Count Compliance Results grouped by Control ID",
+        "operationId": "groupResultsCompliance",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ModelComplinaceScanResultsGroupReq"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModelComplinaceScanResultsGroupResp"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/ApiDocsBadRequestResponse" }
+              }
+            }
+          },
+          "401": { "description": "Unauthorized" },
+          "403": { "description": "Forbidden" },
+          "404": {
+            "description": "Not Found",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
+              }
+            }
+          },
+          "500": {
+            "description": "Internal Server Error",
+            "content": {
+              "application/json": {
+                "schema": { "$ref": "#/components/schemas/ApiDocsFailureResponse" }
+              }
+            }
+          }
+        },
+        "security": [{ "bearer_token": [] }]
+      }
+    },
     "/deepfence/scan/results/count/group/malware": {
       "get": {
         "tags": ["Malware Scan"],
@@ -13503,9 +13615,12 @@
             "items": { "type": "string" },
             "nullable": true
           },
+          "category_hierarchy_short": { "type": "string" },
+          "compliance_type": { "type": "string" },
           "control_id": { "type": "string" },
           "description": { "type": "string" },
           "enabled": { "type": "boolean" },
+          "node_id": { "type": "string" },
           "service": { "type": "string" },
           "title": { "type": "string" }
         }
@@ -13766,6 +13881,27 @@
           }
         }
       },
+      "ModelComplinaceScanResultsGroupReq": {
+        "required": ["scan_id", "fields_filter"],
+        "type": "object",
+        "properties": {
+          "fields_filter": { "$ref": "#/components/schemas/ReportersFieldsFilters" },
+          "scan_id": { "type": "string" }
+        }
+      },
+      "ModelComplinaceScanResultsGroupResp": {
+        "type": "object",
+        "properties": {
+          "groups": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "additionalProperties": { "type": "integer" }
+            },
+            "nullable": true
+          }
+        }
+      },
       "ModelConnection": {
         "type": "object",
         "properties": {
@@ -16008,7 +16144,8 @@
               "nist",
               "hipaa",
               "pci",
-              "soc_2"
+              "soc_2",
+              "aws_foundational_security"
             ],
             "type": "array",
             "items": { "type": "string" },

deepfence_frontend/apps/dashboard/src/api/api.ts

@@ -121,6 +121,10 @@ export function getComplianceApiClient() {
     resultCountComplianceScan:
       complianceApi.countResultsComplianceScan.bind(complianceApi),
     listComplianceScan: complianceApi.listComplianceScan.bind(complianceApi),
+    scanResultCloudComplianceCountsByControls:
+      complianceApi.groupResultsCloudCompliance.bind(complianceApi),
+    scanResultComplianceCountsByControls:
+      complianceApi.groupResultsCompliance.bind(complianceApi),
   };
 }
 

deepfence_frontend/apps/dashboard/src/api/generated/.openapi-generator/FILES

@@ -104,6 +104,8 @@ models/ModelComplianceScanInfo.ts
 models/ModelComplianceScanResult.ts
 models/ModelComplianceScanStatusResp.ts
 models/ModelComplianceScanTriggerReq.ts
+models/ModelComplinaceScanResultsGroupReq.ts
+models/ModelComplinaceScanResultsGroupResp.ts
 models/ModelConnection.ts
 models/ModelContainer.ts
 models/ModelContainerImage.ts

deepfence_frontend/apps/dashboard/src/api/generated/apis/ComplianceApi.ts

@@ -21,6 +21,8 @@ import type {
   IngestersComplianceScanStatus,
   ModelComplianceScanResult,
   ModelComplianceScanTriggerReq,
+  ModelComplinaceScanResultsGroupReq,
+  ModelComplinaceScanResultsGroupResp,
   ModelScanListReq,
   ModelScanListResp,
   ModelScanResultsReq,
@@ -43,6 +45,10 @@ import {
     ModelComplianceScanResultToJSON,
     ModelComplianceScanTriggerReqFromJSON,
     ModelComplianceScanTriggerReqToJSON,
+    ModelComplinaceScanResultsGroupReqFromJSON,
+    ModelComplinaceScanResultsGroupReqToJSON,
+    ModelComplinaceScanResultsGroupRespFromJSON,
+    ModelComplinaceScanResultsGroupRespToJSON,
     ModelScanListReqFromJSON,
     ModelScanListReqToJSON,
     ModelScanListRespFromJSON,
@@ -65,6 +71,14 @@ export interface CountResultsComplianceScanRequest {
     modelScanResultsReq?: ModelScanResultsReq;
 }
 
+export interface GroupResultsCloudComplianceRequest {
+    modelComplinaceScanResultsGroupReq?: ModelComplinaceScanResultsGroupReq;
+}
+
+export interface GroupResultsComplianceRequest {
+    modelComplinaceScanResultsGroupReq?: ModelComplinaceScanResultsGroupReq;
+}
+
 export interface IngestComplianceScanStatusRequest {
     ingestersComplianceScanStatus?: Array<IngestersComplianceScanStatus> | null;
 }
@@ -116,6 +130,38 @@ export interface ComplianceApiInterface {
      */
     countResultsComplianceScan(requestParameters: CountResultsComplianceScanRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<SearchSearchCountResp>;
 
+    /**
+     * Count Cloud Compliance Results grouped by Control ID
+     * @summary Count Cloud Compliance Results by Control ID
+     * @param {ModelComplinaceScanResultsGroupReq} [modelComplinaceScanResultsGroupReq] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ComplianceApiInterface
+     */
+    groupResultsCloudComplianceRaw(requestParameters: GroupResultsCloudComplianceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelComplinaceScanResultsGroupResp>>;
+
+    /**
+     * Count Cloud Compliance Results grouped by Control ID
+     * Count Cloud Compliance Results by Control ID
+     */
+    groupResultsCloudCompliance(requestParameters: GroupResultsCloudComplianceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelComplinaceScanResultsGroupResp>;
+
+    /**
+     * Count Compliance Results grouped by Control ID
+     * @summary Count Compliance Results by Control ID
+     * @param {ModelComplinaceScanResultsGroupReq} [modelComplinaceScanResultsGroupReq] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ComplianceApiInterface
+     */
+    groupResultsComplianceRaw(requestParameters: GroupResultsComplianceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelComplinaceScanResultsGroupResp>>;
+
+    /**
+     * Count Compliance Results grouped by Control ID
+     * Count Compliance Results by Control ID
+     */
+    groupResultsCompliance(requestParameters: GroupResultsComplianceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelComplinaceScanResultsGroupResp>;
+
     /**
      * Ingest compliance issues found while scanning the agent
      * @summary Ingest Compliance Scan Status
@@ -274,6 +320,84 @@ export class ComplianceApi extends runtime.BaseAPI implements ComplianceApiInter
         return await response.value();
     }
 
+    /**
+     * Count Cloud Compliance Results grouped by Control ID
+     * Count Cloud Compliance Results by Control ID
+     */
+    async groupResultsCloudComplianceRaw(requestParameters: GroupResultsCloudComplianceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelComplinaceScanResultsGroupResp>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        if (this.configuration && this.configuration.accessToken) {
+            const token = this.configuration.accessToken;
+            const tokenString = await token("bearer_token", []);
+
+            if (tokenString) {
+                headerParameters["Authorization"] = `Bearer ${tokenString}`;
+            }
+        }
+        const response = await this.request({
+            path: `/deepfence/scan/results/count/group/cloud-compliance`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: ModelComplinaceScanResultsGroupReqToJSON(requestParameters.modelComplinaceScanResultsGroupReq),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ModelComplinaceScanResultsGroupRespFromJSON(jsonValue));
+    }
+
+    /**
+     * Count Cloud Compliance Results grouped by Control ID
+     * Count Cloud Compliance Results by Control ID
+     */
+    async groupResultsCloudCompliance(requestParameters: GroupResultsCloudComplianceRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelComplinaceScanResultsGroupResp> {
+        const response = await this.groupResultsCloudComplianceRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
+    /**
+     * Count Compliance Results grouped by Control ID
+     * Count Compliance Results by Control ID
+     */
+    async groupResultsComplianceRaw(requestParameters: GroupResultsComplianceRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelComplinaceScanResultsGroupResp>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        if (this.configuration && this.configuration.accessToken) {
+            const token = this.configuration.accessToken;
+            const tokenString = await token("bearer_token", []);
+
+            if (tokenString) {
+                headerParameters["Authorization"] = `Bearer ${tokenString}`;
+            }
+        }
+        const response = await this.request({
+            path: `/deepfence/scan/results/count/group/compliance`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: ModelComplinaceScanResultsGroupReqToJSON(requestParameters.modelComplinaceScanResultsGroupReq),
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ModelComplinaceScanResultsGroupRespFromJSON(jsonValue));
+    }
+
+    /**
+     * Count Compliance Results grouped by Control ID
+     * Count Compliance Results by Control ID
+     */
+    async groupResultsCompliance(requestParameters: GroupResultsComplianceRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelComplinaceScanResultsGroupResp> {
+        const response = await this.groupResultsComplianceRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
     /**
      * Ingest compliance issues found while scanning the agent
      * Ingest Compliance Scan Status