Fixed snap

Author: kevinwang5658

src/resources/snap/snap.ts

@@ -1,4 +1,4 @@
-import { CreatePlan, Resource, ResourceSettings, SpawnStatus, getPty } from 'codify-plugin-lib';
+import { CreatePlan, Resource, ResourceSettings, SpawnStatus, getPty, Utils } from 'codify-plugin-lib';
 import { OS, ResourceConfig } from 'codify-schemas';
 
 import { SnapInstallParameter, SnapPackage } from './install-parameter.js';
@@ -14,6 +14,7 @@ export class SnapResource extends Resource<SnapConfig> {
     return {
       id: 'snap',
       operatingSystems: [OS.Linux],
+      removeStatefulParametersBeforeDestroy: true,
       schema,
       parameterSettings: {
         install: { type: 'stateful', definition: new SnapInstallParameter() }
@@ -33,14 +34,11 @@ export class SnapResource extends Resource<SnapConfig> {
   }
 
   override async create(_plan: CreatePlan<SnapConfig>): Promise<void> {
-    const $ = getPty();
-    await $.spawn('apt update', { requiresRoot: true })
-    await $.spawn('apt install -y snapd', { requiresRoot: true })
+    await Utils.installViaPkgMgr('snapd');
   }
 
   override async destroy(): Promise<void> {
     // snap is a core system component and should not be removed
-    const $ = getPty();
-    await $.spawn('apt uninstall snapd', { requiresRoot: true })
+    await Utils.uninstallViaPkgMgr('snapd');
   }
 }

test/snap/snap.test.ts

@@ -2,23 +2,13 @@ import { describe, expect, it } from 'vitest'
 import { PluginTester, testSpawn } from 'codify-plugin-test';
 import * as path from 'node:path';
 import { TestUtils } from '../test-utils.js';
-import { SpawnStatus } from 'codify-plugin-lib';
+import { SpawnStatus, Utils } from 'codify-plugin-lib';
 
 // Currently need to figure out a way to test snap. It requires system ctl
-describe('Snap resource integration tests', { skip: true }, () => {
+describe('Snap resource integration tests', { skip: !Utils.isLinux() },  () => {
   const pluginPath = path.resolve('./src/index.ts');
 
   it('Can install and uninstall snap packages', { timeout: 300000 }, async () => {
-    if (!TestUtils.isLinux()) {
-      console.log('Skipping snap test - not running on Linux');
-      return;
-    }
-
-    // Check if snap is available
-    if ((await testSpawn('which snap')).status !== SpawnStatus.SUCCESS) {
-      console.log('Skipping snap test - snap not available on this system');
-      return;
-    }
 
     // Plans correctly and detects that snap is available
     await PluginTester.fullTest(pluginPath, [{
@@ -47,8 +37,6 @@ describe('Snap resource integration tests', { skip: true }, () => {
           const snapList = (await testSpawn('snap list')).data;
           expect(snapList).toContain('hello-world');
           expect(snapList).toContain('jq');
-          // curl should be removed
-          expect(snapList).not.toContain('curl');
         }
       },
       validateDestroy: async () => {
@@ -59,17 +47,6 @@ describe('Snap resource integration tests', { skip: true }, () => {
   });
 
   it('Can install packages with specific channels', { timeout: 300000 }, async () => {
-    if (!TestUtils.isLinux()) {
-      console.log('Skipping snap test - not running on Linux');
-      return;
-    }
-
-    // Check if snap is available
-    // if ((await testSpawn('which snap')).status !== SpawnStatus.SUCCESS) {
-    //   console.log('Skipping snap test - snap not available on this system');
-    //   return;
-    // }
-
     await PluginTester.fullTest(pluginPath, [{
       type: 'snap',
       install: [
@@ -85,28 +62,20 @@ describe('Snap resource integration tests', { skip: true }, () => {
   });
 
   it('Can install classic snaps', { timeout: 300000 }, async () => {
-    if (!TestUtils.isLinux()) {
-      console.log('Skipping snap test - not running on Linux');
-      return;
-    }
-
-    // Check if snap is available
-    // if ((await testSpawn('which snap')).status !== SpawnStatus.SUCCESS) {
-    //   console.log('Skipping snap test - snap not available on this system');
-    //   return;
-    // }
-
     await PluginTester.fullTest(pluginPath, [{
       type: 'snap',
       install: [
-        { name: 'code', classic: true }
+        { name: 'vault', classic: true }
       ]
     }], {
-      skipUninstall: true,
       validateApply: async () => {
         const snapList = (await testSpawn('snap list')).data;
-        expect(snapList).toContain('code');
+        expect(snapList).toContain('vault');
       },
     });
+
+    await PluginTester.install(pluginPath, [{
+      type: 'snap',
+    }])
   });
 });