Replace uuid runtime dependency with crypto API

https://developer.mozilla.org/en-US/docs/Web/API/Crypto/randomUUID produces UUID v4, exactly what we need.
cockpit-project · Jan 16, 2025 · 42f9e69 · 42f9e69
1 parent b6c323c
commit 42f9e69
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/node_modules b/node_modules
diff --git a/package.json b/package.json
@@ -17,7 +17,6 @@
     "react-dom": "18.3.1",
     "remarkable": "2.0.1",
     "throttle-debounce": "5.0.2",
-    "uuid": "11.0.5",
     "@xterm/xterm": "5.5.0",
     "@xterm/addon-canvas": "0.7.0"
   },

diff --git a/pkg/networkmanager/bond.jsx b/pkg/networkmanager/bond.jsx
@@ -30,7 +30,6 @@ import { MacMenu, MemberInterfaceChoices, NetworkModal, Name, dialogSave } from
 import { ModelContext } from './model-context.jsx';
 import { useDialogs } from "dialogs.jsx";
 
-import { v4 as uuidv4 } from 'uuid';
 import {
     member_connection_for_interface,
     member_interface_choices,
@@ -217,7 +216,7 @@ export const getGhostSettings = ({ newIfaceName }) => {
                 id: newIfaceName,
                 autoconnect: true,
                 type: "bond",
-                uuid: uuidv4(),
+                uuid: window.crypto.randomUUID(),
                 interface_name: newIfaceName,
             },
             bond: {

diff --git a/pkg/networkmanager/bridge.jsx b/pkg/networkmanager/bridge.jsx
@@ -28,7 +28,6 @@ import { MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialog
 import { ModelContext } from './model-context.jsx';
 import { useDialogs } from "dialogs.jsx";
 
-import { v4 as uuidv4 } from 'uuid';
 import {
     member_connection_for_interface,
     member_interface_choices,
@@ -130,7 +129,7 @@ export const getGhostSettings = ({ newIfaceName }) => {
                 id: newIfaceName,
                 autoconnect: true,
                 type: "bridge",
-                uuid: uuidv4(),
+                uuid: window.crypto.randomUUID(),
                 interface_name: newIfaceName
             },
             bridge: {

diff --git a/pkg/networkmanager/interfaces.js b/pkg/networkmanager/interfaces.js
@@ -23,7 +23,6 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.
 
 import { fmt_to_fragments } from 'utils.jsx';
 import * as utils from './utils.js';
-import { v4 as uuidv4 } from 'uuid';
 
 import "./networking.scss";
 
@@ -1420,7 +1419,7 @@ export function complete_settings(settings, device) {
     }
 
     settings.connection.id = device.Interface;
-    settings.connection.uuid = uuidv4();
+    settings.connection.uuid = window.crypto.randomUUID();
 
     if (device.DeviceType == 'ethernet') {
         settings.connection.type = '802-3-ethernet';

diff --git a/pkg/networkmanager/team.jsx b/pkg/networkmanager/team.jsx
@@ -28,7 +28,6 @@ import { MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialog
 import { ModelContext } from './model-context.jsx';
 import { useDialogs } from "dialogs.jsx";
 
-import { v4 as uuidv4 } from 'uuid';
 import {
     member_connection_for_interface,
     member_interface_choices,
@@ -216,7 +215,7 @@ export const getGhostSettings = ({ newIfaceName }) => {
                 id: newIfaceName,
                 autoconnect: true,
                 type: "team",
-                uuid: uuidv4(),
+                uuid: window.crypto.randomUUID(),
                 interface_name: newIfaceName,
             },
             team: {

diff --git a/pkg/networkmanager/vlan.jsx b/pkg/networkmanager/vlan.jsx
@@ -28,7 +28,6 @@ import { Name, NetworkModal, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
 import { useDialogs } from "dialogs.jsx";
 
-import { v4 as uuidv4 } from 'uuid';
 import {
     is_interface_connection,
     is_interesting_interface,
@@ -122,7 +121,7 @@ export const getGhostSettings = () => {
                 id: "",
                 autoconnect: true,
                 type: "vlan",
-                uuid: uuidv4(),
+                uuid: window.crypto.randomUUID(),
                 interface_name: ""
             },
             vlan: {