chore: Modify get_image_distribution job parameters (#579)

Signed-off-by: yingxuan <zhanglujia.zlj@digital-engine.com>
Co-authored-by: yingxuan <zhanglujia.zlj@digital-engine.com>

.github/workflows/check-size.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check large files
         uses: actionsDesk/lfs-warning@v3.3

.github/workflows/ci.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup node
         uses: actions/setup-node@v4

.github/workflows/codeql-analysis.yaml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

.github/workflows/e2e.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup node
         uses: actions/setup-node@v4

.github/workflows/lint.yaml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup node
         uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set node version
         uses: actions/setup-node@v4

cypress/fixtures/resource/persistent-cache-task/persistent-cache-task.json

@@ -70,13 +70,13 @@
           "used_percent": 1
         },
         "network": {
-          "download_rate": 1000,
+          "rx_bandwidth": 1000,
-          "download_rate_limit": 4000,
+          "max_rx_bandwidth": 4000,
           "idc": "HangZhou",
           "location": "HangZhou",
           "tcp_connection_count": 2,
-          "upload_rate": 1000,
+          "tx_bandwidth": 1000,
-          "upload_rate_limit": 20000,
+          "max_tx_bandwidth": 20000,
           "upload_tcp_connection_count": 4
         },
         "os": "ios",
@@ -152,13 +152,13 @@
           "used_percent": 1
         },
         "network": {
-          "download_rate": 1000,
+          "rx_bandwidth": 1000,
-          "download_rate_limit": 4000,
+          "max_rx_bandwidth": 4000,
           "idc": "HangZhou",
           "location": "HangZhou",
           "tcp_connection_count": 2,
-          "upload_rate": 1000,
+          "tx_bandwidth": 1000,
-          "upload_rate_limit": 20000,
+          "max_tx_bandwidth": 20000,
           "upload_tcp_connection_count": 4
         },
         "os": "ios",
@@ -234,13 +234,13 @@
           "used_percent": 1
         },
         "network": {
-          "download_rate": 1000,
+          "rx_bandwidth": 1000,
-          "download_rate_limit": 4000,
+          "max_rx_bandwidth": 4000,
           "idc": "HangZhou",
           "location": "HangZhou",
           "tcp_connection_count": 2,
-          "upload_rate": 1000,
+          "tx_bandwidth": 1000,
-          "upload_rate_limit": 20000,
+          "max_tx_bandwidth": 20000,
           "upload_tcp_connection_count": 4
         },
         "os": "Linux",
@@ -316,13 +316,13 @@
           "used_percent": 1
         },
         "network": {
-          "download_rate": 1000,
+          "rx_bandwidth": 1000,
-          "download_rate_limit": 4000,
+          "max_rx_bandwidth": 4000,
           "idc": "HangZhou",
           "location": "HangZhou",
           "tcp_connection_count": 2,
-          "upload_rate": 1000,
+          "tx_bandwidth": 1000,
-          "upload_rate_limit": 20000,
+          "max_tx_bandwidth": 20000,
           "upload_tcp_connection_count": 4
         },
         "os": "ios",
@@ -398,13 +398,13 @@
           "used_percent": 1
         },
         "network": {
-          "download_rate": 1000,
+          "rx_bandwidth": 1000,
-          "download_rate_limit": 4000,
+          "max_rx_bandwidth": 4000,
           "idc": "HangZhou",
           "location": "HangZhou",
           "tcp_connection_count": 2,
-          "upload_rate": 1000,
+          "tx_bandwidth": 1000,
-          "upload_rate_limit": 20000,
+          "max_tx_bandwidth": 20000,
           "upload_tcp_connection_count": 4
         },
         "os": "ios",
@@ -480,13 +480,13 @@
           "used_percent": 1
         },
         "network": {
-          "download_rate": 1000,
+          "rx_bandwidth": 1000,
-          "download_rate_limit": 4000,
+          "max_rx_bandwidth": 4000,
           "idc": "HangZhou",
           "location": "HangZhou",
           "tcp_connection_count": 2,
-          "upload_rate": 1000,
+          "tx_bandwidth": 1000,
-          "upload_rate_limit": 20000,
+          "max_tx_bandwidth": 20000,
           "upload_tcp_connection_count": 4
         },
         "os": "ios",

cypress/fixtures/resource/task/image-manifest-url-task.json

@@ -22,7 +22,7 @@
     {
       "ip": "172.18.0.4",
       "hostname": "kind-worker1",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6?format=json"
         },
@@ -38,7 +38,7 @@
     {
       "ip": "172.18.0.4",
       "hostname": "kind-worker2",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944"
         },
@@ -51,7 +51,7 @@
     {
       "ip": "172.18.0.4",
       "hostname": "kind-worker3",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6"
         },
@@ -64,7 +64,7 @@
     {
       "ip": "172.18.0.4",
       "hostname": "kind-worker4",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944"
         },
@@ -77,7 +77,7 @@
     {
       "ip": "172.18.0.4",
       "hostname": "kind-worker5",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1ffc4b5459e82dc8e7ddd1d1a2ec469e85a1f076090c22851a1f2ce6f71e1a6"
         },
@@ -90,7 +90,7 @@
     {
       "ip": "172.18.0.4",
       "hostname": "kind-worker6",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944"
         },
@@ -103,7 +103,7 @@
     {
       "ip": "172.18.0.3",
       "hostname": "kind-worker7",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944"
         },
@@ -116,7 +116,7 @@
     {
       "ip": "172.18.0.3",
       "hostname": "kind-worker8",
-      "layers": [
+      "cached_layers": [
         {
           "url": "https://ghcr.io/v2/dragonflyoss/scheduler/blobs/sha256:f1f1039835051ecc04909f939530e86a20f02d2ce5ad7a81c0fa3616f7303944"
         },

src/components/audit/index.tsx

@@ -16,7 +16,7 @@ import {
   TextField,
 } from '@mui/material';
 import SearchIcon from '@mui/icons-material/Search';
-import { SetStateAction, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { SetStateAction, useCallback, useEffect, useMemo, useState } from 'react';
 import styles from './index.module.css';
 import { DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE } from '../../lib/constants';
 import { auditLogsResponse, getAuditLogs, getUsers, getUsersResponse } from '../../lib/api';
@@ -256,7 +256,7 @@ export default function AuditLogs() {
                     value={item.name}
                     id={item.name}
                   >
-                    <Typography variant="body2">{item.lable}</Typography>
+                    {item.lable}
                   </MenuItem>
                 ))}
               </Select>
@@ -286,7 +286,7 @@ export default function AuditLogs() {
                     value={item.name}
                     id={item.name}
                   >
-                    <Typography variant="body2">{item.lable}</Typography>
+                    {item.lable}
                   </MenuItem>
                 ))}
               </Select>
@@ -316,7 +316,7 @@ export default function AuditLogs() {
                     value={item.name}
                     id={item.name}
                   >
-                    <Typography variant="body2">{item.lable}</Typography>
+                    {item.lable}
                   </MenuItem>
                 ))}
               </Select>

src/components/resource/task/clear/index.tsx

@@ -90,7 +90,7 @@ type Image = {
 type OriginalPeer = {
   ip: string;
   hostname: string;
-  layers: Layers[];
+  cached_layers: Layers[];
   scheduler_cluster_id?: number;
 };
 
@@ -117,7 +117,7 @@ const transformImages = (images: createGetImageDistributionJobResponse): Transfo
     const cleanedPeer = {
       ip: peer.ip,
       hostname: peer.hostname,
-      layers: peer.layers,
+      cached_layers: peer.cached_layers,
     };
 
     clusters.get(clusterId)!.push(cleanedPeer);
@@ -1478,7 +1478,7 @@ export default function Clear() {
                                     fontFamily="mabry-bold"
                                     className={styles.bolbProportionText}
                                   >
-                                    {`${((items?.layers?.length / layer) * 100).toFixed(2) || 0}%`}
+                                    {`${((items?.cached_layers?.length / layer) * 100).toFixed(2) || 0}%`}
                                   </Typography>
                                 </Box>
                               </Box>
@@ -1500,7 +1500,7 @@ export default function Clear() {
                                   </Typography>
                                 </Box>
                                 <Box className={styles.cardCantainer}>
-                                  {items?.layers.map((item: any, bolbIndex: any) => (
+                                  {items?.cached_layers.map((item: any, bolbIndex: any) => (
                                     <Box key={bolbIndex} className={styles.urlsWrapper}>
                                       <Tooltip title={extractSHA256Regex(item?.url || '-') || '-'} placement="top">
                                         <Typography

src/lib/api.ts

@@ -994,7 +994,7 @@ interface layers {
 interface ImageDistributionpeers {
   ip: string;
   hostname: string;
-  layers: layers[];
+  cached_layers: layers[];
   scheduler_cluster_id: number;
 }
 
@@ -1186,13 +1186,13 @@ export interface persistentCacheTasksPeersResponse {
       used_percent: number;
     };
     network: {
-      download_rate: number;
+      rx_bandwidth: number;
-      download_rate_limit: number;
+      max_rx_bandwidth: number;
       idc: string;
       location: string;
       tcp_connection_count: number;
-      upload_rate: number;
+      tx_bandwidth: number;
-      upload_rate_limit: number;
+      max_tx_bandwidth: number;
       upload_tcp_connection_count: number;
     };
     os: string;