codify-plugin-lib 1.0.182-beta65 → 1.0.182-beta67

package/dist/plan/plan.js

@@ -197,7 +197,9 @@ export class Plan {
         }
         // For stateful mode, we're done after filtering by the keys of desired + state. Stateless mode
         // requires additional filtering for stateful parameter arrays and objects.
-        if (isStateful) {
+        // We also want to filter parameters when in delete mode. We don't want to delete parameters that
+        // are not specified in the original config.
+        if (isStateful && desired !== null) {
             return filteredCurrent;
         }
         // TODO: Add object handling here in addition to arrays in the future

package/dist/utils/index.d.ts

@@ -42,5 +42,5 @@ export declare const Utils: {
     isFedora(): Promise<boolean>;
     isRHEL(): Promise<boolean>;
     isDebianBased(): boolean;
-    isRPMBased(): boolean;
+    isRedhatBased(): boolean;
 };

package/dist/utils/index.js

@@ -1,9 +1,9 @@
 import { LinuxDistro } from 'codify-schemas';
+import * as fsSync from 'node:fs';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { SpawnStatus, getPty } from '../pty/index.js';
-import * as fsSync from 'node:fs';
 export function isDebug() {
     return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
 }
@@ -167,10 +167,16 @@ Brew can be installed using Codify:
             const isAptInstalled = await $.spawnSafe('which apt');
             if (isAptInstalled.status === SpawnStatus.SUCCESS) {
                 await $.spawn('apt-get update', { requiresRoot: true });
-                const { status, data } = await $.spawnSafe(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+                const { status, data } = await $.spawnSafe(`apt-get -y install ${packageName}`, {
+                    requiresRoot: true,
+                    env: { DEBIAN_FRONTEND: 'noninteractive' }
+                });
                 if (status === SpawnStatus.ERROR && data.includes('E: dpkg was interrupted, you must manually run \'sudo dpkg --configure -a\' to correct the problem.')) {
                     await $.spawn('dpkg --configure -a', { requiresRoot: true });
-                    await $.spawn(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+                    await $.spawn(`apt-get -y install ${packageName}`, {
+                        requiresRoot: true,
+                        env: { DEBIAN_FRONTEND: 'noninteractive' }
+                    });
                     return;
                 }
                 if (status === SpawnStatus.ERROR) {
@@ -198,13 +204,19 @@ Brew can be installed using Codify:
         const $ = getPty();
         if (Utils.isMacOS()) {
             await this.assertBrewInstalled();
-            const { status } = await $.spawnSafe(`brew uninstall --zap ${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
+            const { status } = await $.spawnSafe(`brew uninstall --zap ${packageName}`, {
+                interactive: true,
+                env: { HOMEBREW_NO_AUTO_UPDATE: 1 }
+            });
             return status === SpawnStatus.SUCCESS;
         }
         if (Utils.isLinux()) {
             const isAptInstalled = await $.spawnSafe('which apt');
             if (isAptInstalled.status === SpawnStatus.SUCCESS) {
-                const { status } = await $.spawnSafe(`apt-get autoremove -y --purge ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+                const { status } = await $.spawnSafe(`apt-get autoremove -y --purge ${packageName}`, {
+                    requiresRoot: true,
+                    env: { DEBIAN_FRONTEND: 'noninteractive' }
+                });
                 return status === SpawnStatus.SUCCESS;
             }
             const isDnfInstalled = await $.spawnSafe('which dnf');
@@ -226,7 +238,7 @@ Brew can be installed using Codify:
         const lines = osRelease.split('\n');
         for (const line of lines) {
             if (line.startsWith('ID=')) {
-                const distroId = line.slice(3).trim().replace(/"/g, '');
+                const distroId = line.slice(3).trim().replaceAll('"', '');
                 return Object.values(LinuxDistro).includes(distroId) ? distroId : undefined;
             }
         }
@@ -253,7 +265,7 @@ Brew can be installed using Codify:
     isDebianBased() {
         return fsSync.existsSync('/etc/debian_version');
     },
-    isRPMBased() {
+    isRedhatBased() {
         return fsSync.existsSync('/etc/redhat-release');
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.182-beta65",
+  "version": "1.0.182-beta67",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/plan/plan.ts

@@ -326,7 +326,9 @@ export class Plan<T extends StringIndexedObject> {
 
     // For stateful mode, we're done after filtering by the keys of desired + state. Stateless mode
     // requires additional filtering for stateful parameter arrays and objects.
-    if (isStateful) {
+    // We also want to filter parameters when in delete mode. We don't want to delete parameters that
+    // are not specified in the original config.
+    if (isStateful && desired !== null) {
       return filteredCurrent;
     }
 

package/src/utils/index.ts

@@ -1,10 +1,10 @@
 import { LinuxDistro, OS } from 'codify-schemas';
+import * as fsSync from 'node:fs';
 import * as fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 
 import { SpawnStatus, getPty } from '../pty/index.js';
-import * as fsSync from 'node:fs';
 
 export function isDebug(): boolean {
   return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
@@ -209,11 +209,17 @@ Brew can be installed using Codify:
       const isAptInstalled = await $.spawnSafe('which apt');
       if (isAptInstalled.status === SpawnStatus.SUCCESS) {
         await $.spawn('apt-get update', { requiresRoot: true });
-        const { status, data } = await $.spawnSafe(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+        const { status, data } = await $.spawnSafe(`apt-get -y install ${packageName}`, {
+          requiresRoot: true,
+          env: { DEBIAN_FRONTEND: 'noninteractive' }
+        });
 
         if (status === SpawnStatus.ERROR && data.includes('E: dpkg was interrupted, you must manually run \'sudo dpkg --configure -a\' to correct the problem.')) {
           await $.spawn('dpkg --configure -a', { requiresRoot: true });
-          await $.spawn(`apt-get -y install ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+          await $.spawn(`apt-get -y install ${packageName}`, {
+            requiresRoot: true,
+            env: { DEBIAN_FRONTEND: 'noninteractive' }
+          });
 
           return;
         }
@@ -249,14 +255,20 @@ Brew can be installed using Codify:
 
     if (Utils.isMacOS()) {
       await this.assertBrewInstalled();
-      const { status } = await $.spawnSafe(`brew uninstall --zap ${packageName}`, { interactive: true, env: { HOMEBREW_NO_AUTO_UPDATE: 1 } });
+      const { status } = await $.spawnSafe(`brew uninstall --zap ${packageName}`, {
+        interactive: true,
+        env: { HOMEBREW_NO_AUTO_UPDATE: 1 }
+      });
       return status === SpawnStatus.SUCCESS;
     }
 
     if (Utils.isLinux()) {
       const isAptInstalled = await $.spawnSafe('which apt');
       if (isAptInstalled.status === SpawnStatus.SUCCESS) {
-        const { status } = await $.spawnSafe(`apt-get autoremove -y --purge ${packageName}`, { requiresRoot: true, env: { DEBIAN_FRONTEND: 'noninteractive' } });
+        const { status } = await $.spawnSafe(`apt-get autoremove -y --purge ${packageName}`, {
+          requiresRoot: true,
+          env: { DEBIAN_FRONTEND: 'noninteractive' }
+        });
         return status === SpawnStatus.SUCCESS;
       }
 
@@ -283,11 +295,11 @@ Brew can be installed using Codify:
     const lines = osRelease.split('\n');
     for (const line of lines) {
       if (line.startsWith('ID=')) {
-        const distroId = line.slice(3).trim().replace(/"/g, '');
+        const distroId = line.slice(3).trim().replaceAll('"', '');
         return Object.values(LinuxDistro).includes(distroId as LinuxDistro) ? distroId as LinuxDistro : undefined;
       }
     }
-    
+
     return undefined;
   },
 
@@ -319,7 +331,7 @@ Brew can be installed using Codify:
     return fsSync.existsSync('/etc/debian_version');
   },
 
-  isRPMBased(): boolean {
+  isRedhatBased(): boolean {
     return fsSync.existsSync('/etc/redhat-release');
   }
 };