pmcf 3.21.0 → 3.21.2

package/README.md

@@ -42,57 +42,59 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-1)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-1)
-    *   [findService](#findservice)
         *   [Parameters](#parameters-2)
-    *   [expand](#expand)
+    *   [findService](#findservice)
         *   [Parameters](#parameters-3)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-4)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-4)
+    *   [Parameters](#parameters-5)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-5)
+    *   [Parameters](#parameters-6)
     *   [port](#port-1)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-6)
+        *   [Parameters](#parameters-7)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-7)
+        *   [Parameters](#parameters-8)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-8)
+        *   [Parameters](#parameters-9)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-10)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-10)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-11)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-12)
 *   [isTemplate](#istemplate)
 *   [services](#services)
-    *   [Parameters](#parameters-12)
-*   [named](#named)
     *   [Parameters](#parameters-13)
-*   [serviceEndpoints](#serviceendpoints)
+*   [named](#named)
     *   [Parameters](#parameters-14)
-*   [domainName](#domainname)
+*   [serviceEndpoints](#serviceendpoints)
     *   [Parameters](#parameters-15)
-*   [domainFromDominName](#domainfromdominname)
+*   [domainName](#domainname)
     *   [Parameters](#parameters-16)
-*   [sectionLines](#sectionlines)
+*   [domainFromDominName](#domainfromdominname)
     *   [Parameters](#parameters-17)
-*   [asArray](#asarray)
+*   [sectionLines](#sectionlines)
     *   [Parameters](#parameters-18)
-*   [asIterator](#asiterator)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-19)
+*   [asIterator](#asiterator)
+    *   [Parameters](#parameters-20)
 
 ## Base
 
@@ -101,6 +103,16 @@ generates config packages for:
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### getProperties
+
+Retrive attribute values from an object.
+
+#### Parameters
+
+*   `filter`   (optional, default `filterPublic`)
+
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** values
+
 ### priority
 
 Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** 

package/bin/pmcf-package

@@ -42,12 +42,20 @@ const publishingDetails = createPublishingDetails(
 );
 
 for (const object of root.find(args)) {
+  if (object.isTemplate) {
+    continue;
+  }
   const stagingDir = join(options.output, object.fullName);
 
   //console.log(`packages for ${object.fullName}`);
   for await (const { sources, outputs, properties } of object.preparePackages(
     stagingDir
   )) {
+    console.log(
+      (object.fullName + "                ").substring(0, 20),
+      properties.name
+    );
+
     for (const outputFactory of outputs) {
       properties.version = pkg.version;
       properties.license = pkg.license;
@@ -66,9 +74,9 @@ for (const object of root.find(args)) {
         options
       );
 
-      if (properties.verbose) {
-        console.log(artifact);
-      }
+      // if (properties.verbose) {
+      console.log(" -> " + artifact);
+      // }
 
       if (!options.dry) {
         await Promise.all(

package/package.json

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

package/src/cluster.mjs

@@ -80,8 +80,8 @@ export class Cluster extends Host {
       new Set()
     )) {
       const host = ni.host;
-      const name = `keepalived-${host.location.name}-${host.name}`;
-      const packageStagingDir = join(stagingDir, name);
+
+      const packageStagingDir = join(stagingDir, host.name);
       const result = {
         sources: [
           new FileContentProvider(packageStagingDir + "/")[
@@ -90,7 +90,7 @@ export class Cluster extends Host {
         ],
         outputs: host.outputs,
         properties: {
-          name,
+          name: `keepalived-${host.location.name}-${host.name}`,
           description: `${this.typeName} definitions for ${this.fullName}`,
           access: "private",
           dependencies: ["keepalived>=2.3.4"]

package/src/host.mjs

@@ -119,15 +119,12 @@ export class Host extends ServiceOwner {
   _applyExtends(host) {
     super._applyExtends(host);
     for (const [name, ni] of host.networkInterfaces) {
-      if (!ni.isTemplate) {
-        let present = this._networkInterfaces.get(name);
-
-        if (!present) {
-          present = ni.forOwner(this);
-          this._networkInterfaces.set(name, present);
-        }
+      const present = this._networkInterfaces.get(name);
 
+      if (present) {
         present.extends.push(ni);
+      } else {
+        this._networkInterfaces.set(name, ni.forOwner(this));
       }
     }
   }

package/src/services/chrony.mjs

@@ -63,19 +63,16 @@ export class ChronyService extends ExtraSourceService {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
 
-    console.log("chrony", host.name, network.name);
-
     const packageData = {
       dir,
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `chrony-${this.location.name}-${host.name}`,
-        description: `chrony definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["chrony>=4.6.1"]
       }

package/src/services/influxdb.mjs

@@ -50,7 +50,6 @@ export class InfluxdbService extends Service {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
 
@@ -59,8 +58,8 @@ export class InfluxdbService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `influxdb-${this.location.name}-${host.name}`,
-        description: `influxdb definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["influxdb>=2.7.0"]
       }

package/src/services/kea.mjs

@@ -152,9 +152,6 @@ export class KeaService extends Service {
     const network = this.network;
     const host = this.host;
     const name = host.name;
-    const pkgName = `kea-${this.location.name}-${name}`;
-
-    console.log(pkgName, this.fullName, network.name);
 
     const dnsServerEndpoints = serviceEndpoints(network, {
       services: 'in("dns",types) && priority>=300',
@@ -166,8 +163,8 @@ export class KeaService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: pkgName,
-        description: `kea definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: [`kea>=${keaVersion}`]
       }

package/src/services/mosquitto.mjs

@@ -41,7 +41,6 @@ export class MosquittoService extends Service {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
 
@@ -50,8 +49,8 @@ export class MosquittoService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `mosquitto-${this.location.name}-${host.name}`,
-        description: `mosquitto definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${host.name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["mosquitto>=2.0.22"]
       }

package/src/services/openldap.mjs

@@ -79,21 +79,11 @@ export class OpenLDAPService extends Service {
   }
 
   async *preparePackages(dir) {
-    const network = this.network;
     const host = this.host;
     const name = host.name;
-    const pkgName = `openldap-${this.location.name}-${name}`;
     const owner = "ldap";
     const group = "ldap";
 
-    console.log(
-      pkgName,
-      this.fullName,
-      this.alias,
-      network.name,
-      this.extends.map(o => o.fullName)
-    );
-
     const packageData = {
       dir,
       sources: [
@@ -113,8 +103,8 @@ export class OpenLDAPService extends Service {
       ],
       outputs: this.outputs,
       properties: {
-        name: pkgName,
-        description: `openldap definitions for ${this.fullName}@${name}`,
+        name: `${this.typeName}-${this.location.name}-${name}`,
+        description: `${this.typeName} definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["openldap>=2.6.10"],
         hooks: {}