From f8f76342ac19a6ca3cb00c6b65e39d524bcb207e Mon Sep 17 00:00:00 2001
From: David Allen <allend@lanl.gov>
Date: Wed, 3 Jul 2024 12:48:39 -0600
Subject: [PATCH] Updated generator plugins

---
 internal/generator/plugins/conman/conman.go   | 7 +++++--
 internal/generator/plugins/dhcpd/dhcpd.go     | 7 +++++--
 internal/generator/plugins/dnsmasq/dnsmasq.go | 6 ++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/internal/generator/plugins/conman/conman.go b/internal/generator/plugins/conman/conman.go
index 4fcef2c..c83d26a 100644
--- a/internal/generator/plugins/conman/conman.go
+++ b/internal/generator/plugins/conman/conman.go
@@ -61,8 +61,11 @@ func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (map
 
 	// apply template substitutions and return output as byte array
 	return generator.ApplyTemplates(generator.Mappings{
-		"server_opts": "",
-		"global_opts": "",
+		"plugin_name":        g.GetName(),
+		"plugin_version":     g.GetVersion(),
+		"plugin_description": g.GetDescription(),
+		"server_opts":        "",
+		"global_opts":        "",
 	}, target.Templates...)
 }
 
diff --git a/internal/generator/plugins/dhcpd/dhcpd.go b/internal/generator/plugins/dhcpd/dhcpd.go
index a56732e..1990abc 100644
--- a/internal/generator/plugins/dhcpd/dhcpd.go
+++ b/internal/generator/plugins/dhcpd/dhcpd.go
@@ -65,8 +65,11 @@ func (g *Dhcpd) Generate(config *configurator.Config, opts ...util.Option) (gene
 		}
 	}
 	return generator.ApplyTemplates(generator.Mappings{
-		"compute_nodes": compute_nodes,
-		"node_entries":  "",
+		"plugin_name":        g.GetName(),
+		"plugin_version":     g.GetVersion(),
+		"plugin_description": g.GetDescription(),
+		"compute_nodes":      compute_nodes,
+		"node_entries":       "",
 	}, target.Templates...)
 }
 
diff --git a/internal/generator/plugins/dnsmasq/dnsmasq.go b/internal/generator/plugins/dnsmasq/dnsmasq.go
index b1b71a7..0b13bf5 100644
--- a/internal/generator/plugins/dnsmasq/dnsmasq.go
+++ b/internal/generator/plugins/dnsmasq/dnsmasq.go
@@ -75,8 +75,10 @@ func (g *DnsMasq) Generate(config *configurator.Config, opts ...util.Option) (ma
 
 	// apply template substitutions and return output as byte array
 	return generator.ApplyTemplates(generator.Mappings{
-		"name":   g.GetName(),
-		"output": output,
+		"plugin_name":        g.GetName(),
+		"plugin_version":     g.GetVersion(),
+		"plugin_description": g.GetDescription(),
+		"dhcp-hosts":         output,
 	}, target.Templates...)
 }