From 7494468bedbfc719b5ed9ac92de059e20a1f6a5b Mon Sep 17 00:00:00 2001 From: David Allen Date: Mon, 8 Jul 2024 16:08:28 -0600 Subject: [PATCH] Upated plugin implementations return type --- Makefile | 1 + internal/generator/plugins/conman/conman.go | 6 +----- internal/generator/plugins/coredhcp/coredhcp.go | 3 ++- internal/generator/plugins/dnsmasq/dnsmasq.go | 2 +- internal/generator/plugins/example/example.go | 2 ++ internal/generator/plugins/hostfile/hostfile.go | 3 ++- internal/generator/plugins/powerman/powerman.go | 3 ++- internal/generator/plugins/syslog/syslog.go | 3 ++- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 84b094c..6b5d2ef 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ plugins: go build -buildmode=plugin -o lib/coredhcp.so internal/generator/plugins/coredhcp/coredhcp.go go build -buildmode=plugin -o lib/dhcpd.so internal/generator/plugins/dhcpd/dhcpd.go go build -buildmode=plugin -o lib/dnsmasq.so internal/generator/plugins/dnsmasq/dnsmasq.go + go build -buildmode=plugin -o lib/example.so internal/generator/plugins/example/example.go go build -buildmode=plugin -o lib/hostfile.so internal/generator/plugins/hostfile/hostfile.go go build -buildmode=plugin -o lib/powerman.so internal/generator/plugins/powerman/powerman.go go build -buildmode=plugin -o lib/syslog.so internal/generator/plugins/syslog/syslog.go diff --git a/internal/generator/plugins/conman/conman.go b/internal/generator/plugins/conman/conman.go index c83d26a..f5d629f 100644 --- a/internal/generator/plugins/conman/conman.go +++ b/internal/generator/plugins/conman/conman.go @@ -22,11 +22,7 @@ func (g *Conman) GetDescription() string { return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) } -func (g *Conman) GetGroups() []string { - return []string{""} -} - -func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) { +func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) { var ( params = generator.GetParams(opts...) client = generator.GetClient(params) diff --git a/internal/generator/plugins/coredhcp/coredhcp.go b/internal/generator/plugins/coredhcp/coredhcp.go index 9b76227..68d00c8 100644 --- a/internal/generator/plugins/coredhcp/coredhcp.go +++ b/internal/generator/plugins/coredhcp/coredhcp.go @@ -4,6 +4,7 @@ import ( "fmt" configurator "github.com/OpenCHAMI/configurator/internal" + "github.com/OpenCHAMI/configurator/internal/generator" "github.com/OpenCHAMI/configurator/internal/util" ) @@ -21,7 +22,7 @@ func (g *CoreDhcp) GetDescription() string { return fmt.Sprintf("Configurator generator plugin for '%s' to generate config files. This plugin is not complete and still a WIP.", g.GetName()) } -func (g *CoreDhcp) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) { +func (g *CoreDhcp) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) { return nil, fmt.Errorf("plugin does not implement generation function") } diff --git a/internal/generator/plugins/dnsmasq/dnsmasq.go b/internal/generator/plugins/dnsmasq/dnsmasq.go index 0b13bf5..3605e52 100644 --- a/internal/generator/plugins/dnsmasq/dnsmasq.go +++ b/internal/generator/plugins/dnsmasq/dnsmasq.go @@ -23,7 +23,7 @@ func (g *DnsMasq) GetDescription() string { return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) } -func (g *DnsMasq) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) { +func (g *DnsMasq) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) { // make sure we have a valid config first if config == nil { return nil, fmt.Errorf("invalid config (config is nil)") diff --git a/internal/generator/plugins/example/example.go b/internal/generator/plugins/example/example.go index 044bcf7..f82a72d 100644 --- a/internal/generator/plugins/example/example.go +++ b/internal/generator/plugins/example/example.go @@ -30,3 +30,5 @@ func (g *Example) Generate(config *configurator.Config, opts ...util.Option) (ge information about constructing plugins and plugin requirements.` return generator.Files{"example": []byte(g.Message)}, nil } + +var Generator Example diff --git a/internal/generator/plugins/hostfile/hostfile.go b/internal/generator/plugins/hostfile/hostfile.go index 9c66f3a..4f40f0e 100644 --- a/internal/generator/plugins/hostfile/hostfile.go +++ b/internal/generator/plugins/hostfile/hostfile.go @@ -4,6 +4,7 @@ import ( "fmt" configurator "github.com/OpenCHAMI/configurator/internal" + "github.com/OpenCHAMI/configurator/internal/generator" "github.com/OpenCHAMI/configurator/internal/util" ) @@ -21,7 +22,7 @@ func (g *Hostfile) GetDescription() string { return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) } -func (g *Hostfile) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) { +func (g *Hostfile) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) { return nil, fmt.Errorf("plugin does not implement generation function") } diff --git a/internal/generator/plugins/powerman/powerman.go b/internal/generator/plugins/powerman/powerman.go index 9f68dd7..45f4000 100644 --- a/internal/generator/plugins/powerman/powerman.go +++ b/internal/generator/plugins/powerman/powerman.go @@ -4,6 +4,7 @@ import ( "fmt" configurator "github.com/OpenCHAMI/configurator/internal" + "github.com/OpenCHAMI/configurator/internal/generator" "github.com/OpenCHAMI/configurator/internal/util" ) @@ -21,7 +22,7 @@ func (g *Powerman) GetDescription() string { return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) } -func (g *Powerman) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) { +func (g *Powerman) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) { return nil, fmt.Errorf("plugin does not implement generation function") } diff --git a/internal/generator/plugins/syslog/syslog.go b/internal/generator/plugins/syslog/syslog.go index f9caf40..c3250cb 100644 --- a/internal/generator/plugins/syslog/syslog.go +++ b/internal/generator/plugins/syslog/syslog.go @@ -4,6 +4,7 @@ import ( "fmt" configurator "github.com/OpenCHAMI/configurator/internal" + "github.com/OpenCHAMI/configurator/internal/generator" "github.com/OpenCHAMI/configurator/internal/util" ) @@ -21,7 +22,7 @@ func (g *Syslog) GetDescription() string { return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) } -func (g *Syslog) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) { +func (g *Syslog) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) { return nil, fmt.Errorf("plugin does not implement generation function") }