fix: update crc key name in pushImageToCrcCluster (#553)

* fix: update crc key name for pushImageToCrcCluster

Signed-off-by: Sonia Sandler <ssandler@redhat.com>

Author: SoniaSandler

src/image-handler.spec.ts

@@ -0,0 +1,135 @@
+/**********************************************************************
+ * Copyright (C) 2025 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ***********************************************************************/
+import { beforeEach, expect, test, vi } from 'vitest';
+import * as extensionApi from '@podman-desktop/api';
+import { pushImageToCrcCluster } from './image-handler.js';
+import { tmpdir, homedir } from 'node:os';
+import { promises } from 'node:fs';
+import * as utils from './util.js';
+
+type ImageInfo = { engineId: string; name?: string; tag?: string };
+
+vi.mock('@podman-desktop/api', async () => {
+  return {
+    window: {
+      withProgress: vi.fn(),
+      showInformationMessage: vi.fn(),
+    },
+    containerEngine: {
+      saveImage: vi.fn(),
+    },
+    ProgressLocation: {
+      TASK_WIDGET: 2,
+    },
+    configuration: {
+      getConfiguration: vi.fn(),
+    },
+    EventEmitter: vi.fn(),
+  };
+});
+
+vi.mock('./util.ts', async () => {
+  return {
+    runCliCommand: vi.fn(),
+    isWindows: vi.fn(),
+    isMac: vi.fn(),
+    productName: 'OpenShift Local',
+  };
+});
+
+vi.mock('node:os', () => {
+  return {
+    tmpdir: vi.fn(),
+    platform: vi.fn().mockReturnValue('linux'),
+    homedir: vi.fn(),
+  };
+});
+
+vi.mock('node:fs', () => {
+  return {
+    promises: {
+      rm: vi.fn(),
+      access: vi.fn(),
+    },
+  };
+});
+
+vi.mock('./crc-status.ts', () => {
+  return {
+    crcStatus: {
+      status: {
+        CrcStatus: 'Running',
+      },
+    },
+  };
+});
+
+beforeEach(() => {
+  vi.resetAllMocks();
+  vi.mocked(utils.isWindows).mockReturnValue(false);
+  vi.mocked(utils.isMac).mockReturnValue(false);
+  vi.mocked(utils.runCliCommand).mockResolvedValue({ exitCode: 0, stdErr: '', stdOut: 'ok' } as utils.SpawnResult);
+  vi.mocked(extensionApi.configuration.getConfiguration).mockReturnValue({
+    get: vi.fn(),
+  } as unknown as extensionApi.Configuration);
+});
+
+test.each([
+  { accessExists: false, keyName: 'id_ecdsa' },
+  { accessExists: true, keyName: 'id_ed25519' },
+])('use correct ssh key name for version $version', async ({ accessExists, keyName }) => {
+  let progressFunction;
+
+  const progress: extensionApi.Progress<{ message?: string; increment?: number }> = { report: vi.fn() };
+
+  vi.mocked(extensionApi.window.withProgress).mockImplementation(
+    (
+      options: extensionApi.ProgressOptions,
+      task: (
+        progress: extensionApi.Progress<{ message?: string; increment?: number }>,
+        token: extensionApi.CancellationToken,
+      ) => Promise<void>,
+    ): Promise<void> => {
+      progressFunction = task;
+      return;
+    },
+  );
+
+  vi.mocked(tmpdir).mockReturnValue('/tmp/path');
+  vi.mocked(homedir).mockReturnValue('/home/path');
+  if (accessExists) {
+    vi.mocked(promises.access).mockResolvedValue(undefined);
+  } else {
+    vi.mocked(promises.access).mockRejectedValue({ code: 'ENOENT' });
+  }
+
+  const imageInfoMock: ImageInfo = {
+    engineId: 'imageEngine',
+    name: 'image1',
+    tag: 'tag1',
+  };
+  await pushImageToCrcCluster(imageInfoMock);
+
+  await progressFunction(progress);
+
+  expect(utils.runCliCommand).toHaveBeenCalledWith(
+    'podman',
+    expect.arrayContaining([`--identity=/home/path/.crc/machines/crc/${keyName}`]),
+    expect.any(Object),
+  );
+});

src/image-handler.ts

@@ -53,11 +53,21 @@ export async function pushImageToCrcCluster(image: ImageInfo): Promise<void> {
           env.PATH = getPodmanInstallationPath();
         }
 
+        let keyName = 'id_ed25519';
+
+        try {
+          await fs.promises.access(`${os.homedir()}/.crc/machines/crc/id_ed25519`);
+        } catch (err: unknown) {
+          if (err && typeof err === 'object' && 'code' in err && err.code === 'ENOENT') {
+            keyName = 'id_ecdsa';
+          }
+        }
+
         const result = await runCliCommand(
           getPodmanCli(),
           [
             '--url=ssh://core@127.0.0.1:2222/run/podman/podman.sock',
-            `--identity=${os.homedir()}/.crc/machines/crc/id_ecdsa`,
+            `--identity=${os.homedir()}/.crc/machines/crc/${keyName}`,
             'load',
             '-i',
             filename,