@celilo/cli 0.4.1 → 0.5.0-alpha.1

package/src/variables/context.test.ts

@@ -358,7 +358,7 @@ describe('Variable Context', () => {
             name: 'Grafana',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 cpu: 2,
                 memory: 2048,
                 disk: 20,
@@ -372,34 +372,11 @@ describe('Variable Context', () => {
 
       const context = await buildResolutionContext('grafana', db);
 
-      expect(context.selfConfig['requires.machine.cpu']).toBe('2');
-      expect(context.selfConfig['requires.machine.memory']).toBe('2048');
-      expect(context.selfConfig['requires.machine.disk']).toBe('20');
-      expect(context.selfConfig['requires.machine.storage']).toBe('local-lvm');
-      expect(context.selfConfig['requires.machine.zone']).toBe('app');
-    });
-
-    test('should handle module without VM resources', async () => {
-      // Create module without VM resources
-      db.insert(modules)
-        .values({
-          id: 'simple',
-          name: 'Simple Module',
-          version: '1.0.0',
-          sourcePath: '/test/simple',
-          manifestData: {
-            id: 'simple',
-            name: 'Simple Module',
-            version: '1.0.0',
-          },
-        })
-        .run();
-
-      const context = await buildResolutionContext('simple', db);
-
-      // Should not have requires.machine keys
-      expect(context.selfConfig['requires.machine.cpu']).toBeUndefined();
-      expect(context.selfConfig['requires.machine.memory']).toBeUndefined();
+      expect(context.selfConfig['requires.system.cpu']).toBe('2');
+      expect(context.selfConfig['requires.system.memory']).toBe('2048');
+      expect(context.selfConfig['requires.system.disk']).toBe('20');
+      expect(context.selfConfig['requires.system.storage']).toBe('local-lvm');
+      expect(context.selfConfig['requires.system.zone']).toBe('app');
     });
 
     test('should auto-derive inventory variables from target_ip', async () => {
@@ -472,7 +449,7 @@ describe('Variable Context', () => {
               ],
             },
             requires: {
-              machine: {
+              system: {
                 zone: 'dmz',
               },
             },
@@ -529,7 +506,7 @@ describe('Variable Context', () => {
                 { name: 'target_ip', type: 'string', required: true, source: 'user' },
               ],
             },
-            requires: { machine: { zone: 'dmz' } },
+            requires: { system: { zone: 'dmz' } },
           },
         })
         .run();
@@ -649,7 +626,7 @@ describe('Variable Context', () => {
                 { name: 'target_ip', type: 'string', required: true, source: 'user' },
               ],
             },
-            requires: { machine: { zone: 'dmz' } },
+            requires: { system: { zone: 'dmz' } },
           },
         })
         .run();
@@ -672,7 +649,7 @@ describe('Variable Context', () => {
                 { name: 'target_ip', type: 'string', required: true, source: 'user' },
               ],
             },
-            requires: { machine: { zone: 'dmz' } },
+            requires: { system: { zone: 'dmz' } },
           },
         })
         .run();
@@ -890,7 +867,7 @@ describe('Variable Context', () => {
             name: 'App With Resources',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 cpu: 2,
                 memory: 2048,
                 disk: 20,
@@ -935,7 +912,7 @@ describe('Variable Context', () => {
             name: 'Custom Resources',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 cpu: 2,
                 memory: 2048,
               },
@@ -997,7 +974,7 @@ describe('Variable Context', () => {
             name: 'Partial Resources',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 cpu: 1,
                 memory: 512,
                 // No disk or storage specified
@@ -1031,7 +1008,7 @@ describe('Variable Context', () => {
             name: 'DMZ Module',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 zone: 'dmz',
               },
             },
@@ -1073,7 +1050,7 @@ describe('Variable Context', () => {
             name: 'App Module',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 zone: 'app',
               },
             },
@@ -1103,7 +1080,7 @@ describe('Variable Context', () => {
             name: 'Secure Module',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 zone: 'secure',
               },
             },
@@ -1158,7 +1135,7 @@ describe('Variable Context', () => {
             name: 'Custom Network',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 zone: 'dmz',
               },
             },
@@ -1198,7 +1175,7 @@ describe('Variable Context', () => {
             name: 'VPS External',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 zone: 'external',
               },
             },
@@ -1228,7 +1205,7 @@ describe('Variable Context', () => {
             name: 'No Net Config',
             version: '1.0.0',
             requires: {
-              machine: {
+              system: {
                 zone: 'dmz',
               },
             },

package/src/variables/context.ts

@@ -14,7 +14,7 @@ import {
   systemSecrets,
 } from '../db/schema';
 import { allocateResources, getAllocation } from '../ipam/allocator';
-import { type ModuleManifest, getDeclaredSystems } from '../manifest/schema';
+import { type ModuleManifest, getDeclaredSystems, getSingularSystemSpec } from '../manifest/schema';
 import { decryptSecret } from '../secrets/encryption';
 import { getOrCreateMasterKey } from '../secrets/master-key';
 import { upsertModuleConfig } from '../services/module-config';
@@ -76,7 +76,7 @@ async function autoAssignFromWellKnown(
     const wellKnown = getWellKnownCapability(capability.name);
 
     // Determine current zone (from config or manifest)
-    const currentZone = selfConfig.zone || manifest.requires?.machine?.zone;
+    const currentZone = selfConfig.zone || getSingularSystemSpec(manifest)?.zone;
 
     // Auto-assign hostname if not already set
     if (!selfConfig.hostname) {
@@ -261,22 +261,22 @@ export async function buildResolutionContext(
   // Auto-apply VM resource defaults from manifest if not already configured
   if (module?.manifestData) {
     const manifest = module.manifestData as ModuleManifest;
-    const machineResources = manifest.requires?.machine;
+    const systemResources = getSingularSystemSpec(manifest);
 
-    if (machineResources) {
+    if (systemResources) {
       // Map manifest fields to module variable names and apply defaults
       const resourceMappings: Array<{
-        manifestKey: keyof typeof machineResources;
+        manifestKey: keyof typeof systemResources;
         configKey: string;
       }> = [
-        { manifestKey: 'cpu', configKey: 'cores' }, // manifest.requires.machine.cpu → cores variable
+        { manifestKey: 'cpu', configKey: 'cores' }, // manifest.requires.system.cpu → cores variable
         { manifestKey: 'memory', configKey: 'memory' },
         { manifestKey: 'disk', configKey: 'disk' },
         { manifestKey: 'storage', configKey: 'storage' },
       ];
 
       for (const { manifestKey, configKey } of resourceMappings) {
-        const value = machineResources[manifestKey];
+        const value = systemResources[manifestKey];
 
         // Manifest fields are typed (cpu: number, storage: string, etc.).
         // Pass them through unstringified so valueJson preserves the
@@ -374,15 +374,13 @@ export async function buildResolutionContext(
     }
   }
 
-  // Add machine requirements from manifest to selfConfig so templates can
-  // reference them via $self:requires.machine.<field>
+  // Add system requirements from manifest to selfConfig so templates can
+  // reference them via $self:requires.system.<field>.
   if (module?.manifestData) {
-    const manifest = module.manifestData as Record<string, unknown>;
-    const requires = manifest.requires as Record<string, unknown> | undefined;
-    if (requires?.machine) {
-      const machineRequires = requires.machine as Record<string, unknown>;
-      for (const [key, value] of Object.entries(machineRequires)) {
-        selfConfig[`requires.machine.${key}`] = String(value);
+    const systemSpec = getSingularSystemSpec(module.manifestData as ModuleManifest);
+    if (systemSpec) {
+      for (const [key, value] of Object.entries(systemSpec)) {
+        selfConfig[`requires.system.${key}`] = String(value);
       }
     }
   }
@@ -550,7 +548,7 @@ export async function buildResolutionContext(
   // Auto-derive network config from zone (gateway, vlan, subnet, bridge)
   if (module?.manifestData) {
     const manifest = module.manifestData as ModuleManifest;
-    const zone = selfConfig.zone || manifest.requires?.machine?.zone;
+    const zone = selfConfig.zone || getSingularSystemSpec(manifest)?.zone;
 
     // If zone from manifest but not in selfConfig, store it as first-class config
     if (zone && !selfConfig.zone) {

package/src/variables/lxc-nameserver.test.ts

@@ -24,7 +24,7 @@ describe('lxc_nameserver composition', () => {
         id: 'consumer',
         name: 'consumer',
         version: '1.0.0',
-        manifestData: { requires: { machine: { zone: 'app' } } },
+        manifestData: { requires: { system: { zone: 'app' } } },
         sourcePath: '/tmp/consumer',
       })
       .run();

package/tsconfig.json

@@ -16,6 +16,6 @@
       "@/*": ["./src/*"]
     }
   },
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "test-integration/**/*"],
   "exclude": ["node_modules"]
 }