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

plugin: moved default plugins to compile into executable

Browse source
This commit is contained in:
David Allen 2024-11-13 17:40:12 -07:00
parent 9328d2a7a1
commit 34845f6a5c
Signed by: towk
GPG key ID: 793B2924A49B3A3F
9 changed files with 45 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/generator/plugins/conman/conman.go → pkg/generator/conman.go
View file

@ -1,10 +1,9 @@
package main package generator
import ( import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
@ -22,10 +21,10 @@ 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) Generate(config *configurator.Config, opts ...util.Option) (generator.FileMap, error) { func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
var ( var (
params = generator.GetParams(opts...) params = GetParams(opts...)
client = generator.GetClient(params) client = GetClient(params)
targetKey = params["target"].(string) // required param targetKey = params["target"].(string) // required param
target = config.Targets[targetKey] target = config.Targets[targetKey]
eps []configurator.RedfishEndpoint = nil eps []configurator.RedfishEndpoint = nil
@ -56,7 +55,7 @@ func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (gen
consoles += "# =====================================================================" consoles += "# ====================================================================="
// apply template substitutions and return output as byte array // apply template substitutions and return output as byte array
return generator.ApplyTemplateFromFiles(generator.Mappings{ return ApplyTemplateFromFiles(Mappings{
"plugin_name": g.GetName(), "plugin_name": g.GetName(),
"plugin_version": g.GetVersion(), "plugin_version": g.GetVersion(),
"plugin_description": g.GetDescription(), "plugin_description": g.GetDescription(),
@ -65,5 +64,3 @@ func (g *Conman) Generate(config *configurator.Config, opts ...util.Option) (gen
"consoles": consoles, "consoles": consoles,
}, target.TemplatePaths...) }, target.TemplatePaths...)
} }
var Generator Conman

10
pkg/generator/plugins/coredhcp/coredhcp.go → pkg/generator/coredhcp.go
View file

@ -1,10 +1,12 @@
package main //go:build coredhcp || plugins
// +build coredhcp plugins
package generator
import ( import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
@ -22,8 +24,6 @@ func (g *CoreDhcp) GetDescription() string {
return fmt.Sprintf("Configurator generator plugin for '%s' to generate config files. (WIP)", g.GetName()) return fmt.Sprintf("Configurator generator plugin for '%s' to generate config files. (WIP)", g.GetName())
} }
func (g *CoreDhcp) Generate(config *configurator.Config, opts ...util.Option) (generator.FileMap, error) { func (g *CoreDhcp) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
return nil, fmt.Errorf("plugin does not implement generation function") return nil, fmt.Errorf("plugin does not implement generation function")
} }
var Generator CoreDhcp

21
pkg/generator/plugins/dhcpd/dhcpd.go → pkg/generator/dhcpd.go
View file

@ -1,31 +1,30 @@
package main package generator
import ( import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
type Dhcpd struct{} type DHCPd struct{}
func (g *Dhcpd) GetName() string { func (g *DHCPd) GetName() string {
return "dhcpd" return "dhcpd"
} }
func (g *Dhcpd) GetVersion() string { func (g *DHCPd) GetVersion() string {
return util.GitCommit() return util.GitCommit()
} }
func (g *Dhcpd) GetDescription() string { func (g *DHCPd) GetDescription() string {
return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName()) return fmt.Sprintf("Configurator generator plugin for '%s'.", g.GetName())
} }
func (g *Dhcpd) Generate(config *configurator.Config, opts ...util.Option) (generator.FileMap, error) { func (g *DHCPd) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
var ( var (
params = generator.GetParams(opts...) params = GetParams(opts...)
client = generator.GetClient(params) client = GetClient(params)
targetKey = params["target"].(string) targetKey = params["target"].(string)
target = config.Targets[targetKey] target = config.Targets[targetKey]
compute_nodes = "" compute_nodes = ""
@ -64,7 +63,7 @@ func (g *Dhcpd) Generate(config *configurator.Config, opts ...util.Option) (gene
fmt.Printf("") fmt.Printf("")
} }
} }
return generator.ApplyTemplateFromFiles(generator.Mappings{ return ApplyTemplateFromFiles(Mappings{
"plugin_name": g.GetName(), "plugin_name": g.GetName(),
"plugin_version": g.GetVersion(), "plugin_version": g.GetVersion(),
"plugin_description": g.GetDescription(), "plugin_description": g.GetDescription(),
@ -72,5 +71,3 @@ func (g *Dhcpd) Generate(config *configurator.Config, opts ...util.Option) (gene
"node_entries": "", "node_entries": "",
}, target.TemplatePaths...) }, target.TemplatePaths...)
} }
var Generator Dhcpd

21
pkg/generator/plugins/dnsmasq/dnsmasq.go → pkg/generator/dnsmasq.go
View file

@ -1,29 +1,28 @@
package main package generator
import ( import (
"fmt" "fmt"
"strings" "strings"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
type DnsMasq struct{} type DNSMasq struct{}
func (g *DnsMasq) GetName() string { func (g *DNSMasq) GetName() string {
return "dnsmasq" return "dnsmasq"
} }
func (g *DnsMasq) GetVersion() string { func (g *DNSMasq) GetVersion() string {
return util.GitCommit() return util.GitCommit()
} }
func (g *DnsMasq) GetDescription() string { 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) (generator.FileMap, error) { func (g *DNSMasq) Generate(config *configurator.Config, opts ...util.Option) (FileMap, 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)")
@ -31,8 +30,8 @@ func (g *DnsMasq) Generate(config *configurator.Config, opts ...util.Option) (ge
// set all the defaults for variables // set all the defaults for variables
var ( var (
params = generator.GetParams(opts...) params = GetParams(opts...)
client = generator.GetClient(params) client = GetClient(params)
targetKey = params["target"].(string) // required param targetKey = params["target"].(string) // required param
target = config.Targets[targetKey] target = config.Targets[targetKey]
eths []configurator.EthernetInterface = nil eths []configurator.EthernetInterface = nil
@ -74,12 +73,10 @@ func (g *DnsMasq) Generate(config *configurator.Config, opts ...util.Option) (ge
output += "# =====================================================================" output += "# ====================================================================="
// apply template substitutions and return output as byte array // apply template substitutions and return output as byte array
return generator.ApplyTemplateFromFiles(generator.Mappings{ return ApplyTemplateFromFiles(Mappings{
"plugin_name": g.GetName(), "plugin_name": g.GetName(),
"plugin_version": g.GetVersion(), "plugin_version": g.GetVersion(),
"plugin_description": g.GetDescription(), "plugin_description": g.GetDescription(),
"dhcp-hosts": output, "dhcp-hosts": output,
}, target.TemplatePaths...) }, target.TemplatePaths...)
} }
var Generator DnsMasq

5
pkg/generator/plugins/example/example.go → pkg/generator/example.go
View file

@ -1,4 +1,7 @@
package main //go:build example || plugins
// +build example plugins
package generator
import ( import (
"fmt" "fmt"

7
pkg/generator/plugins/hostfile/hostfile.go → pkg/generator/hostfile.go
View file

@ -1,10 +1,9 @@
package main package generator
import ( import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
@ -22,8 +21,6 @@ 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) (generator.FileMap, error) { func (g *Hostfile) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
return nil, fmt.Errorf("plugin does not implement generation function") return nil, fmt.Errorf("plugin does not implement generation function")
} }
var Generator Hostfile

7
pkg/generator/plugins/powerman/powerman.go → pkg/generator/powerman.go
View file

@ -1,10 +1,9 @@
package main package generator
import ( import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
@ -22,8 +21,6 @@ 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) (generator.FileMap, error) { func (g *Powerman) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
return nil, fmt.Errorf("plugin does not implement generation function") return nil, fmt.Errorf("plugin does not implement generation function")
} }
var Generator Powerman

7
pkg/generator/plugins/syslog/syslog.go → pkg/generator/syslog.go
View file

@ -1,10 +1,9 @@
package main package generator
import ( import (
"fmt" "fmt"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
@ -22,8 +21,6 @@ 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) (generator.FileMap, error) { func (g *Syslog) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
return nil, fmt.Errorf("plugin does not implement generation function") return nil, fmt.Errorf("plugin does not implement generation function")
} }
var Generator Syslog

17
pkg/generator/plugins/warewulf/warewulf.go → pkg/generator/warewulf.go
View file

@ -1,4 +1,4 @@
package main package generator
import ( import (
"fmt" "fmt"
@ -6,7 +6,6 @@ import (
"strings" "strings"
configurator "github.com/OpenCHAMI/configurator/pkg" configurator "github.com/OpenCHAMI/configurator/pkg"
"github.com/OpenCHAMI/configurator/pkg/generator"
"github.com/OpenCHAMI/configurator/pkg/util" "github.com/OpenCHAMI/configurator/pkg/util"
) )
@ -24,13 +23,13 @@ func (g *Warewulf) GetDescription() string {
return "Configurator generator plugin for 'warewulf' config files." return "Configurator generator plugin for 'warewulf' config files."
} }
func (g *Warewulf) Generate(config *configurator.Config, opts ...util.Option) (generator.FileMap, error) { func (g *Warewulf) Generate(config *configurator.Config, opts ...util.Option) (FileMap, error) {
var ( var (
params = generator.GetParams(opts...) params = GetParams(opts...)
client = generator.GetClient(params) client = GetClient(params)
targetKey = params["target"].(string) targetKey = params["target"].(string)
target = config.Targets[targetKey] target = config.Targets[targetKey]
outputs = make(generator.FileMap, len(target.FilePaths)+len(target.TemplatePaths)) outputs = make(FileMap, len(target.FilePaths)+len(target.TemplatePaths))
) )
// check if our client is included and is valid // check if our client is included and is valid
@ -72,11 +71,11 @@ func (g *Warewulf) Generate(config *configurator.Config, opts ...util.Option) (g
nodeEntries := "" nodeEntries := ""
// load files and templates and copy to outputs // load files and templates and copy to outputs
files, err := generator.LoadFiles(target.FilePaths...) files, err := LoadFiles(target.FilePaths...)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to load files: %v", err) return nil, fmt.Errorf("failed to load files: %v", err)
} }
templates, err := generator.ApplyTemplateFromFiles(generator.Mappings{ templates, err := ApplyTemplateFromFiles(Mappings{
"node_entries": nodeEntries, "node_entries": nodeEntries,
}, target.TemplatePaths...) }, target.TemplatePaths...)
if err != nil { if err != nil {
@ -98,5 +97,3 @@ func (g *Warewulf) Generate(config *configurator.Config, opts ...util.Option) (g
return outputs, err return outputs, err
} }
var Generator Warewulf