add rogueAPs and lint fixes
This commit is contained in:
parent
e733ba2a1d
commit
7100b19b4d
|
|
@ -6,4 +6,4 @@ before_install:
|
|||
- curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin latest
|
||||
script:
|
||||
- go test ./...
|
||||
- golangci-lint run --enable-all
|
||||
- golangci-lint run --enable-all -D exhaustivestruct,nlreturn,forbidigo
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func (u *UnifiPoller) PrintPasswordHash() (err error) {
|
|||
|
||||
pwd, err = terminal.ReadPassword(int(os.Stdin.Fd()))
|
||||
if err != nil {
|
||||
return err
|
||||
return fmt.Errorf("reading stdin: %w", err)
|
||||
}
|
||||
|
||||
fmt.Println() // print a newline.
|
||||
|
|
@ -52,5 +52,5 @@ func (u *UnifiPoller) PrintPasswordHash() (err error) {
|
|||
hash, err := bcrypt.GenerateFromPassword(pwd, bcrypt.MinCost)
|
||||
fmt.Println(string(hash))
|
||||
|
||||
return err
|
||||
return err //nolint:wrapcheck
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package poller
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path"
|
||||
"plugin"
|
||||
|
|
@ -42,6 +43,7 @@ type Metrics struct {
|
|||
SitesDPI []interface{}
|
||||
ClientsDPI []interface{}
|
||||
Devices []interface{}
|
||||
RogueAPs []interface{}
|
||||
}
|
||||
|
||||
// Events defines the type for log entries.
|
||||
|
|
@ -78,7 +80,7 @@ func (u *UnifiPoller) LoadPlugins() error {
|
|||
u.Logf("Loading Dynamic Plugin: %s", name)
|
||||
|
||||
if _, err := plugin.Open(name); err != nil {
|
||||
return err
|
||||
return fmt.Errorf("opening plugin: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -114,20 +116,22 @@ func getFirstFile(files []string) (string, error) {
|
|||
}
|
||||
}
|
||||
|
||||
return "", err
|
||||
return "", fmt.Errorf("finding file: %w", err)
|
||||
}
|
||||
|
||||
// parseInterface parses the config file and environment variables into the provided interface.
|
||||
func (u *UnifiPoller) parseInterface(i interface{}) error {
|
||||
// Parse config file into provided interface.
|
||||
if err := cnfgfile.Unmarshal(i, u.Flags.ConfigFile); err != nil {
|
||||
return err
|
||||
return fmt.Errorf("cnfg unmarshal: %w", err)
|
||||
}
|
||||
|
||||
// Parse environment variables into provided interface.
|
||||
_, err := cnfg.UnmarshalENV(i, ENVConfigPrefix)
|
||||
if _, err := cnfg.UnmarshalENV(i, ENVConfigPrefix); err != nil {
|
||||
return fmt.Errorf("env unmarshal: %w", err)
|
||||
}
|
||||
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
|
||||
// Parse input plugin configs.
|
||||
|
|
|
|||
|
|
@ -136,6 +136,7 @@ func AppendMetrics(existing *Metrics, m *Metrics) *Metrics {
|
|||
existing.SitesDPI = append(existing.SitesDPI, m.SitesDPI...)
|
||||
existing.Sites = append(existing.Sites, m.Sites...)
|
||||
existing.ClientsDPI = append(existing.ClientsDPI, m.ClientsDPI...)
|
||||
existing.RogueAPs = append(existing.RogueAPs, m.RogueAPs...)
|
||||
existing.Clients = append(existing.Clients, m.Clients...)
|
||||
existing.Devices = append(existing.Devices, m.Devices...)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue