Merge pull request #1725 from deepfence/ui-priority-scan-1592

Added priority scan option
deepfence · Nov 10, 2023 · 84bd055 · 84bd055
2 parents bff4928 + dff2cb8
commit 84bd055
Show file tree

Hide file tree

Showing 13 changed files with 145 additions and 49 deletions.
diff --git a/deepfence_frontend/apps/dashboard/api-spec.json b/deepfence_frontend/apps/dashboard/api-spec.json
@@ -7051,9 +7051,9 @@
     "/deepfence/scheduled-task/{id}": {
       "delete": {
         "tags": ["Settings"],
-        "summary": "Delete Schedule task",
-        "description": "Delete Schedule task",
-        "operationId": "deleteScheduledTask",
+        "summary": "Delete Custom Schedule task",
+        "description": "Delete Custom Schedule task",
+        "operationId": "deleteCustomScheduledTask",
         "parameters": [
           {
             "name": "id",
@@ -11317,6 +11317,7 @@
           "cron_expr": { "type": "string" },
           "description": { "type": "string" },
           "filters": { "$ref": "#/components/schemas/ModelScanFilter" },
+          "is_priority": { "type": "boolean" },
           "node_ids": {
             "type": "array",
             "items": { "$ref": "#/components/schemas/ModelNodeIdentifier" },
@@ -11879,6 +11880,7 @@
             "nullable": true
           },
           "filters": { "$ref": "#/components/schemas/ModelScanFilter" },
+          "is_priority": { "type": "boolean" },
           "node_ids": {
             "type": "array",
             "items": { "$ref": "#/components/schemas/ModelNodeIdentifier" },
@@ -12467,6 +12469,7 @@
         "type": "object",
         "properties": {
           "filters": { "$ref": "#/components/schemas/ModelScanFilter" },
+          "is_priority": { "type": "boolean" },
           "node_ids": {
             "type": "array",
             "items": { "$ref": "#/components/schemas/ModelNodeIdentifier" },
@@ -13144,6 +13147,7 @@
         "type": "object",
         "properties": {
           "filters": { "$ref": "#/components/schemas/ModelScanFilter" },
+          "is_priority": { "type": "boolean" },
           "node_ids": {
             "type": "array",
             "items": { "$ref": "#/components/schemas/ModelNodeIdentifier" },
@@ -13487,6 +13491,7 @@
         "type": "object",
         "properties": {
           "filters": { "$ref": "#/components/schemas/ModelScanFilter" },
+          "is_priority": { "type": "boolean" },
           "node_ids": {
             "type": "array",
             "items": { "$ref": "#/components/schemas/ModelNodeIdentifier" },

diff --git a/deepfence_frontend/apps/dashboard/src/api/api.ts b/deepfence_frontend/apps/dashboard/src/api/api.ts
@@ -332,7 +332,7 @@ export function getSettingsApiClient() {
       settingsApi.uploadVulnerabilityDatabase.bind(settingsApi),
     getScheduledTasks: settingsApi.getScheduledTasks.bind(settingsApi),
     updateScheduledTask: settingsApi.updateScheduledTask.bind(settingsApi),
-    deleteScheduledTask: settingsApi.deleteScheduledTask.bind(settingsApi),
+    deleteCustomScheduledTask: settingsApi.deleteCustomScheduledTask.bind(settingsApi),
     addScheduledTask: settingsApi.addScheduledTask.bind(settingsApi),
   };
 }

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/apis/SettingsApi.ts b/deepfence_frontend/apps/dashboard/src/api/generated/apis/SettingsApi.ts
@@ -66,12 +66,12 @@ export interface AddScheduledTaskRequest {
     modelAddScheduledTaskRequest?: ModelAddScheduledTaskRequest;
 }
 
-export interface DeleteEmailConfigurationRequest {
-    configId: string;
+export interface DeleteCustomScheduledTaskRequest {
+    id: number;
 }
 
-export interface DeleteScheduledTaskRequest {
-    id: number;
+export interface DeleteEmailConfigurationRequest {
+    configId: string;
 }
 
 export interface GetUserAuditLogsRequest {
@@ -132,36 +132,36 @@ export interface SettingsApiInterface {
     addScheduledTask(requestParameters: AddScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
 
     /**
-     * Delete Email Smtp / ses Configurations in system
-     * @summary Delete Email Configurations
-     * @param {string} configId 
+     * Delete Custom Schedule task
+     * @summary Delete Custom Schedule task
+     * @param {number} id 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SettingsApiInterface
      */
-    deleteEmailConfigurationRaw(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
+    deleteCustomScheduledTaskRaw(requestParameters: DeleteCustomScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
 
     /**
-     * Delete Email Smtp / ses Configurations in system
-     * Delete Email Configurations
+     * Delete Custom Schedule task
+     * Delete Custom Schedule task
      */
-    deleteEmailConfiguration(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
+    deleteCustomScheduledTask(requestParameters: DeleteCustomScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
 
     /**
-     * Delete Schedule task
-     * @summary Delete Schedule task
-     * @param {number} id 
+     * Delete Email Smtp / ses Configurations in system
+     * @summary Delete Email Configurations
+     * @param {string} configId 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SettingsApiInterface
      */
-    deleteScheduledTaskRaw(requestParameters: DeleteScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
+    deleteEmailConfigurationRaw(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
 
     /**
-     * Delete Schedule task
-     * Delete Schedule task
+     * Delete Email Smtp / ses Configurations in system
+     * Delete Email Configurations
      */
-    deleteScheduledTask(requestParameters: DeleteScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
+    deleteEmailConfiguration(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
 
     /**
      * Get Email Smtp / ses Configurations in system
@@ -374,12 +374,12 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
     }
 
     /**
-     * Delete Email Smtp / ses Configurations in system
-     * Delete Email Configurations
+     * Delete Custom Schedule task
+     * Delete Custom Schedule task
      */
-    async deleteEmailConfigurationRaw(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.configId === null || requestParameters.configId === undefined) {
-            throw new runtime.RequiredError('configId','Required parameter requestParameters.configId was null or undefined when calling deleteEmailConfiguration.');
+    async deleteCustomScheduledTaskRaw(requestParameters: DeleteCustomScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.id === null || requestParameters.id === undefined) {
+            throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling deleteCustomScheduledTask.');
         }
 
         const queryParameters: any = {};
@@ -395,7 +395,7 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
             }
         }
         const response = await this.request({
-            path: `/deepfence/settings/email/{config_id}`.replace(`{${"config_id"}}`, encodeURIComponent(String(requestParameters.configId))),
+            path: `/deepfence/scheduled-task/{id}`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters.id))),
             method: 'DELETE',
             headers: headerParameters,
             query: queryParameters,
@@ -405,20 +405,20 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
     }
 
     /**
-     * Delete Email Smtp / ses Configurations in system
-     * Delete Email Configurations
+     * Delete Custom Schedule task
+     * Delete Custom Schedule task
      */
-    async deleteEmailConfiguration(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
-        await this.deleteEmailConfigurationRaw(requestParameters, initOverrides);
+    async deleteCustomScheduledTask(requestParameters: DeleteCustomScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.deleteCustomScheduledTaskRaw(requestParameters, initOverrides);
     }
 
     /**
-     * Delete Schedule task
-     * Delete Schedule task
+     * Delete Email Smtp / ses Configurations in system
+     * Delete Email Configurations
      */
-    async deleteScheduledTaskRaw(requestParameters: DeleteScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.id === null || requestParameters.id === undefined) {
-            throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling deleteScheduledTask.');
+    async deleteEmailConfigurationRaw(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.configId === null || requestParameters.configId === undefined) {
+            throw new runtime.RequiredError('configId','Required parameter requestParameters.configId was null or undefined when calling deleteEmailConfiguration.');
         }
 
         const queryParameters: any = {};
@@ -434,7 +434,7 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
             }
         }
         const response = await this.request({
-            path: `/deepfence/scheduled-task/{id}`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters.id))),
+            path: `/deepfence/settings/email/{config_id}`.replace(`{${"config_id"}}`, encodeURIComponent(String(requestParameters.configId))),
             method: 'DELETE',
             headers: headerParameters,
             query: queryParameters,
@@ -444,11 +444,11 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
     }
 
     /**
-     * Delete Schedule task
-     * Delete Schedule task
+     * Delete Email Smtp / ses Configurations in system
+     * Delete Email Configurations
      */
-    async deleteScheduledTask(requestParameters: DeleteScheduledTaskRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
-        await this.deleteScheduledTaskRaw(requestParameters, initOverrides);
+    async deleteEmailConfiguration(requestParameters: DeleteEmailConfigurationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.deleteEmailConfigurationRaw(requestParameters, initOverrides);
     }
 
     /**

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelAddScheduledTaskRequest.ts b/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelAddScheduledTaskRequest.ts
@@ -68,6 +68,12 @@ export interface ModelAddScheduledTaskRequest {
      * @memberof ModelAddScheduledTaskRequest
      */
     filters: ModelScanFilter;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ModelAddScheduledTaskRequest
+     */
+    is_priority?: boolean;
     /**
      * 
      * @type {Array<ModelNodeIdentifier>}
@@ -125,6 +131,7 @@ export function ModelAddScheduledTaskRequestFromJSONTyped(json: any, ignoreDiscr
         'cron_expr': !exists(json, 'cron_expr') ? undefined : json['cron_expr'],
         'description': !exists(json, 'description') ? undefined : json['description'],
         'filters': ModelScanFilterFromJSON(json['filters']),
+        'is_priority': !exists(json, 'is_priority') ? undefined : json['is_priority'],
         'node_ids': (json['node_ids'] === null ? null : (json['node_ids'] as Array<any>).map(ModelNodeIdentifierFromJSON)),
         'scan_config': (json['scan_config'] === null ? null : (json['scan_config'] as Array<any>).map(ModelVulnerabilityScanConfigLanguageFromJSON)),
     };
@@ -144,6 +151,7 @@ export function ModelAddScheduledTaskRequestToJSON(value?: ModelAddScheduledTask
         'cron_expr': value.cron_expr,
         'description': value.description,
         'filters': ModelScanFilterToJSON(value.filters),
+        'is_priority': value.is_priority,
         'node_ids': (value.node_ids === null ? null : (value.node_ids as Array<any>).map(ModelNodeIdentifierToJSON)),
         'scan_config': (value.scan_config === null ? null : (value.scan_config as Array<any>).map(ModelVulnerabilityScanConfigLanguageToJSON)),
     };

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelComplianceScanTriggerReq.ts b/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelComplianceScanTriggerReq.ts
@@ -44,6 +44,12 @@ export interface ModelComplianceScanTriggerReq {
      * @memberof ModelComplianceScanTriggerReq
      */
     filters: ModelScanFilter;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ModelComplianceScanTriggerReq
+     */
+    is_priority?: boolean;
     /**
      * 
      * @type {Array<ModelNodeIdentifier>}
@@ -76,6 +82,7 @@ export function ModelComplianceScanTriggerReqFromJSONTyped(json: any, ignoreDisc
 
         'benchmark_types': json['benchmark_types'],
         'filters': ModelScanFilterFromJSON(json['filters']),
+        'is_priority': !exists(json, 'is_priority') ? undefined : json['is_priority'],
         'node_ids': (json['node_ids'] === null ? null : (json['node_ids'] as Array<any>).map(ModelNodeIdentifierFromJSON)),
     };
 }
@@ -91,6 +98,7 @@ export function ModelComplianceScanTriggerReqToJSON(value?: ModelComplianceScanT
 
         'benchmark_types': value.benchmark_types,
         'filters': ModelScanFilterToJSON(value.filters),
+        'is_priority': value.is_priority,
         'node_ids': (value.node_ids === null ? null : (value.node_ids as Array<any>).map(ModelNodeIdentifierToJSON)),
     };
 }

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelMalwareScanTriggerReq.ts b/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelMalwareScanTriggerReq.ts
@@ -38,6 +38,12 @@ export interface ModelMalwareScanTriggerReq {
      * @memberof ModelMalwareScanTriggerReq
      */
     filters: ModelScanFilter;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ModelMalwareScanTriggerReq
+     */
+    is_priority?: boolean;
     /**
      * 
      * @type {Array<ModelNodeIdentifier>}
@@ -68,6 +74,7 @@ export function ModelMalwareScanTriggerReqFromJSONTyped(json: any, ignoreDiscrim
     return {
 
         'filters': ModelScanFilterFromJSON(json['filters']),
+        'is_priority': !exists(json, 'is_priority') ? undefined : json['is_priority'],
         'node_ids': (json['node_ids'] === null ? null : (json['node_ids'] as Array<any>).map(ModelNodeIdentifierFromJSON)),
     };
 }
@@ -82,6 +89,7 @@ export function ModelMalwareScanTriggerReqToJSON(value?: ModelMalwareScanTrigger
     return {
 
         'filters': ModelScanFilterToJSON(value.filters),
+        'is_priority': value.is_priority,
         'node_ids': (value.node_ids === null ? null : (value.node_ids as Array<any>).map(ModelNodeIdentifierToJSON)),
     };
 }

diff --git a/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelSecretScanTriggerReq.ts b/deepfence_frontend/apps/dashboard/src/api/generated/models/ModelSecretScanTriggerReq.ts
@@ -38,6 +38,12 @@ export interface ModelSecretScanTriggerReq {
      * @memberof ModelSecretScanTriggerReq
      */
     filters: ModelScanFilter;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ModelSecretScanTriggerReq
+     */
+    is_priority?: boolean;
     /**
      * 
      * @type {Array<ModelNodeIdentifier>}
@@ -68,6 +74,7 @@ export function ModelSecretScanTriggerReqFromJSONTyped(json: any, ignoreDiscrimi
     return {
 
         'filters': ModelScanFilterFromJSON(json['filters']),
+        'is_priority': !exists(json, 'is_priority') ? undefined : json['is_priority'],
         'node_ids': (json['node_ids'] === null ? null : (json['node_ids'] as Array<any>).map(ModelNodeIdentifierFromJSON)),
     };
 }
@@ -82,6 +89,7 @@ export function ModelSecretScanTriggerReqToJSON(value?: ModelSecretScanTriggerRe
     return {
 
         'filters': ModelScanFilterToJSON(value.filters),
+        'is_priority': value.is_priority,
         'node_ids': (value.node_ids === null ? null : (value.node_ids as Array<any>).map(ModelNodeIdentifierToJSON)),
     };
 }

diff --git a/...ence_frontend/apps/dashboard/src/api/generated/models/ModelVulnerabilityScanTriggerReq.ts b/...ence_frontend/apps/dashboard/src/api/generated/models/ModelVulnerabilityScanTriggerReq.ts
@@ -44,6 +44,12 @@ export interface ModelVulnerabilityScanTriggerReq {
      * @memberof ModelVulnerabilityScanTriggerReq
      */
     filters: ModelScanFilter;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ModelVulnerabilityScanTriggerReq
+     */
+    is_priority?: boolean;
     /**
      * 
      * @type {Array<ModelNodeIdentifier>}
@@ -81,6 +87,7 @@ export function ModelVulnerabilityScanTriggerReqFromJSONTyped(json: any, ignoreD
     return {
 
         'filters': ModelScanFilterFromJSON(json['filters']),
+        'is_priority': !exists(json, 'is_priority') ? undefined : json['is_priority'],
         'node_ids': (json['node_ids'] === null ? null : (json['node_ids'] as Array<any>).map(ModelNodeIdentifierFromJSON)),
         'scan_config': (json['scan_config'] === null ? null : (json['scan_config'] as Array<any>).map(ModelVulnerabilityScanConfigLanguageFromJSON)),
     };
@@ -96,6 +103,7 @@ export function ModelVulnerabilityScanTriggerReqToJSON(value?: ModelVulnerabilit
     return {
 
         'filters': ModelScanFilterToJSON(value.filters),
+        'is_priority': value.is_priority,
         'node_ids': (value.node_ids === null ? null : (value.node_ids as Array<any>).map(ModelNodeIdentifierToJSON)),
         'scan_config': (value.scan_config === null ? null : (value.scan_config as Array<any>).map(ModelVulnerabilityScanConfigLanguageToJSON)),
     };