Merge branch 'main' into createRootlessMachine

Signed-off-by: tbabalov <[email protected]>

Author: xbabalov

CODEOWNERS

@@ -2,8 +2,8 @@
 * @containers/podman-desktop-reviewers @benoitf
 
 # website
-website/** @containers/podman-desktop-reviewers @slemeur @cdrage @benoitf
-website/docs/** @containers/podman-desktop-reviewers @shipsing @slemeur @cdrage @benoitf
+website/** @containers/podman-desktop-reviewers @slemeur @cdrage @benoitf @Firewall
+website/docs/** @containers/podman-desktop-reviewers @shipsing @slemeur @cdrage @benoitf @Firewall
 
 # playwright tests
 tests/playwright/** @containers/podman-desktop-reviewers @containers/podman-desktop-qe-reviewers @benoitf

extensions/kind/src/util.ts

@@ -22,7 +22,7 @@ import { isAbsolute, join } from 'node:path';
 
 import * as extensionApi from '@podman-desktop/api';
 
-const macosExtraPath = '/usr/local/bin:/opt/homebrew/bin:/opt/local/bin:/opt/podman/bin';
+const macosExtraPath = '/opt/podman/bin:/usr/local/bin:/opt/homebrew/bin:/opt/local/bin';
 const localBinDir = '/usr/local/bin';
 
 export function getSystemBinaryPath(binaryName: string): string {

extensions/podman/packages/extension/src/compatibility-mode.ts

@@ -52,14 +52,14 @@ export class DarwinSocketCompatibility extends SocketCompatibility {
   // Find the podman-mac-helper binary which should only be located in either
   // brew or podman's install location
   findPodmanHelper(): string {
-    const homebrewPath = '/opt/homebrew/bin/podman-mac-helper';
     const podmanPath = '/opt/podman/bin/podman-mac-helper';
+    const homebrewPath = '/opt/homebrew/bin/podman-mac-helper';
     const userBinaryPath = '/usr/local/bin/podman-mac-helper';
 
-    if (fs.existsSync(homebrewPath)) {
-      return homebrewPath;
-    } else if (fs.existsSync(podmanPath)) {
+    if (fs.existsSync(podmanPath)) {
       return podmanPath;
+    } else if (fs.existsSync(homebrewPath)) {
+      return homebrewPath;
     } else if (fs.existsSync(userBinaryPath)) {
       return userBinaryPath;
     } else {

extensions/podman/packages/extension/src/podman-cli.ts

@@ -19,7 +19,7 @@ import * as extensionApi from '@podman-desktop/api';
 
 import { isMac, isWindows } from './util';
 
-const macosExtraPath = '/usr/local/bin:/opt/homebrew/bin:/opt/local/bin:/opt/podman/bin';
+const macosExtraPath = '/opt/podman/bin:/usr/local/bin:/opt/homebrew/bin:/opt/local/bin';
 
 export function getInstallationPath(): string | undefined {
   const env = process.env;

package.json

@@ -115,12 +115,12 @@
     "@electron/fuses": "^1.8.0",
     "@eslint/compat": "^1.1.1",
     "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.11.0",
+    "@eslint/js": "^9.11.1",
     "@playwright/test": "1.47.2",
     "@podman-desktop/api": "workspace:",
-    "@rollup/plugin-commonjs": "^26.0.1",
+    "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.4",
+    "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-typescript": "^12.1.0",
     "@tsconfig/strictest": "^2.0.5",
     "@types/adm-zip": "^0.5.5",
@@ -132,16 +132,16 @@
     "@types/tar": "^6.1.13",
     "@types/tar-fs": "^2.0.4",
     "@types/validator": "^13.12.2",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
-    "@typescript-eslint/parser": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
+    "@typescript-eslint/parser": "^8.7.0",
     "@vitest/coverage-v8": "^2.0.5",
     "cross-env": "7.0.3",
     "dts-for-context-bridge": "0.7.1",
     "electron": "32.1.2",
     "electron-builder": "24.13",
     "electron-builder-notarize": "^1.5.2",
     "electron-devtools-installer": "^3.2.0",
-    "eslint": "^9.11.0",
+    "eslint": "^9.11.1",
     "eslint-import-resolver-custom-alias": "^1.3.2",
     "eslint-import-resolver-typescript": "^3.6.3",
     "eslint-plugin-etc": "^2.0.3",
@@ -164,7 +164,7 @@
     "prettier-plugin-svelte": "^3.2.6",
     "proxy": "^2.2.0",
     "typescript": "5.6.2",
-    "typescript-eslint": "^8.6.0",
+    "typescript-eslint": "^8.7.0",
     "validator": "^13.12.0",
     "vite": "^5.4.7",
     "vitest": "^2.0.5",

packages/main/src/plugin/color-registry.ts

@@ -1307,6 +1307,10 @@ export class ColorRegistry {
       dark: colorPalette.red[500],
       light: colorPalette.red[600],
     });
+    this.registerColor(`${state}info`, {
+      dark: colorPalette.purple[500],
+      light: colorPalette.purple[600],
+    });
   }
 
   // colors for image files explorer

packages/main/src/plugin/docker-extension/docker-plugin-adapter.ts

@@ -37,7 +37,7 @@ export interface RawExecResult {
 }
 
 export class DockerPluginAdapter {
-  static readonly MACOS_EXTRA_PATH = '/usr/local/bin:/opt/homebrew/bin:/opt/local/bin:/opt/podman/bin';
+  static readonly MACOS_EXTRA_PATH = '/opt/podman/bin:/usr/local/bin:/opt/homebrew/bin:/opt/local/bin';
 
   constructor(
     private contributionManager: ContributionManager,

packages/main/src/plugin/util/exec.spec.ts

@@ -608,7 +608,7 @@ describe('getInstallationPath', () => {
 
     const path = getInstallationPath();
 
-    expect(path).toBe(`/usr/bin:${macosExtraPath}`);
+    expect(path).toBe(`${macosExtraPath}:/usr/bin`);
   });
 
   test('should return the installation path for macOS with defined param', () => {
@@ -619,7 +619,7 @@ describe('getInstallationPath', () => {
 
     const path = getInstallationPath('/usr/other');
 
-    expect(path).toBe(`/usr/other:${macosExtraPath}`);
+    expect(path).toBe(`${macosExtraPath}:/usr/other`);
   });
 
   test('should return the installation path for other platforms', () => {

packages/main/src/plugin/util/exec.ts

@@ -25,7 +25,7 @@ import * as sudo from 'sudo-prompt';
 import { isLinux, isMac, isWindows } from '../../util.js';
 import type { Proxy } from '../proxy.js';
 
-export const macosExtraPath = '/usr/local/bin:/opt/homebrew/bin:/opt/local/bin:/opt/podman/bin';
+export const macosExtraPath = '/opt/podman/bin:/usr/local/bin:/opt/homebrew/bin:/opt/local/bin';
 
 class RunErrorImpl extends Error implements RunError {
   constructor(
@@ -248,7 +248,7 @@ export function getInstallationPath(envPATH?: string): string {
     if (!envPATH) {
       return macosExtraPath;
     } else {
-      return envPATH.concat(':').concat(macosExtraPath);
+      return macosExtraPath.concat(':').concat(envPATH);
     }
   } else {
     return envPATH ?? '';

packages/renderer/package.json

@@ -24,7 +24,7 @@
     "@tsconfig/svelte": "^5.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/validator": "^13.12.2",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@xterm/addon-serialize": "^0.13.0",
     "autoprefixer": "^10.4.20",
     "eslint-plugin-svelte": "^2.44.0",
@@ -37,12 +37,12 @@
     "monaco-editor": "^0.52.0",
     "postcss": "^8.4.47",
     "postcss-load-config": "^6.0.1",
-    "svelte": "5.0.0-next.225",
+    "svelte": "5.0.0-next.258",
     "svelte-check": "^4.0.2",
     "svelte-eslint-parser": "^0.41.1",
     "svelte-fa": "^4.0.2",
     "svelte-steps": "2.4.1",
-    "tailwindcss": "^3.4.12",
+    "tailwindcss": "^3.4.13",
     "tslib": "^2.7.0",
     "typescript": "^5.6.2",
     "vite": "^5.4.7",

packages/renderer/src/lib/compose/ComposeActions.spec.ts

@@ -25,21 +25,40 @@ import type { ContainerInfoUI } from '../container/ContainerInfoUI';
 import ComposeActions from './ComposeActions.svelte';
 import type { ComposeInfoUI } from './ComposeInfoUI';
 
-const compose: ComposeInfoUI = {
-  engineId: 'podman',
-  engineType: 'podman',
-  name: 'my-compose-group',
-  status: 'STOPPED',
-  actionInProgress: false,
-  actionError: undefined,
-  containers: [
+class ComposeInfoUIImpl implements ComposeInfoUI {
+  #status: string = 'STOPPED';
+  constructor(
+    public engineId: string,
+    public engineType: 'docker' | 'podman',
+    public name: string,
+    initialStatus: string,
+    public actionInProgress: boolean,
+    public actionError: string | undefined,
+    public containers: ContainerInfoUI[],
+  ) {}
+  set status(status: string) {
+    this.#status = status;
+  }
+  get status(): string {
+    return this.#status;
+  }
+}
+
+const compose: ComposeInfoUI = new ComposeInfoUIImpl(
+  'podman',
+  'podman',
+  'my-compose-group',
+  'STOPPED',
+  false,
+  undefined,
+  [
     {
       actionInProgress: false,
       actionError: undefined,
       state: 'STOPPED',
     } as ContainerInfoUI,
   ],
-} as ComposeInfoUI;
+);
 
 const getContributedMenusMock = vi.fn();
 const updateMock = vi.fn();

packages/renderer/src/lib/container/ContainerActions.spec.ts

@@ -25,10 +25,24 @@ import { afterEach, beforeEach, expect, test, vi } from 'vitest';
 import ContainerActions from './ContainerActions.svelte';
 import type { ContainerInfoUI } from './ContainerInfoUI';
 
-const container: ContainerInfoUI = {
-  id: 'container-id',
-  engineId: 'container-engine-id',
-} as ContainerInfoUI;
+class ContainerInfoUIImpl {
+  #actionError: string = '';
+  constructor(
+    public id: string,
+    public engineId: string,
+  ) {}
+  set actionError(error: string) {
+    this.#actionError = error;
+  }
+  get actionError(): string {
+    return this.#actionError;
+  }
+}
+
+const container: ContainerInfoUI = new ContainerInfoUIImpl(
+  'container-id',
+  'container-engine-id',
+) as unknown as ContainerInfoUI;
 
 const getContributedMenusMock = vi.fn();
 const updateMock = vi.fn();

packages/renderer/src/lib/dashboard/ProviderInstalled.spec.ts

@@ -36,6 +36,29 @@ vi.mock('@xterm/xterm', () => {
   };
 });
 
+class InitializationContextImpl {
+  #promise: unknown;
+  #error: unknown;
+
+  constructor(public mode: string) {}
+
+  set promise(promise: unknown) {
+    this.#promise = promise;
+  }
+
+  get promise(): unknown {
+    return this.#promise;
+  }
+
+  set error(error: unknown) {
+    this.#error = error;
+  }
+
+  get error(): unknown {
+    return this.#error;
+  }
+}
+
 // fake the window.events object
 beforeAll(() => {
   (window as any).ResizeObserver = vi.fn().mockReturnValue({ observe: vi.fn(), unobserve: vi.fn() });
@@ -70,7 +93,9 @@ test('Expect installed provider shows button', async () => {
     cleanupSupport: false,
   };
 
-  const initializationContext: InitializationContext = { mode: InitializeAndStartMode };
+  const initializationContext: InitializationContext = new InitializationContextImpl(
+    InitializeAndStartMode,
+  ) as unknown as InitializationContext;
   render(ProviderInstalled, { provider: provider, initializationContext: initializationContext });
 
   const providerText = screen.getByText(content => content === 'MyProvider');
@@ -118,7 +143,9 @@ test('Expect to see the initialize context error if provider installation fails'
     cleanupSupport: false,
   };
 
-  const initializationContext: InitializationContext = { mode: InitializeAndStartMode };
+  const initializationContext: InitializationContext = new InitializationContextImpl(
+    InitializeAndStartMode,
+  ) as unknown as InitializationContext;
   render(ProviderInstalled, { provider: provider, initializationContext: initializationContext });
 
   const providerText = screen.getByText(content => content === 'MyProvider');

packages/renderer/src/lib/dashboard/ProviderInstalled.svelte

@@ -148,6 +148,7 @@ function onInstallationClick() {
           </button>
           <button
             class="inline-block bg-purple-600 hover:bg-purple-500 text-[13px] text-white pt-2 pr-3 pl-3 pb-2 w-[32px]"
+            aria-label="Installation options menu"
             on:click={() => updateOptionsMenu(!installationOptionsMenuVisible)}>
             <i class="fas fa-caret-down"></i>
           </button>

packages/renderer/src/lib/deployments/DeploymentActions.spec.ts

@@ -27,15 +27,36 @@ import type { DeploymentUI } from './DeploymentUI';
 const updateMock = vi.fn();
 const deleteMock = vi.fn();
 
-const deployment: DeploymentUI = {
-  name: 'my-deployment',
-  status: 'RUNNING',
-  namespace: '',
-  replicas: 0,
-  ready: 0,
-  selected: false,
-  conditions: [],
-};
+class DeploymentfUIImpl {
+  #status: string;
+  constructor(
+    public name: string,
+    initialStatus: string,
+    public namespace: string,
+    public replicas: number,
+    public ready: number,
+    public selected: boolean,
+    public conditions: unknown[],
+  ) {
+    this.#status = initialStatus;
+  }
+  set status(status: string) {
+    this.#status = status;
+  }
+  get status(): string {
+    return this.#status;
+  }
+}
+
+const deployment: DeploymentUI = new DeploymentfUIImpl(
+  'my-deployment',
+  'RUNNING',
+  '',
+  0,
+  0,
+  false,
+  [],
+) as unknown as DeploymentUI;
 
 beforeEach(() => {
   (window as any).kubernetesDeleteDeployment = deleteMock;

packages/renderer/src/lib/image/ImageActions.spec.ts

@@ -61,6 +61,24 @@ const fakedImage: ImageInfoUI = {
   name: 'dummy',
 } as unknown as ImageInfoUI;
 
+class Image {
+  #status: string;
+  constructor(
+    public name: string,
+    initialStatus: string,
+  ) {
+    this.#status = initialStatus;
+  }
+
+  set status(status: string) {
+    this.#status = status;
+  }
+
+  get status(): string {
+    return this.#status;
+  }
+}
+
 beforeEach(() => {
   vi.resetAllMocks();
 });
@@ -69,10 +87,7 @@ test('Expect showMessageBox to be called when error occurs', async () => {
   vi.mocked(withConfirmation).mockImplementation(f => f());
   getContributedMenusMock.mockImplementation(() => Promise.resolve([]));
 
-  const image: ImageInfoUI = {
-    name: 'dummy',
-    status: 'UNUSED',
-  } as ImageInfoUI;
+  const image: ImageInfoUI = new Image('dummy', 'UNUSED') as unknown as ImageInfoUI;
 
   render(ImageActions, {
     onPushImage: vi.fn(),