diff --git a/pkg/network/product.ts b/pkg/network/product.ts
index 6f6fedd..ff48884 100644
--- a/pkg/network/product.ts
+++ b/pkg/network/product.ts
@@ -10,26 +10,26 @@ export function init($plugin: IPlugin, store: any) {
} = $plugin.DSL(store, productName);
// registering a top-level product
- product({
- icon: 'pod_security',
- inStore: 'cluster',
- });
+ // product({
+ // icon: 'pod_security',
+ // inStore: 'cluster',
+ // });
- // => => => creating a custom page
- virtualType({
- label: 'Overview',
- name: 'overview',
- namespaced: false,
- route: {
- name: `c-cluster-${productName}-overview`,
- params: {
- product: productName
- },
- meta: { pkg: "network", product: productName }
- }
- });
+ // // => => => creating a custom page
+ // virtualType({
+ // label: 'Overview',
+ // name: 'overview',
+ // namespaced: false,
+ // route: {
+ // name: `c-cluster-${productName}-overview`,
+ // params: {
+ // product: productName
+ // },
+ // meta: { pkg: "network", product: productName }
+ // }
+ // });
- basicType([
- "overview"
- ]);
+ // basicType([
+ // "overview"
+ // ]);
}
\ No newline at end of file
diff --git a/pkg/runtime-process-profile/product.ts b/pkg/runtime-process-profile/product.ts
index 666c3a0..e370a40 100644
--- a/pkg/runtime-process-profile/product.ts
+++ b/pkg/runtime-process-profile/product.ts
@@ -9,27 +9,27 @@ export function init($plugin: IPlugin, store: any) {
basicType
} = $plugin.DSL(store, productName);
- // registering a top-level product
- product({
- icon: 'pod_security',
- inStore: 'cluster',
- });
+ // // registering a top-level product
+ // product({
+ // icon: 'pod_security',
+ // inStore: 'cluster',
+ // });
- // => => => creating a custom page
- virtualType({
- label: 'Overview',
- name: 'overview',
- namespaced: false,
- route: {
- name: `c-cluster-${productName}-overview`,
- params: {
- product: productName
- },
- meta: { pkg: "runtime-process-profile", product: productName }
- }
- });
+ // // => => => creating a custom page
+ // virtualType({
+ // label: 'Overview',
+ // name: 'overview',
+ // namespaced: false,
+ // route: {
+ // name: `c-cluster-${productName}-overview`,
+ // params: {
+ // product: productName
+ // },
+ // meta: { pkg: "runtime-process-profile", product: productName }
+ // }
+ // });
- basicType([
- "overview"
- ]);
+ // basicType([
+ // "overview"
+ // ]);
}
\ No newline at end of file
diff --git a/pkg/sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image.js b/pkg/sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image.js
index 8f899be..ebd9380 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image.js
+++ b/pkg/sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image.js
@@ -1,5 +1,6 @@
export const images = [
{
+ id: "struts-attacher:1.0",
metadata: {
name: "struts-attacher:1.0",
},
@@ -16,6 +17,7 @@ export const images = [
},
},
{
+ id: "imagemagick4.8.5613",
metadata: {
name: "imagemagick4.8.5613",
},
@@ -32,6 +34,7 @@ export const images = [
},
},
{
+ id: "centos7.7.1908",
metadata: {
name: "centos7.7.1908",
},
@@ -48,6 +51,7 @@ export const images = [
},
},
{
+ id: "nginx1.19.10",
metadata: {
name: "nginx1.19.10",
},
@@ -64,6 +68,7 @@ export const images = [
},
},
{
+ id: "docker-compose:1.29.2",
metadata: {
name: "docker-compose:1.29.2",
},
@@ -80,6 +85,7 @@ export const images = [
},
},
{
+ id: "python3.9.7",
metadata: {
name: "python3.9.7",
},
@@ -96,6 +102,7 @@ export const images = [
},
},
{
+ id: "nodejs14.17.3",
metadata: {
name: "nodejs14.17.3",
},
@@ -112,6 +119,7 @@ export const images = [
},
},
{
+ id: "redis5.0.7",
metadata: {
name: "redis5.0.7",
},
@@ -128,6 +136,7 @@ export const images = [
},
},
{
+ id: "mongodb4.4.1",
metadata: {
name: "mongodb4.4.1",
},
@@ -144,6 +153,7 @@ export const images = [
},
},
{
+ id: "golang1.16.5",
metadata: {
name: "golang1.16.5",
},
@@ -160,6 +170,7 @@ export const images = [
},
},
{
+ id: "ruby2.7.3",
metadata: {
name: "ruby2.7.3",
},
@@ -176,6 +187,7 @@ export const images = [
},
},
{
+ id: "elasticsearch7.10.0",
metadata: {
name: "elasticsearch7.10.0",
},
@@ -192,6 +204,7 @@ export const images = [
},
},
{
+ id: "mysql8.0.25",
metadata: {
name: "mysql8.0.25",
},
@@ -208,6 +221,7 @@ export const images = [
},
},
{
+ id: "php8.0.9",
metadata: {
name: "php8.0.9",
},
@@ -224,6 +238,7 @@ export const images = [
},
},
{
+ id: "postgresql13.3",
metadata: {
name: "postgresql13.3",
},
@@ -240,6 +255,7 @@ export const images = [
},
},
{
+ id: "terraform1.0.0",
metadata: {
name: "terraform1.0.0",
},
@@ -256,6 +272,7 @@ export const images = [
},
},
{
+ id: "ansible2.10.5",
metadata: {
name: "ansible2.10.5",
},
@@ -272,6 +289,7 @@ export const images = [
},
},
{
+ id: "kafka2.8.0",
metadata: {
name: "kafka2.8.0",
},
diff --git a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
index 778acec..22ca1ce 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
+++ b/pkg/sbombastic-image-vulnerability-scanner/l10n/en-us.yaml
@@ -149,7 +149,7 @@ imageScanner:
pending: Pending
scheduled: Scheduled
inprogress: In progress
- complete: Complete
+ complete: Finished
failed: Failed
none: n/a
enabled: Enabled
diff --git a/pkg/sbombastic-image-vulnerability-scanner/models/sbombastic.rancher.io.registry.js b/pkg/sbombastic-image-vulnerability-scanner/models/sbombastic.rancher.io.registry.js
index e8073a6..1395aa5 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/models/sbombastic.rancher.io.registry.js
+++ b/pkg/sbombastic-image-vulnerability-scanner/models/sbombastic.rancher.io.registry.js
@@ -4,7 +4,6 @@ import { RESOURCE } from '@sbombastic-image-vulnerability-scanner/types';
import { _CREATE } from '@shell/config/query-params';
export default class Registry extends SteveModel {
get _availableActions() {
- console.log("Registry _availableActions");
const out = super._availableActions.filter(action => !['showConfiguration','download','downloadYaml'].includes(action.action));
// In details page, we don't want to show the scan action
@@ -17,11 +16,10 @@ export default class Registry extends SteveModel {
label: this.t('imageScanner.registries.button.startScan'),
icon: 'icon-play',
enabled: true,
- bulkable: false,
+ bulkable: true,
invoke: async ({}, res = []) => {
const target = (res && res.length ? res[0] : r);
const model = target._model || target;
- console.log("scanRegistry model", model);
const scanjobObj = await this.$dispatch('create', {
type: RESOURCE.SCAN_JOB,
metadata: {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
index 567f6a1..5e9144f 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/ImageOverview.vue
@@ -28,18 +28,20 @@
type="button"
:disabled="disabled"
@click="openAddEditRuleModal()">
+
{{ t('imageScanner.images.downloadReport') }}
-
-
+
+
@@ -80,7 +83,6 @@
:search="false"
:row-actions="false"
:table-actions="false"
- key-field="id"
/>
@@ -100,6 +102,7 @@
import { images } from "@sbombastic-image-vulnerability-scanner/data/sbombastic.rancher.io.image";
import { IMAGE_LIST_TABLE, REPO_BASED_TABLE, REPO_BASED_IMAGE_LIST_TABLE } from "@sbombastic-image-vulnerability-scanner/config/table-headers";
import { Checkbox } from '@components/Form/Checkbox';
+ import { RESOURCE } from '@sbombastic-image-vulnerability-scanner/types/sbombastic-image-vulnerability-scanner';
export default {
name: 'imageOverview',
components: {
diff --git a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
index 3048b53..cf66895 100644
--- a/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
+++ b/pkg/sbombastic-image-vulnerability-scanner/pages/c/_cluster/sbombastic-image-vulnerability-scanner/RegistriesConfiguration.vue
@@ -41,6 +41,7 @@
:has-advanced-filtering="false"
:namespaced="false"
:row-actions="true"
+ :table-actions="true"
:force-update-live-and-delayed="0"
:use-query-params-for-simple-filtering="true"
:rows="rows"
@@ -80,8 +81,7 @@
import { DATE_FORMAT, TIME_FORMAT } from '@shell/store/prefs';
import { findBy } from '@shell/utils/array';
import ScanButton from "@sbombastic-image-vulnerability-scanner/components/common/ScanButton";
-import { template } from "lodash";
-
+
export default {
name: 'registries',
components: {
@@ -97,13 +97,7 @@ import { template } from "lodash";
rows: [],
registryStatusList: [],
latestUpdateTime: null,
- statusSummary: {
- scheduled: 0,
- pending: 0,
- inprogress: 0,
- complete: 0,
- failed: 0
- },
+ statusSummary: {},
headers: REGISTRY_SCAN_TABLE,
}
},
@@ -121,19 +115,17 @@ import { template } from "lodash";
this.statusSummary = {};
let registriesCRD = this.$store.getters['cluster/all'](RESOURCE.REGISTRY);
- console.group("registriesCRD", registriesCRD);
//Fetch ScanJob CRD and sort by startTime DESC
let scanJobCRD = this.$store.getters['cluster/all'](RESOURCE.SCAN_JOB).sort((a, b) => {
- if (!a.status || !a.status.startTime) {
+ if (!a.status || !a.status.conditions || !Array.isArray(a.status.conditions) || a.status.conditions.length === 0) {
return 1;
}
- if (!b.status || !b.status.startTime) {
+ if (!b.status || !b.status.conditions || !Array.isArray(b.status.conditions) || b.status.conditions.length === 0) {
return -1;
}
- return new Date(b.status.startTime) - new Date(a.status.startTime);
+ return this.getLastTransitionTime(b.status.conditions) - this.getLastTransitionTime(a.status.conditions);
});
- console.group("scanJobCRD", scanJobCRD);
const scanJobMap = this.getScanJobMap(scanJobCRD);
const registryDataset = this.getRegistryDataset(registriesCRD, scanJobMap);
@@ -169,7 +161,9 @@ import { template } from "lodash";
getScanJobMap(scanJobCRD) {
let scanJobMap = {};
scanJobCRD.forEach((rec) => {
- if (!rec.status) {
+ // Calculate statusResult
+
+ if (!rec.status) {// A extreme corner case, the scanner created a job without status object
rec.status = {
statusResult: {
type: "Pending",
@@ -208,8 +202,8 @@ import { template } from "lodash";
getRegistryDataset(registriesCRD, scanJobMap) {
let registryStatusList = [];
const statusSummary = {
- scheduled: 0,
pending: 0,
+ scheduled: 0,
inprogress: 0,
complete: 0,
failed: 0
@@ -249,8 +243,6 @@ import { template } from "lodash";
if (status && statusSummary.hasOwnProperty(status)) {
statusSummary[status]++;
}
- // rec = this.addCustomActions(rec);
- console.log("rec", rec)
return rec;
});
// Sort and limit the registryStatusList to 5 most recent updates
@@ -329,7 +321,14 @@ import { template } from "lodash";
const availableActions = [scanAction, divider, ...actions];
const _model = rec;
return { ...rec, _model, availableActions};
- }
+ },
+ getLastTransitionTime(conditions) {
+ let lastTransitionTime = 0;
+ conditions.forEach(condition => {
+ lastTransitionTime = Math.max(lastTransitionTime, new Date(condition.lastTransitionTime).getTime())
+ })
+ return lastTransitionTime;
+ },
},
computed: {
schema() {