Merge pull request #871 from deepfence/ui-v2-connectors-list-cleanup-1

[v2][UI]Add k8s listing in my connectors

deepfence_frontend/apps/dashboard/api-spec.json

@@ -283,6 +283,53 @@
         "security": [{ "bearer_token": [] }]
       }
     },
+    "/deepfence/cloud-node/providers/list": {
+      "post": {
+        "tags": ["Cloud Nodes"],
+        "summary": "List Cloud Node Providers",
+        "description": "List Cloud Node Providers registered with the console",
+        "operationId": "listCloudProviders",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModelCloudNodeProvidersListResp"
+                }
+              }
+            }
+          },
+          "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/controls/agent": {
       "post": {
         "tags": ["Controls"],
@@ -4185,6 +4232,17 @@
           "trail_name": { "type": "string" }
         }
       },
+      "ModelCloudNodeProvidersListResp": {
+        "required": ["providers"],
+        "type": "object",
+        "properties": {
+          "providers": {
+            "type": "array",
+            "items": { "type": "string" },
+            "nullable": true
+          }
+        }
+      },
       "ModelCompliance": {
         "required": [
           "test_category",
@@ -4451,7 +4509,8 @@
           "node_name",
           "node_type",
           "scan_id",
-          "malwares"
+          "malwares",
+          "severity_counts"
         ],
         "type": "object",
         "properties": {
@@ -4467,7 +4526,12 @@
           "node_id": { "type": "string" },
           "node_name": { "type": "string" },
           "node_type": { "type": "string" },
-          "scan_id": { "type": "string" }
+          "scan_id": { "type": "string" },
+          "severity_counts": {
+            "type": "object",
+            "additionalProperties": { "type": "integer" },
+            "nullable": true
+          }
         }
       },
       "ModelMalwareScanTriggerReq": {
@@ -4616,9 +4680,11 @@
         }
       },
       "ModelScanInfo": {
-        "required": ["scan_id", "status", "updated_at"],
+        "required": ["scan_id", "status", "updated_at", "node_id", "node_type"],
         "type": "object",
         "properties": {
+          "node_id": { "type": "string" },
+          "node_type": { "type": "string" },
           "scan_id": { "type": "string" },
           "status": { "type": "string" },
           "updated_at": { "type": "integer", "format": "int64" }
@@ -4652,14 +4718,13 @@
           "window": { "$ref": "#/components/schemas/ModelFetchWindow" }
         }
       },
-      "ModelScanStatus": { "type": "string" },
       "ModelScanStatusResp": {
         "required": ["statuses"],
         "type": "object",
         "properties": {
           "statuses": {
             "type": "object",
-            "additionalProperties": { "$ref": "#/components/schemas/ModelScanStatus" },
+            "additionalProperties": { "$ref": "#/components/schemas/ModelScanInfo" },
             "nullable": true
           }
         }

deepfence_frontend/apps/dashboard/openapitools.json

@@ -2,7 +2,7 @@
   "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "6.2.1",
+    "version": "6.3.0",
     "generators": {
       "deepfence-server": {
         "generatorName": "typescript-fetch",

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

@@ -40,23 +40,18 @@ export function getTopologyApiClient() {
   const topologyApi = new TopologyApi(configuration);
   return {
     getHostsTopologyGraph: topologyApi.getHostsTopologyGraph.bind(topologyApi),
+    getKubernetesTopologyGraph: topologyApi.getKubernetesTopologyGraph.bind(topologyApi),
   };
 }
 
-export function getCloudNodesApi() {
+export function getCloudNodesApiClient() {
   const cloudNodesApi = new CloudNodesApi(configuration);
   return {
     listCloudNodeAccount: cloudNodesApi.listCloudNodeAccount.bind(cloudNodesApi),
   };
 }
-export function getRegistriesApi() {
-  const registriesApi = new RegistryApi(configuration);
-  return {
-    addRegistry: registriesApi.addRegistry.bind(registriesApi),
-  };
-}
 
-export function vulnerabilityScanApiClient() {
+export function getVulnerabilityApiClient() {
   const vulnerabilityApi = new VulnerabilityApi(configuration);
   return {
     startVulnerabilityScan:
@@ -68,7 +63,7 @@ export function vulnerabilityScanApiClient() {
   };
 }
 
-export function secretScanApiClient() {
+export function getSecretApiClient() {
   const secretApi = new SecretScanApi(configuration);
   return {
     startSecretScan: secretApi.startSecretScan.bind(secretApi),
@@ -77,11 +72,19 @@ export function secretScanApiClient() {
   };
 }
 
-export function complianceScanApiClient() {
+export function getComplianceApiClient() {
   const complianceApi = new ComplianceApi(configuration);
   return {
     startComplianceScan: complianceApi.startComplianceScan.bind(complianceApi),
     statusComplianceScan: complianceApi.statusComplianceScan.bind(complianceApi),
     resultComplianceScan: complianceApi.resultsComplianceScan.bind(complianceApi),
   };
 }
+
+export function getRegistriesApiClient() {
+  const registriesApi = new RegistryApi(configuration);
+  return {
+    listRegistries: registriesApi.listRegistry.bind(registriesApi),
+    addRegistry: registriesApi.addRegistry.bind(registriesApi),
+  };
+}

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

@@ -52,6 +52,7 @@ models/ModelCloudNodeAccountRegisterRespData.ts
 models/ModelCloudNodeAccountsListReq.ts
 models/ModelCloudNodeAccountsListResp.ts
 models/ModelCloudNodeCloudtrailTrail.ts
+models/ModelCloudNodeProvidersListResp.ts
 models/ModelCompliance.ts
 models/ModelComplianceScanResult.ts
 models/ModelComplianceScanTriggerReq.ts

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

@@ -1 +1 @@
-6.2.1
+6.3.0

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

@@ -21,6 +21,7 @@ import type {
   ModelCloudNodeAccountRegisterResp,
   ModelCloudNodeAccountsListReq,
   ModelCloudNodeAccountsListResp,
+  ModelCloudNodeProvidersListResp,
 } from '../models';
 import {
     ApiDocsBadRequestResponseFromJSON,
@@ -35,6 +36,8 @@ import {
     ModelCloudNodeAccountsListReqToJSON,
     ModelCloudNodeAccountsListRespFromJSON,
     ModelCloudNodeAccountsListRespToJSON,
+    ModelCloudNodeProvidersListRespFromJSON,
+    ModelCloudNodeProvidersListRespToJSON,
 } from '../models';
 
 export interface ListCloudNodeAccountRequest {
@@ -68,6 +71,21 @@ export interface CloudNodesApiInterface {
      */
     listCloudNodeAccount(requestParameters: ListCloudNodeAccountRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelCloudNodeAccountsListResp>;
 
+    /**
+     * List Cloud Node Providers registered with the console
+     * @summary List Cloud Node Providers
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof CloudNodesApiInterface
+     */
+    listCloudProvidersRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelCloudNodeProvidersListResp>>;
+
+    /**
+     * List Cloud Node Providers registered with the console
+     * List Cloud Node Providers
+     */
+    listCloudProviders(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelCloudNodeProvidersListResp>;
+
     /**
      * Register Cloud Node Account and return any pending compliance scans from console
      * @summary Register Cloud Node Account
@@ -130,6 +148,42 @@ export class CloudNodesApi extends runtime.BaseAPI implements CloudNodesApiInter
         return await response.value();
     }
 
+    /**
+     * List Cloud Node Providers registered with the console
+     * List Cloud Node Providers
+     */
+    async listCloudProvidersRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<ModelCloudNodeProvidersListResp>> {
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        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/cloud-node/providers/list`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ModelCloudNodeProvidersListRespFromJSON(jsonValue));
+    }
+
+    /**
+     * List Cloud Node Providers registered with the console
+     * List Cloud Node Providers
+     */
+    async listCloudProviders(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<ModelCloudNodeProvidersListResp> {
+        const response = await this.listCloudProvidersRaw(initOverrides);
+        return await response.value();
+    }
+
     /**
      * Register Cloud Node Account and return any pending compliance scans from console
      * Register Cloud Node Account

deepfence_frontend/apps/dashboard/src/api/generated/models/ModelCloudNodeProvidersListResp.ts

@@ -0,0 +1,66 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Deepfence ThreatMapper
+ * Deepfence Runtime API provides programmatic control over Deepfence microservice securing your container, kubernetes and cloud deployments. The API abstracts away underlying infrastructure details like cloud provider,  container distros, container orchestrator and type of deployment. This is one uniform API to manage and control security alerts, policies and response to alerts for microservices running anywhere i.e. managed pure greenfield container deployments or a mix of containers, VMs and serverless paradigms like AWS Fargate.
+ *
+ * The version of the OpenAPI document: 2.0.0
+ * Contact: community@deepfence.io
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface ModelCloudNodeProvidersListResp
+ */
+export interface ModelCloudNodeProvidersListResp {
+    /**
+     * 
+     * @type {Array<string>}
+     * @memberof ModelCloudNodeProvidersListResp
+     */
+    providers: Array<string> | null;
+}
+
+/**
+ * Check if a given object implements the ModelCloudNodeProvidersListResp interface.
+ */
+export function instanceOfModelCloudNodeProvidersListResp(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "providers" in value;
+
+    return isInstance;
+}
+
+export function ModelCloudNodeProvidersListRespFromJSON(json: any): ModelCloudNodeProvidersListResp {
+    return ModelCloudNodeProvidersListRespFromJSONTyped(json, false);
+}
+
+export function ModelCloudNodeProvidersListRespFromJSONTyped(json: any, ignoreDiscriminator: boolean): ModelCloudNodeProvidersListResp {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+
+        'providers': json['providers'],
+    };
+}
+
+export function ModelCloudNodeProvidersListRespToJSON(value?: ModelCloudNodeProvidersListResp | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+
+        'providers': value.providers,
+    };
+}
+

deepfence_frontend/apps/dashboard/src/api/generated/models/ModelMalwareScanResult.ts

@@ -80,6 +80,12 @@ export interface ModelMalwareScanResult {
      * @memberof ModelMalwareScanResult
      */
     scan_id: string;
+    /**
+     * 
+     * @type {{ [key: string]: number; }}
+     * @memberof ModelMalwareScanResult
+     */
+    severity_counts: { [key: string]: number; } | null;
 }
 
 /**
@@ -96,6 +102,7 @@ export function instanceOfModelMalwareScanResult(value: object): boolean {
     isInstance = isInstance && "node_name" in value;
     isInstance = isInstance && "node_type" in value;
     isInstance = isInstance && "scan_id" in value;
+    isInstance = isInstance && "severity_counts" in value;
 
     return isInstance;
 }
@@ -119,6 +126,7 @@ export function ModelMalwareScanResultFromJSONTyped(json: any, ignoreDiscriminat
         'node_name': json['node_name'],
         'node_type': json['node_type'],
         'scan_id': json['scan_id'],
+        'severity_counts': json['severity_counts'],
     };
 }
 
@@ -140,6 +148,7 @@ export function ModelMalwareScanResultToJSON(value?: ModelMalwareScanResult | nu
         'node_name': value.node_name,
         'node_type': value.node_type,
         'scan_id': value.scan_id,
+        'severity_counts': value.severity_counts,
     };
 }