Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added a new column for integration to show error #1526

Merged
merged 2 commits into from
Sep 7, 2023
Merged

added a new column for integration to show error #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3650bf
added binaries scan for vulnerabilities
milan-deepfence Sep 7, 2023
29e668d
added a new column for integration to show error
milan-deepfence Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 44 additions & 5 deletions deepfence_frontend/apps/dashboard/api-spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3274,7 +3274,14 @@
}
},
"responses": {
"200": { "description": "OK" },
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ModelMessageResponse" }
}
}
},
"400": {
"description": "Bad Request",
"content": {
Expand Down Expand Up @@ -3423,7 +3430,14 @@
}
},
"responses": {
"200": { "description": "OK" },
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ModelMessageResponse" }
}
}
},
"400": {
"description": "Bad Request",
"content": {
Expand Down Expand Up @@ -3675,7 +3689,14 @@
}
},
"responses": {
"200": { "description": "OK" },
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": { "$ref": "#/components/schemas/ModelMessageResponse" }
}
}
},
"400": {
"description": "Bad Request",
"content": {
Expand Down Expand Up @@ -10819,7 +10840,10 @@
"required": ["cloud_provider", "compliance_type"],
"type": "object",
"properties": {
"cloud_provider": { "enum": ["aws", "gcp", "azure"], "type": "string" },
"cloud_provider": {
"enum": ["aws", "gcp", "azure", "linux", "kubernetes"],
"type": "string"
},
"compliance_type": { "type": "string" },
"node_id": { "type": "string" }
}
Expand Down Expand Up @@ -11447,6 +11471,7 @@
"filters": { "$ref": "#/components/schemas/ReportersFieldsFilters" },
"id": { "type": "integer" },
"integration_type": { "type": "string" },
"last_error_msg": { "type": "string" },
"notification_type": { "type": "string" }
}
},
Expand Down Expand Up @@ -11850,6 +11875,7 @@
"properties": {
"created_at": { "type": "integer" },
"id": { "type": "integer" },
"is_syncing": { "type": "boolean" },
"name": { "type": "string" },
"node_id": { "type": "string" },
"non_secret": {},
Expand Down Expand Up @@ -12438,15 +12464,16 @@
"properties": {
"language": {
"enum": [
"all",
"base",
"ruby",
"python",
"javascript",
"php",
"golang",
"golang-binary",
"java",
"rust",
"rust-binary",
"dotnet"
],
"type": "string"
Expand Down Expand Up @@ -12696,6 +12723,15 @@
"size": { "type": "integer" }
}
},
"SearchChainedSearchFilter": {
"required": ["node_filter", "relation_ship"],
"type": "object",
"properties": {
"next_filter": { "nullable": true },
"node_filter": { "$ref": "#/components/schemas/SearchSearchFilter" },
"relation_ship": { "type": "string" }
}
},
"SearchNodeCountResp": {
"required": [
"cloud_provider",
Expand Down Expand Up @@ -12766,6 +12802,9 @@
"properties": {
"extended_node_filter": { "$ref": "#/components/schemas/SearchSearchFilter" },
"node_filter": { "$ref": "#/components/schemas/SearchSearchFilter" },
"related_node_filter": {
"$ref": "#/components/schemas/SearchChainedSearchFilter"
},
"window": { "$ref": "#/components/schemas/ModelFetchWindow" }
}
},
Expand Down
1 change: 1 addition & 0 deletions deepfence_frontend/apps/dashboard/src/api/generated/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ models/ReportersFieldsFilters.ts
models/ReportersMatchFilter.ts
models/ReportersOrderFilter.ts
models/ReportersOrderSpec.ts
models/SearchChainedSearchFilter.ts
models/SearchNodeCountResp.ts
models/SearchResultGroup.ts
models/SearchResultGroupResp.ts
Expand Down
39 changes: 21 additions & 18 deletions deepfence_frontend/apps/dashboard/src/api/generated/apis/RegistryApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ export interface RegistryApiInterface {
* @throws {RequiredError}
* @memberof RegistryApiInterface
*/
addRegistryRaw(requestParameters: AddRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
addRegistryRaw(requestParameters: AddRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelMessageResponse>>;

/**
* Add a new supported registry
* Add Registry
*/
addRegistry(requestParameters: AddRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
addRegistry(requestParameters: AddRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelMessageResponse>;

/**
* Add a Google Container registry
Expand All @@ -135,13 +135,13 @@ export interface RegistryApiInterface {
* @throws {RequiredError}
* @memberof RegistryApiInterface
*/
addRegistryGCRRaw(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
addRegistryGCRRaw(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelMessageResponse>>;

/**
* Add a Google Container registry
* Add Google Container Registry
*/
addRegistryGCR(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
addRegistryGCR(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelMessageResponse>;

/**
* count of image tags for a given image and registry
Expand Down Expand Up @@ -310,13 +310,13 @@ export interface RegistryApiInterface {
* @throws {RequiredError}
* @memberof RegistryApiInterface
*/
updateRegistryRaw(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
updateRegistryRaw(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelMessageResponse>>;

/**
* Update registry
* Update Registry
*/
updateRegistry(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
updateRegistry(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelMessageResponse>;

}

Expand All @@ -329,7 +329,7 @@ export class RegistryApi extends runtime.BaseAPI implements RegistryApiInterface
* Add a new supported registry
* Add Registry
*/
async addRegistryRaw(requestParameters: AddRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
async addRegistryRaw(requestParameters: AddRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelMessageResponse>> {
const queryParameters: any = {};

const headerParameters: runtime.HTTPHeaders = {};
Expand All @@ -352,22 +352,23 @@ export class RegistryApi extends runtime.BaseAPI implements RegistryApiInterface
body: ModelRegistryAddReqToJSON(requestParameters.modelRegistryAddReq),
}, initOverrides);

return new runtime.VoidApiResponse(response);
return new runtime.JSONApiResponse(response, (jsonValue) => ModelMessageResponseFromJSON(jsonValue));
}

/**
* Add a new supported registry
* Add Registry
*/
async addRegistry(requestParameters: AddRegistryRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
await this.addRegistryRaw(requestParameters, initOverrides);
async addRegistry(requestParameters: AddRegistryRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelMessageResponse> {
const response = await this.addRegistryRaw(requestParameters, initOverrides);
return await response.value();
}

/**
* Add a Google Container registry
* Add Google Container Registry
*/
async addRegistryGCRRaw(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
async addRegistryGCRRaw(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelMessageResponse>> {
if (requestParameters.name === null || requestParameters.name === undefined) {
throw new runtime.RequiredError('name','Required parameter requestParameters.name was null or undefined when calling addRegistryGCR.');
}
Expand Down Expand Up @@ -428,15 +429,16 @@ export class RegistryApi extends runtime.BaseAPI implements RegistryApiInterface
body: formParams,
}, initOverrides);

return new runtime.VoidApiResponse(response);
return new runtime.JSONApiResponse(response, (jsonValue) => ModelMessageResponseFromJSON(jsonValue));
}

/**
* Add a Google Container registry
* Add Google Container Registry
*/
async addRegistryGCR(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
await this.addRegistryGCRRaw(requestParameters, initOverrides);
async addRegistryGCR(requestParameters: AddRegistryGCRRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelMessageResponse> {
const response = await this.addRegistryGCRRaw(requestParameters, initOverrides);
return await response.value();
}

/**
Expand Down Expand Up @@ -830,7 +832,7 @@ export class RegistryApi extends runtime.BaseAPI implements RegistryApiInterface
* Update registry
* Update Registry
*/
async updateRegistryRaw(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
async updateRegistryRaw(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelMessageResponse>> {
if (requestParameters.registryId === null || requestParameters.registryId === undefined) {
throw new runtime.RequiredError('registryId','Required parameter requestParameters.registryId was null or undefined when calling updateRegistry.');
}
Expand All @@ -857,15 +859,16 @@ export class RegistryApi extends runtime.BaseAPI implements RegistryApiInterface
body: ModelRegistryUpdateReqToJSON(requestParameters.modelRegistryUpdateReq),
}, initOverrides);

return new runtime.VoidApiResponse(response);
return new runtime.JSONApiResponse(response, (jsonValue) => ModelMessageResponseFromJSON(jsonValue));
}

/**
* Update registry
* Update Registry
*/
async updateRegistry(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
await this.updateRegistryRaw(requestParameters, initOverrides);
async updateRegistry(requestParameters: UpdateRegistryRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelMessageResponse> {
const response = await this.updateRegistryRaw(requestParameters, initOverrides);
return await response.value();
}

}
4 changes: 3 additions & 1 deletion deepfence_frontend/apps/dashboard/src/api/generated/models/ModelCloudNodeControlReq.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ export interface ModelCloudNodeControlReq {
export const ModelCloudNodeControlReqCloudProviderEnum = {
Aws: 'aws',
Gcp: 'gcp',
Azure: 'azure'
Azure: 'azure',
Linux: 'linux',
Kubernetes: 'kubernetes'
} as const;
export type ModelCloudNodeControlReqCloudProviderEnum = typeof ModelCloudNodeControlReqCloudProviderEnum[keyof typeof ModelCloudNodeControlReqCloudProviderEnum];

Expand Down
8 changes: 8 additions & 0 deletions deepfence_frontend/apps/dashboard/src/api/generated/models/ModelIntegrationListResp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ export interface ModelIntegrationListResp {
* @memberof ModelIntegrationListResp
*/
integration_type?: string;
/**
*
* @type {string}
* @memberof ModelIntegrationListResp
*/
last_error_msg?: string;
/**
*
* @type {string}
Expand Down Expand Up @@ -81,6 +87,7 @@ export function ModelIntegrationListRespFromJSONTyped(json: any, ignoreDiscrimin
'filters': !exists(json, 'filters') ? undefined : ReportersFieldsFiltersFromJSON(json['filters']),
'id': !exists(json, 'id') ? undefined : json['id'],
'integration_type': !exists(json, 'integration_type') ? undefined : json['integration_type'],
'last_error_msg': !exists(json, 'last_error_msg') ? undefined : json['last_error_msg'],
'notification_type': !exists(json, 'notification_type') ? undefined : json['notification_type'],
};
}
Expand All @@ -98,6 +105,7 @@ export function ModelIntegrationListRespToJSON(value?: ModelIntegrationListResp
'filters': ReportersFieldsFiltersToJSON(value.filters),
'id': value.id,
'integration_type': value.integration_type,
'last_error_msg': value.last_error_msg,
'notification_type': value.notification_type,
};
}
Expand Down
8 changes: 8 additions & 0 deletions deepfence_frontend/apps/dashboard/src/api/generated/models/ModelRegistryListResp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ export interface ModelRegistryListResp {
* @memberof ModelRegistryListResp
*/
id?: number;
/**
*
* @type {boolean}
* @memberof ModelRegistryListResp
*/
is_syncing?: boolean;
/**
*
* @type {string}
Expand Down Expand Up @@ -84,6 +90,7 @@ export function ModelRegistryListRespFromJSONTyped(json: any, ignoreDiscriminato

'created_at': !exists(json, 'created_at') ? undefined : json['created_at'],
'id': !exists(json, 'id') ? undefined : json['id'],
'is_syncing': !exists(json, 'is_syncing') ? undefined : json['is_syncing'],
'name': !exists(json, 'name') ? undefined : json['name'],
'node_id': !exists(json, 'node_id') ? undefined : json['node_id'],
'non_secret': !exists(json, 'non_secret') ? undefined : json['non_secret'],
Expand All @@ -103,6 +110,7 @@ export function ModelRegistryListRespToJSON(value?: ModelRegistryListResp | null

'created_at': value.created_at,
'id': value.id,
'is_syncing': value.is_syncing,
'name': value.name,
'node_id': value.node_id,
'non_secret': value.non_secret,
Expand Down
3 changes: 2 additions & 1 deletion ..._frontend/apps/dashboard/src/api/generated/models/ModelVulnerabilityScanConfigLanguage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,16 @@ export interface ModelVulnerabilityScanConfigLanguage {
* @export
*/
export const ModelVulnerabilityScanConfigLanguageLanguageEnum = {
All: 'all',
Base: 'base',
Ruby: 'ruby',
Python: 'python',
Javascript: 'javascript',
Php: 'php',
Golang: 'golang',
GolangBinary: 'golang-binary',
Java: 'java',
Rust: 'rust',
RustBinary: 'rust-binary',
Dotnet: 'dotnet'
} as const;
export type ModelVulnerabilityScanConfigLanguageLanguageEnum = typeof ModelVulnerabilityScanConfigLanguageLanguageEnum[keyof typeof ModelVulnerabilityScanConfigLanguageLanguageEnum];
Expand Down
Loading