Merge pull request #2 from KittenConnect/dev

Dev

cmd/facter/main.go

@@ -4,9 +4,11 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	
+
 	"github.com/KittenConnect/go-facter/lib/facter"
 	"github.com/KittenConnect/go-facter/lib/formatter"
+
+	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS"
 )
 
 func main() {
@@ -24,11 +26,11 @@ func main() {
 	// if *ptFormat == true {
 	// 	conf.Formatter = formatter.NewFormatter()
 	// } else
-	if *kvFormat == true {
+	if *kvFormat {
 		conf.Formatter = formatter.NewKeyValueFormatter()
-	} else if *jsonFormat == true {
+	} else if *jsonFormat {
 		conf.Formatter = formatter.NewJSONFormatter()
-	} else if *yamlFormat == true {
+	} else if *yamlFormat {
 		conf.Formatter = formatter.NewYAMLFormatter()
 	} else {
 		conf.Formatter = formatter.NewFormatter()

lib/facter/facter.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 
 	"github.com/KittenConnect/go-facter/lib/formatter"
-	"github.com/peterbourgon/mergemap"
 	"github.com/nqd/flat"
+	"github.com/peterbourgon/mergemap"
 )
 
 type FetcherFunc func(IFacter) error
@@ -68,7 +68,7 @@ func Register(name string, f FetcherFunc) (err error) {
 func RegisterSafe(name string, facts []string, f FetcherFunc) (err error) {
 	// Ensure multiple providers dont override same fact
 	for _, fact := range facts {
-		fetcher, ok := registeredFacts[name]
+		fetcher, ok := registeredFacts[fact]
 		if ok {
 			err = fmt.Errorf("go-facter facter %s already defined as -> %s", fact, describeFunc(fetchers[fetcher]))
 			fmt.Fprintf(os.Stderr, "%s(%s) failed for reason : %s\n", describeFunc(RegisterSafe), describeFunc(f), err)

cmd/facter/imports.go → lib/facters/routehOS/base/imports.go

@@ -1,9 +1,7 @@
-package main
+package base
 
 import (
 	_ "github.com/KittenConnect/go-facter/lib/facters/disk"
 	_ "github.com/KittenConnect/go-facter/lib/facters/mem"
 	_ "github.com/KittenConnect/go-facter/lib/facters/net"
-
-	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS"
 )

cmd/facter/imports_darwin.go → lib/facters/routehOS/base/imports_darwin.go

@@ -1,3 +1,3 @@
-package main
+package base
 
 // import ()

cmd/facter/imports_linux.go → lib/facters/routehOS/base/imports_linux.go

@@ -1,4 +1,4 @@
-package main
+package base
 
 import (
 	_ "github.com/KittenConnect/go-facter/lib/facters/cpu"

lib/facters/routehOS/extended/imports.go

@@ -0,0 +1,5 @@
+package extended
+
+import (
+	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS/extended/networking"
+)

lib/facters/routehOS/extended/networking/bird/bird.go

@@ -0,0 +1,59 @@
+package routehOS
+
+import (
+	"fmt"
+	"os/exec"
+	"regexp"
+
+	"github.com/KittenConnect/go-facter/lib/facter"
+)
+
+var (
+	PluginName = "bird"
+
+	reBirdVersion = regexp.MustCompile(`BIRD version ([\d\.]+)`)
+	reBirdConfig  = regexp.MustCompile(`[\s]+-c[\s]+<config-file>[\w\s]+instead[\w\s]+\n[\s]+([\/-_.\w]+)`)
+)
+
+func init() {
+	facter.RegisterSafe(PluginName, []string{"bird."}, GetBirdFacts)
+}
+
+func GetBirdFacts(f facter.IFacter) error {
+	cmd := exec.Command("bird", "--version")
+
+	// Run the command and retrieve the output
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return err
+	}
+
+	versionOut := string(output)
+
+	result := reBirdVersion.FindStringSubmatch(versionOut)
+
+	if len(result) < 1 {
+		return fmt.Errorf("cannot find [ %s ] in BIRD version output", reBirdVersion.String())
+	}
+
+	cmd = exec.Command("bird", "--help")
+
+	// Run the command and retrieve the output
+	output, err = cmd.CombinedOutput()
+	if err != nil {
+		return err
+	}
+
+	helpOut := string(output)
+
+	f.Add("bird", map[string]interface{}{
+		"version":   result[1],
+		"conf_file": reBirdConfig.FindStringSubmatch(helpOut)[1],
+
+		// "pid_file":     reRADVDPidFile.FindStringSubmatch(out)[1],
+		// "log_file":     reRADVDLogFile.FindStringSubmatch(out)[1],
+		// "log_facility": reRADVDSyslogFc.FindStringSubmatch(out)[1],
+	})
+
+	return nil
+}

lib/facters/routehOS/extended/networking/imports.go

@@ -0,0 +1,6 @@
+package networking
+
+import (
+	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS/extended/networking/bird"
+	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS/extended/networking/radvd"
+)

lib/facters/routehOS/radvd.go → lib/facters/routehOS/extended/networking/radvd/radvd.go

@@ -8,12 +8,19 @@ import (
 	"github.com/KittenConnect/go-facter/lib/facter"
 )
 
-var reRADVDVersion = regexp.MustCompile(`Version: ([\d\.]+)`)
+var (
+	PluginName = "radvd"
+
+	reRADVDVersion  = regexp.MustCompile(`Version: ([\d\.]+)`)
+	reRADVDConfig   = regexp.MustCompile(`default[\s]+config[\s]+file[\s]+"([\/-_.\w]+)"`)
+	reRADVDPidFile  = regexp.MustCompile(`default[\s]+pidfile[\s]+"([\/-_.\w]+)"`)
+	reRADVDLogFile  = regexp.MustCompile(`default[\s]+logfile[\s]+"([\/-_.\w]+)"`)
+	reRADVDSyslogFc = regexp.MustCompile(`default[\s]+syslog[\s]+facility[\s]+(\d+)`)
+)
 
-var reRADVDConfig = regexp.MustCompile(`default[\s]+config[\s]+file[\s]+"([\/-_.\w]+)"`)
-var reRADVDPidFile = regexp.MustCompile(`default[\s]+pidfile[\s]+"([\/-_.\w]+)"`)
-var reRADVDLogFile = regexp.MustCompile(`default[\s]+logfile[\s]+"([\/-_.\w]+)"`)
-var reRADVDSyslogFc = regexp.MustCompile(`default[\s]+syslog[\s]+facility[\s]+(\d+)`)
+func init() {
+	facter.RegisterSafe(PluginName, []string{"radvd."}, GetRADVDFacts)
+}
 
 func GetRADVDFacts(f facter.IFacter) error {
 	cmd := exec.Command("radvd", "--version")
@@ -30,15 +37,9 @@ func GetRADVDFacts(f facter.IFacter) error {
 	result := reRADVDVersion.FindStringSubmatch(out)
 
 	if len(result) < 1 {
-		return fmt.Errorf("Cannot find [ %s ] in RADvd version output", reRADVDVersion.String())
+		return fmt.Errorf("cannot find [ %s ] in RADvd version output", reRADVDVersion.String())
 	}
 
-	f.Add("radvd_version", result[1])
-	f.Add("radvd_conf_file", reRADVDConfig.FindStringSubmatch(out)[1])
-	f.Add("radvd_pid_file", reRADVDPidFile.FindStringSubmatch(out)[1])
-	f.Add("radvd_log_file", reRADVDLogFile.FindStringSubmatch(out)[1])
-	f.Add("radvd_log_facility", reRADVDSyslogFc.FindStringSubmatch(out)[1])
-
 	f.Add("radvd", map[string]interface{}{
 		"version":      result[1],
 		"conf_file":    reRADVDConfig.FindStringSubmatch(out)[1],

lib/facters/routehOS/facter.go

@@ -10,13 +10,13 @@ import (
 var PluginName = "routehOS"
 
 var fetcherFuncs = []facter.FetcherFunc{
-	GetFacts,
-	GetRADVDFacts,
-	GetBirdFacts,
+	// GetFacts,
+	// GetRADVDFacts,
+	// GetBirdFacts,
 }
 
 func init() {
-	facter.RegisterSafe(PluginName, []string{"foo", "bird_", "radvd", "radvd_"}, GetAllFacts)
+	facter.RegisterSafe(PluginName, []string{}, GetAllFacts)
 }
 
 func debug(f string, v ...any) {
@@ -39,16 +39,15 @@ func GetAllFacts(f facter.IFacter) (e error) {
 
 // GetFacts gathers facts related to KittenConnect's RoutehOS Appliance
 func GetFacts(f facter.IFacter) error {
-	f.Add("foo", map[string]interface{}{
-		"version": "1.0.2",
-		"bar":     "dfjkgdfgdfg",
-		"baz":     "dfkgnldgdfsg",
-		"test":    "gfdsgdfsgdsg",
-		"tos":     "dfjkngbkdfngdfs",
-		"toz": map[string]interface{}{
-			"beep": "boop",
-		},
-	})
-
+	// f.Add("foo", map[string]interface{}{
+	// 	"version": "1.0.2",
+	// 	"bar":     "dfjkgdfgdfg",
+	// 	"baz":     "dfkgnldgdfsg",
+	// 	"test":    "gfdsgdfsgdsg",
+	// 	"tos":     "dfjkngbkdfngdfs",
+	// 	"toz": map[string]interface{}{
+	// 		"beep": "boop",
+	// 	},
+	// })
 	return nil
 }

lib/facters/routehOS/imports.go

@@ -0,0 +1,5 @@
+package routehOS
+
+import (
+	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS/base"
+)

lib/facters/routehOS/imports_extended.go

@@ -0,0 +1,8 @@
+//go:build facter_extended
+// +build facter_extended
+
+package routehOS
+
+import (
+	_ "github.com/KittenConnect/go-facter/lib/facters/routehOS/extended"
+)