pmcf 6.61.3 → 6.61.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.61.3",
+  "version": "6.61.5",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
     "filtered-map": "^1.0.0",
     "ip-utilties": "^3.13.1",
     "npm-pkgbuild": "^22.2.7",
-    "pacc": "^11.17.1",
+    "pacc": "^11.17.2",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/common-attributes.mjs

@@ -70,6 +70,13 @@ export const owners_attribute = {
   backpointer: owner_attribute
 };
 
+export const services_attribute = {
+  ...default_collection_attribute_writable,
+  name: "services",
+  type: "service",
+  backpointer: owner_attribute
+};
+
 export const cluster_attribute = {
   ...default_attribute_writable,
   name: "cluster",

package/src/owner.mjs

@@ -71,10 +71,6 @@ export class owner extends ServiceOwner {
     );
   }
 
-  set hosts(value) {
-    this._hosts = value;
-  }
-
   get clusters() {
     return new FilteredMap(this.hosts, host => host.isCluster);
   }
@@ -85,10 +81,6 @@ export class owner extends ServiceOwner {
     );
   }
 
-  set networks(value) {
-    this._networks = value;
-  }
-
   get services() {
     return new AggregatedMap(
       [this, ...this.hosts.values()].map(host => host._services)

package/src/service-owner.mjs

@@ -1,18 +1,13 @@
-import { default_collection_attribute_writable } from "pacc";
-import { base, addType } from "pmcf";
-import { owner_attribute } from "./common-attributes.mjs";
+import { base } from "./base.mjs";
+import { addType } from "./type.mjs";
+import { services_attribute } from "./common-attributes.mjs";
 
 export class ServiceOwner extends base {
   static name = "service-owner";
   static priority = 1.9;
   static owners = ["owner", "site", "network", "root"];
   static attributes = {
-    services: {
-      ...default_collection_attribute_writable,
-      name: "services",
-      type: "service",
-      backpointer: owner_attribute
-    }
+    services: services_attribute
   };
 
   static {
@@ -21,10 +16,6 @@ export class ServiceOwner extends base {
 
   _services = new Map();
 
-  set services(value) {
-    this._services = value;
-  }
-
   get services() {
     return this._services;
   }

package/src/service-types.mjs

@@ -360,19 +360,19 @@ export function serviceTypes(type) {
  */
 export function serviceTypeEndpoints(type, bundeledToo) {
   if (type) {
-    const aggregator = (acc, type) => {
-      acc.push(...serviceTypeEndpoints(type, bundeledToo));
-      return acc;
+    const aggregator = (result, type) => {
+      result.push(...serviceTypeEndpoints(type, bundeledToo));
+      return result;
     };
 
     return type.extends.reduce(
       aggregator,
       type.endpoints.reduce(
-        (acc, ep) => {
-          for (const family of asArray(ep.family)) {
-            acc.push({ ...ep, family });
+        (result, endpoint) => {
+          for (const family of asArray(endpoint.family)) {
+            result.push({ ...endpoint, family });
           }
-          return acc;
+          return result;
         },
         bundeledToo ? type.services.reduce(aggregator, []) : []
       )

package/src/services/kea.mjs

@@ -377,7 +377,7 @@ export class kea extends CoreService {
             algorithm: key.algorithm,
             "secret-file": systemdCredentialFileName(
               "kea-dhcp-ddns.service",
-              `key.${key.name}.tsig`
+              `kea.${key.name}.tsig`
             )
           };
         }),