feat: support latest rhel images (#365)

* feat: support latest rhel images

* doc: update doc

Author: feloy

README.md

@@ -12,17 +12,17 @@ The `macadam` binary is embedded in the extension, nothing needs to be installed
 
 When initialized, the extension checks if the necessary binaries are present in `/opt/macadam/bin`. If they are not, the extension installs them in this directory.
 
-> If this installation fails, you can run the installer manually, using the installer found at https://github.com/crc-org/macadam/releases/tag/v0.1.1. After this, you need to restart the extension which should find and use the binaries.
+> If this installation fails, you can run the installer manually, using the installer found at https://github.com/crc-org/macadam/releases/tag/v0.2.0. After this, you need to restart the extension which should find and use the binaries.
 
 ### On Fedora Linux/x86_64
 
-The `macadam` binary must be installed in the directory `/opt/macadam/bin/`: download the binary from https://github.com/crc-org/macadam/releases/tag/v0.1.1, rename it `macadam` and make it executable.
+The `macadam` binary must be installed in the directory `/usr/local/bin/`: download the binary from https://github.com/crc-org/macadam/releases/tag/v0.2.0, rename it `macadam` and make it executable.
 
 ```
-curl -L -o macadam https://github.com/crc-org/macadam/releases/download/v0.1.1/macadam-linux-amd64
+curl -L -o macadam https://github.com/crc-org/macadam/releases/download/v0.2.0/macadam-linux-amd64
 chmod 755 macadam
-sudo mkdir -p /opt/macadam/bin/
-sudo mv macadam /opt/macadam/bin/
+sudo mkdir -p /usr/local/bin/
+sudo mv macadam /usr/local/bin/
 ```
 
 The `gvproxy` binary must be installed with the command `dnf install gvisor-tap-vsock`.

package.json

@@ -25,9 +25,9 @@
         },
         "rhel-vms.factory.machine.image": {
           "type": "string",
-          "enum": ["RHEL 10.0", "RHEL 9.6", "local image on disk"],
+          "enum": ["RHEL 10", "RHEL 9", "local image on disk"],
           "scope": "VmProviderConnectionFactory",
-          "default": "RHEL 10.0",
+          "default": "RHEL 10",
           "description": "Image to download"
         },
         "rhel-vms.factory.machine.force-download": {

src/cache.spec.ts

@@ -36,37 +36,37 @@ beforeEach(() => {
   vi.mocked(env).isLinux = false;
 });
 
-test('images/image and images/rhel9_5 are deleted during init if they exist, rhel9_6 is not deleted, on Windows', async () => {
+test('images/image and images/rhel9_6 are deleted during init if they exist, rhel9 is not deleted, on Windows', async () => {
   vi.mocked(env).isWindows = true;
   const cachePath = resolve('/', 'path', 'to', 'cache');
   const cache = new ImageCache(cachePath);
   vol.fromJSON({
     '/path/to/cache/images/image': '',
-    '/path/to/cache/images/rhel9_5.tar.gz': '',
     '/path/to/cache/images/rhel9_6.tar.gz': '',
+    '/path/to/cache/images/rhel9.tar.gz': '',
   });
 
   await cache.init();
 
   expect(vol.toJSON()).toEqual({
-    '/path/to/cache/images/rhel9_6.tar.gz': '',
+    '/path/to/cache/images/rhel9.tar.gz': '',
   });
 });
 
-test('images/image and images/rhel9_5 are deleted during init if they exist, rhel9_6 is not deleted, on Mac', async () => {
+test('images/image and images/rhel9_6 are deleted during init if they exist, rhel9 is not deleted, on Mac', async () => {
   vi.mocked(env).isMac = true;
   const cachePath = resolve('/', 'path', 'to', 'cache');
   const cache = new ImageCache(cachePath);
   vol.fromJSON({
     '/path/to/cache/images/image': '',
-    '/path/to/cache/images/rhel9_5.tar.gz': '',
-    '/path/to/cache/images/rhel9_6.qcow2': '',
+    '/path/to/cache/images/rhel9_6.tar.gz': '',
+    '/path/to/cache/images/rhel9.qcow2': '',
   });
 
   await cache.init();
 
   expect(vol.toJSON()).toEqual({
-    '/path/to/cache/images/rhel9_6.qcow2': '',
+    '/path/to/cache/images/rhel9.qcow2': '',
   });
 });
 
@@ -84,24 +84,24 @@ test('getPath returns path for known image on Windows', async () => {
   vi.mocked(env).isWindows = true;
   const cache = new ImageCache(resolve('/', 'path', 'to', 'cache'));
   await cache.init();
-  const path = cache.getPath('RHEL 10.0');
-  expect(path).toBe(resolve('/', 'path', 'to', 'cache', 'images', 'rhel10_0.tar.gz'));
+  const path = cache.getPath('RHEL 10');
+  expect(path).toBe(resolve('/', 'path', 'to', 'cache', 'images', 'rhel10.tar.gz'));
 });
 
 test('getPath returns path for known image on Linux', async () => {
   vi.mocked(env).isMac = true;
   const cache = new ImageCache(resolve('/', 'path', 'to', 'cache'));
   await cache.init();
-  const path = cache.getPath('RHEL 10.0');
-  expect(path).toBe(resolve('/', 'path', 'to', 'cache', 'images', 'rhel10_0.qcow2'));
+  const path = cache.getPath('RHEL 10');
+  expect(path).toBe(resolve('/', 'path', 'to', 'cache', 'images', 'rhel10.qcow2'));
 });
 
 test('getPath returns path for known image on Mac', async () => {
   vi.mocked(env).isMac = true;
   const cache = new ImageCache(resolve('/', 'path', 'to', 'cache'));
   await cache.init();
-  const path = cache.getPath('RHEL 10.0');
-  expect(path).toBe(resolve('/', 'path', 'to', 'cache', 'images', 'rhel10_0.qcow2'));
+  const path = cache.getPath('RHEL 10');
+  expect(path).toBe(resolve('/', 'path', 'to', 'cache', 'images', 'rhel10.qcow2'));
 });
 
 test('getPath raises an exception for an unknown image', async () => {

src/cache.ts

@@ -29,8 +29,8 @@ export class ImageCache {
   #extension = env.isWindows ? '.tar.gz' : '.qcow2';
 
   #cachedImageNames: Record<string, string> = {
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: `rhel10_0${this.#extension}`,
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: `rhel9_6${this.#extension}`,
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: `rhel10${this.#extension}`,
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: `rhel9${this.#extension}`,
   };
 
   constructor(storagePath: string) {

src/constants.ts

@@ -20,7 +20,7 @@ export const RHEL_VMS_IMAGE_PROPERTY_KEY = 'rhel-vms.factory.machine.image';
 export const RHEL_VMS_IMAGE_PROPERTY_VALUE_LOCAL = 'local image on disk';
 
 // Must match enumed value for rhel-vms.factory.machine.image in package.json
-export const RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10 = 'RHEL 10.0';
-export const RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9 = 'RHEL 9.6';
+export const RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10 = 'RHEL 10';
+export const RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9 = 'RHEL 9';
 
 export const RHEL_VMS_LOCAL_IMAGE_KEY = 'rhel-vms.localImage';

src/images.ts

@@ -22,16 +22,16 @@ import { RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9, RHEL_VMS_IMAGE_PROPERTY_VALUE_RHE
 
 const IMAGES: { [provider: string]: { [version: string]: string } } = {
   applehv: {
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: 'd32f05024821400932b3653647567abcd34dc03b4243d9a8ae5a11ecd11b1544',
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: '73c93ad15404a93b2d5bb3b01474e2827e03eb74316132c1067519e4cb598652',
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: 'a522f6abacab1c5804477332bbd14a467c3f9812d3f2c46ee05c71b07df05bcf', // 10.1
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: 'e424cba737c5d6315160111043f40108b3bc458c09c937454a3331c52503d877', // 9.7
   },
   wsl: {
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: 'dccb2abb166981fa7598e948f9cab029aa1775219f8249fd54760ddd0f2b8910',
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: 'dca8920b81a0664788a098b20328ee98ee6f822f1a1106ee85e9146c50ae6b98',
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: 'e1871004d0075e0ce10cfb4c1aae7c1fb56cf2162e9d494d1f9c9d061902fec6', // 10.1
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: 'bf4fa1142e0090e7f6fe163bf03d5f0de12ebafce02d4f8ea71dd5de3f1769c8', // 9.7
   },
   linux_native_x64: {
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: '73473542ff4622524ae200ffabd4064bb2a7ff39ac40a012443a43d429d60019',
-    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: '49443696e7f2410e5647aa16f15eb7b7b08610fea92cdf3eba44ab9ec9ff899f',
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_10]: 'dc74ad1a9ccd3c62a02cc29f7f4715e47fa0fdaf08a8080dd20906f885f29bae', // 10.1
+    [RHEL_VMS_IMAGE_PROPERTY_VALUE_RHEL_9]: 'e89e0a3e28c3e7fb73a97483b60130d5a3e4bba9481ae282ec6e0551ccf30047', // 9.7
   },
 };