towk/makeshift
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Upated plugin implementations return type

Browse source
This commit is contained in:
David Allen 2024-07-08 16:08:28 -06:00
parent 871776ca84
commit 7494468bed
No known key found for this signature in database
GPG key ID: 717C593FF60A2ACC
8 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -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/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/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/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/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/powerman.so internal/generator/plugins/powerman/powerman.go
go build -buildmode=plugin -o lib/syslog.so internal/generator/plugins/syslog/syslog.go go build -buildmode=plugin -o lib/syslog.so internal/generator/plugins/syslog/syslog.go

6
internal/generator/plugins/conman/conman.go
View file

@ -22,11 +22,7 @@ func (g *Conman) GetDescription() string {
return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName())
} }
func (g *Conman) GetGroups() []string { func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (generator.Files, error) {
return []string{""}
}
func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (map[string][]byte, error) {
var ( var (
params = generator.GetParams(opts...) params = generator.GetParams(opts...)
client = generator.GetClient(params) client = generator.GetClient(params)

3
internal/generator/plugins/coredhcp/coredhcp.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/internal" configurator "github.com/OpenCHAMI/configurator/internal"
"github.com/OpenCHAMI/configurator/internal/generator"
"github.com/OpenCHAMI/configurator/internal/util" "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()) 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") return nil, fmt.Errorf("plugin does not implement generation function")
} }

2
internal/generator/plugins/dnsmasq/dnsmasq.go
View file

@ -23,7 +23,7 @@ func (g *DnsMasq) GetDescription() string {
return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) 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 // make sure we have a valid config first
if config == nil { if config == nil {
return nil, fmt.Errorf("invalid config (config is nil)") return nil, fmt.Errorf("invalid config (config is nil)")

2
internal/generator/plugins/example/example.go
View file

@ -30,3 +30,5 @@ func (g *Example) Generate(config *configurator.Config, opts ...util.Option) (ge
information about constructing plugins and plugin requirements.` information about constructing plugins and plugin requirements.`
return generator.Files{"example": []byte(g.Message)}, nil return generator.Files{"example": []byte(g.Message)}, nil
} }
var Generator Example

3
internal/generator/plugins/hostfile/hostfile.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/internal" configurator "github.com/OpenCHAMI/configurator/internal"
"github.com/OpenCHAMI/configurator/internal/generator"
"github.com/OpenCHAMI/configurator/internal/util" "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()) 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") return nil, fmt.Errorf("plugin does not implement generation function")
} }

3
internal/generator/plugins/powerman/powerman.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/internal" configurator "github.com/OpenCHAMI/configurator/internal"
"github.com/OpenCHAMI/configurator/internal/generator"
"github.com/OpenCHAMI/configurator/internal/util" "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()) 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") return nil, fmt.Errorf("plugin does not implement generation function")
} }

3
internal/generator/plugins/syslog/syslog.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/internal" configurator "github.com/OpenCHAMI/configurator/internal"
"github.com/OpenCHAMI/configurator/internal/generator"
"github.com/OpenCHAMI/configurator/internal/util" "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()) 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") return nil, fmt.Errorf("plugin does not implement generation function")
} }