pmcf 6.27.1 → 6.27.3

package/README.md

@@ -75,34 +75,33 @@ generates config packages for:
 *   [HTTPEndpoint](#httpendpoint)
     *   [Parameters](#parameters-13)
     *   [port](#port-1)
-*   [id](#id)
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [type](#type)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-17)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-19)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-20)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -285,10 +284,6 @@ Endpoint based on http
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 
 
-## id
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
 ## domainNames
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
@@ -301,18 +296,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -409,6 +392,18 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/bin/pmcf-info

@@ -96,16 +96,20 @@ function show(value, indent = 0, options = { short: false, maxDepth: 5 }) {
               }
             }
           } else {
-            const l = [...v];
+            try {
+              const l = [...v];
 
-            if (l.length > 1) {
-              console.log(name(attribute));
+              if (l.length > 1) {
+                console.log(name(attribute));
 
-              for (const o of l) {
-                console.log(prefix(indent + 2) + o.fullName);
+                for (const o of l) {
+                  console.log(prefix(indent + 2) + o.fullName);
+                }
+              } else if (l.length === 1) {
+                console.log(name(attribute) + l[0].fullName);
               }
-            } else if (l.length === 1) {
-              console.log(name(attribute) + l[0].fullName);
+            } catch (e) {
+              console.log(name(attribute), v);
             }
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.27.1",
+  "version": "6.27.3",
   "publishConfig": {
     "access": "public"
   },
@@ -53,8 +53,8 @@
     "aggregated-map": "^1.0.10",
     "content-entry-transform": "^1.7.0",
     "ip-utilties": "^3.12.0",
-    "npm-pkgbuild": "^20.8.13",
-    "pacc": "^11.2.0",
+    "npm-pkgbuild": "^20.8.14",
+    "pacc": "^11.2.1",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/host.mjs

@@ -40,7 +40,7 @@ export class Host extends ServiceOwner {
       name: "os",
       values: new Set(["osx", "windows", "linux"])
     },
-    "machine-id": { ...string_attribute_writable, name: "machine-id" },
+    id: { ...string_attribute_writable, name: "id" },
     distribution: { ...string_attribute_writable, name: "distribution" },
     deployment: {
       ...string_attribute_writable,
@@ -136,13 +136,6 @@ export class Host extends ServiceOwner {
     return this.attribute("_vendor");
   }
 
-  /**
-   * @return {string}
-   */
-  get id() {
-    return this["machine-id"];
-  }
-
   set keymap(value) {
     this._keymap = value;
   }

package/src/network-interfaces/skeleton.mjs

@@ -42,7 +42,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
 
   get services() {
     return this.owner
-      ? new AggregatedMap([super.services, this.owner.services])
+      ? new AggregatedMap([super.services, this.owner._services])
       : super.services;
   }
 

package/src/services/bind.mjs

@@ -198,7 +198,8 @@ class bind_group extends Base {
       type: bindNetworkAddressTypes,
       name: "access",
       collection: true,
-      writable: true
+      writable: true,
+      deferredExpression: true
     },
     entries: {
       ...default_collection_attribute_writable,
@@ -273,7 +274,6 @@ class bind_group extends Base {
   }
 
   foreignDomains = new Set();
-  access = [];
   allowedUpdates = [];
   notify = true;
   hasCatalog = true;
@@ -369,6 +369,10 @@ class bind_group extends Base {
         const address = na.address;
         const host = na.host;
 
+        if (host === undefined) {
+          console.log("NO HOST", na);
+        }
+
         if (!addresses.has(address)) {
           addresses.add(address);