Merge pull request #86 from unpoller/mock-plug-in-status-and-logging

plug in mock status response and improved logging

mocks/mock_client.go

@@ -366,16 +366,16 @@ func (m *MockUnifi) Logout() error {
 
 // GetServerData sets the controller's version and UUID. Only call this if you
 // previously called Login and suspect the controller version has changed.
-func (m *MockUnifi) GetServerData() error {
+func (m *MockUnifi) GetServerData() (*unifi.ServerStatus, error) {
  var response struct {
  Data unifi.ServerStatus `json:"meta"`
  }
 
  err := m.faker.Struct(&response)
  if err != nil {
- return err
+ return nil, err
  }
- return nil
+ return &response.Data, nil
 }
 
 // GetUsers returns a response full of clients that connected to the UDM within the provided amount of time

mocks/mock_server.go

@@ -3,6 +3,7 @@ package mocks
 import (
  "encoding/json"
  "fmt"
+ "log"
  "net/http"
  "net/http/httptest"
  "regexp"
@@ -54,6 +55,7 @@ var (
 )
 
 func respondResultOrErr(w http.ResponseWriter, v any, err error) {
+ log.Printf("[DEBUG] Answering mock response err=%+v value=%+v\n", err, v)
  if err != nil {
  b, _ := json.Marshal(err)
  w.WriteHeader(500)
@@ -67,14 +69,16 @@ func respondResultOrErr(w http.ResponseWriter, v any, err error) {
 
 func (m *MockHTTPTestServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  p := strings.TrimSpace(r.URL.Path)
+ log.Printf("[DEBUG] Received mock request path=%s\n", p)
  switch {
  case apiRogueAP.MatchString(p):
  aps, err := m.mocked.GetRogueAPs(nil)
  respondResultOrErr(w, aps, err)
  return
  case apiStatusPath.MatchString(p):
-
- // todo
+ s, err := m.mocked.GetServerData()
+ respondResultOrErr(w, s, err)
+ return
  case apiEventPath.MatchString(p):
  events, err := m.mocked.GetEvents(nil, time.Hour)
  respondResultOrErr(w, events, err)
@@ -141,6 +145,7 @@ func (m *MockHTTPTestServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  w.WriteHeader(501)
  return
  default:
+ log.Println("[DEBUG] Answering mock response err=404 not found")
  http.NotFoundHandler().ServeHTTP(w, r)
  return
  }

types.go

@@ -209,7 +209,7 @@ type UnifiClient interface {
  Logout() error
  // GetServerData sets the controller's version and UUID. Only call this if you
  // previously called Login and suspect the controller version has changed.
- GetServerData() error
+ GetServerData() (*ServerStatus, error)
  // GetUsers returns a response full of clients that connected to the UDM within the provided amount of time
  // using the insight historical connection data set.
  GetUsers(sites []*Site, hours int) ([]*User, error)

unifi.go

@@ -55,7 +55,7 @@ func NewUnifi(config *Config) (*Unifi, error) {
  return u, err
  }
 
- if err := u.GetServerData(); err != nil {
+ if _, err := u.GetServerData(); err != nil {
  return u, fmt.Errorf("unable to get server version: %w", err)
  }
 
@@ -201,14 +201,19 @@ func (u *Unifi) checkNewStyleAPI() error {
 
 // GetServerData sets the controller's version and UUID. Only call this if you
 // previously called Login and suspect the controller version has changed.
-func (u *Unifi) GetServerData() error {
+func (u *Unifi) GetServerData() (*ServerStatus, error) {
  var response struct {
  Data ServerStatus `json:"meta"`
  }
 
+ err := u.GetData(APIStatusPath, &response)
+ if err != nil {
+ return nil, err
+ }
+
  u.ServerStatus = &response.Data
 
- return u.GetData(APIStatusPath, &response)
+ return u.ServerStatus, nil
 }
 
 // GetData makes a unifi request and unmarshals the response into a provided pointer.