pmcf 4.12.0 → 4.12.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.12.0",
+  "version": "4.12.2",
   "publishConfig": {
     "access": "public"
   },

package/src/services/bind.mjs

@@ -308,8 +308,7 @@ export class BindService extends ExtraSourceService {
       name: `named-zones-${name}`,
       description: `zone definitions for ${names}`,
       dependencies: ["mf-named"],
-      access: "private",
-      hooks: {}
+      access: "private"
     };
 
     yield this.generateZoneDefs(sources, packageData);
@@ -338,9 +337,7 @@ export class BindService extends ExtraSourceService {
 
     for (const source of sources) {
       for (const host of source.hosts()) {
-        configs.push(
-          ...this.outfacingZones(host, view, this.defaultRecords)
-        );
+        configs.push(...this.outfacingZones(host, view, this.defaultRecords));
       }
     }
 
@@ -348,9 +345,13 @@ export class BindService extends ExtraSourceService {
 
     if (outfacingZones.length) {
       if (this.hasCatalog) {
-        const { catalogZone, config } = this.createCatalogZone(location, view, location);
+        const { catalogZone, config } = this.createCatalogZone(
+          location,
+          view,
+          location
+        );
         configs.push(config);
-        outfacingZones.forEach(zone=>zone.catalogZone=catalogZone);
+        outfacingZones.forEach(zone => (zone.catalogZone = catalogZone));
       }
 
       addHook(
@@ -367,28 +368,6 @@ export class BindService extends ExtraSourceService {
     }
   }
 
-  createCatalogZone(name, view, location) {
-    const config = {
-      view,
-      name: `catalog.${name}.zone.conf`,
-      type: "master",
-      zones: []
-    };
-
-    const catalogZone = {
-      catalog: true,
-      id: `catalog.${name}`,
-      file: `${location}/catalog.${name}.zone`,
-      records: new Set([
-        ...this.defaultRecords,
-        DNSRecord(dnsFullName(`version.catalog.${name}`), "TXT", '"1"')
-      ])
-    };
-    config.zones.push(catalogZone);
-
-    return { config, catalogZone };
-  }
-
   async generateZoneDefs(sources, packageData) {
     const configs = [];
 
@@ -426,7 +405,11 @@ export class BindService extends ExtraSourceService {
         config.zones.push(zone);
 
         if (this.hasCatalog) {
-          const { catalogZone, config } = this.createCatalogZone(domain, view, locationName);
+          const { catalogZone, config } = this.createCatalogZone(
+            domain,
+            view,
+            locationName
+          );
           configs.push(config);
           zone.catalogZone = catalogZone;
         }
@@ -434,7 +417,7 @@ export class BindService extends ExtraSourceService {
         const hosts = new Set();
         const addresses = new Set();
 
-        for await (const {
+        for (const {
           address,
           subnet,
           networkInterface,
@@ -576,6 +559,28 @@ export class BindService extends ExtraSourceService {
     });
   }
 
+  createCatalogZone(name, view, directory) {
+    const config = {
+      view,
+      name: `catalog.${name}.zone.conf`,
+      type: "master",
+      zones: []
+    };
+
+    const catalogZone = {
+      catalog: true,
+      id: `catalog.${name}`,
+      file: `${directory}/catalog.${name}.zone`,
+      records: new Set([
+        ...this.defaultRecords,
+        DNSRecord(dnsFullName(`version.catalog.${name}`), "TXT", '"1"')
+      ])
+    };
+    config.zones.push(catalogZone);
+
+    return { config, catalogZone };
+  }
+
   get defaultRecords() {
     const nameService = this.findService('in("dns",types) && priority>=300');
 

package/types/services/bind.d.mts

@@ -1480,7 +1480,9 @@ export class BindService extends ExtraSourceService {
     get excludeInterfaceKinds(): Set<any>;
     preparePackages(dir: any): AsyncGenerator<any, void, unknown>;
     generateOutfacingDefs(sources: any, packageData: any, location: any): AsyncGenerator<any, void, unknown>;
-    createCatalogZone(name: any, view: any, location: any): {
+    generateZoneDefs(sources: any, packageData: any): Promise<any>;
+    outfacingZones(host: any, view: any, records: any): any;
+    createCatalogZone(name: any, view: any, directory: any): {
         config: {
             view: any;
             name: string;
@@ -1499,8 +1501,6 @@ export class BindService extends ExtraSourceService {
             }>;
         };
     };
-    generateZoneDefs(sources: any, packageData: any): Promise<any>;
-    outfacingZones(host: any, view: any, records: any): any;
     get defaultRecords(): {
         type: any;
         key: any;