pmcf 6.70.2 → 6.71.1

package/README.md

@@ -78,31 +78,31 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-14)
 *   [Interface](#interface)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-15)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-15)
+        *   [Parameters](#parameters-16)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [priority](#priority-1)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-18)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-18)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-19)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-20)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-20)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [subnetForAddress](#subnetforaddress)
@@ -291,6 +291,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends Interface**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## Interface
 
 **Extends ServiceOwner**
@@ -388,18 +400,6 @@ 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 Interface**
-
-### 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.70.2",
+  "version": "6.71.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.11",
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
-    "npm-pkgbuild": "^22.2.20",
+    "npm-pkgbuild": "^22.2.21",
     "pacc": "^14.4.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"

package/src/host.mjs

@@ -137,8 +137,8 @@ export class host extends ServiceOwner {
     return new AggregatedMap([
       this._services,
       ...[...this.networkInterfaces.values()]
-        .filter(ni => ni.ownServices.size > 0)
-        .map(ni => ni.ownServices)
+        .filter(ni => ni._services.size > 0)
+        .map(ni => ni._services)
     ]);
   }
 

package/src/owner.mjs

@@ -1,5 +1,4 @@
 import { normalizeCIDR, familyIP, FAMILY_IPV4 } from "ip-utilties";
-import { FileContentProvider } from "npm-pkgbuild";
 import { AggregatedMap } from "aggregated-map";
 import { FilteredMap } from "filtered-map";
 import {
@@ -20,7 +19,6 @@ import {
   networkInterfaces_attribute
 } from "./common-attributes.mjs";
 import { addType, assign } from "./type.mjs";
-import { loadHooks } from "./hooks.mjs";
 
 export class owner extends ServiceOwner {
   static priority = 2;
@@ -251,31 +249,4 @@ export class owner extends ServiceOwner {
 
     return architectures;
   }
-
-  async *preparePackages(dir) {
-    const packageData = {
-      sources: [
-        new FileContentProvider(dir + "/"),
-        new FileContentProvider(
-          { dir: this.directory, pattern: "location.json" },
-          { destination: "/etc/location/location.json" }
-        )
-      ],
-      outputs: this.outputs,
-      properties: {
-        name: `${this.typeName}-${this.name}`,
-        description: `${this.typeName} definitions for ${this.fullName}`,
-        access: "private",
-        dependencies: { jq: ">=1.6" },
-        provides: ["location"]
-      }
-    };
-
-    await loadHooks(
-      packageData,
-      new URL("location.install", import.meta.url).pathname
-    );
-
-    yield packageData;
-  }
 }

package/src/service-owner.mjs

@@ -19,8 +19,4 @@ export class ServiceOwner extends base {
   get services() {
     return this._services;
   }
-
-  get ownServices() {
-    return this._services;
-  }
 }

package/src/services/influxdb.mjs

@@ -1,6 +1,10 @@
 import { join } from "node:path";
 import { stringify } from "yaml";
-import { boolean_attribute_writable_true, extract } from "pacc";
+import {
+  boolean_attribute_writable_true,
+  boolean_attribute_writable_false,
+  extract
+} from "pacc";
 import { CoreService, addType } from "pmcf";
 import { writeLines } from "../utils.mjs";
 import { FAMILY_DNS_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
@@ -10,10 +14,15 @@ const SCOPE_INFLUXDB = "influxdb";
 
 export class influxdb extends CoreService {
   static attributes = {
-    metricsDisabled: {
+    "metrics-disabled": {
       ...boolean_attribute_writable_true,
-      name: "metricsDisabled",
-      externalName: "metrics-disabled",
+      name: "metrics-disabled",
+      scope: SCOPE_INFLUXDB,
+      sources: SOURCES_THIS_EXTENDS
+    },
+    "use-hashed-tokens": {
+      ...boolean_attribute_writable_false,
+      name: "use-hashed-tokens",
       scope: SCOPE_INFLUXDB,
       sources: SOURCES_THIS_EXTENDS
     }