1 files changed, 14 insertions, 56 deletions

diff --git a/clients/netbox/client.go b/clients/netbox/client.go
index ad2967a..3b7fbaf 100644
--- a/clients/netbox/client.go
+++ b/clients/netbox/client.go
@@ -2,12 +2,8 @@ package netbox
 
 import (
         "context"
-        "encoding/json"
         "fmt"
-        "io"
         "net"
-        "net/http"
-        "net/url"
         "strconv"
 )
 
@@ -18,49 +14,11 @@ type NetboxClient interface {
 }
 
 type BasicNetboxClient struct {
-        ApiKey   string
-        Endpoint string
+        *NetboxHttpClient
 }
 
-var _ NetboxClient = (*BasicNetboxClient)(nil)
-
-func (c *BasicNetboxClient) makeRequestRaw(ctx context.Context, method, u string, ib io.Reader, o interface{}) error {
-        req, err := http.NewRequestWithContext(ctx, method, u, ib)
-        if err != nil {
-                return err
-        }
-        req.Header.Add("Authorization", fmt.Sprintf("Token %s", c.ApiKey))
-
-        res, err := http.DefaultClient.Do(req)
-        if err != nil {
-                return err
-        }
-        defer res.Body.Close()
-
-        if res.StatusCode != http.StatusOK {
-                apiError := &ApiError{Status: res.StatusCode}
-                if err = json.NewDecoder(res.Body).Decode(apiError); err != nil {
-                        return fmt.Errorf("Netbox JSON decode error while parsing error with status %d: %w", res.StatusCode, err)
-                }
-                return apiError
-        }
-
-        if err = json.NewDecoder(res.Body).Decode(o); err != nil {
-                return err
-        }
-
-        return nil
-}
-
-func (c *BasicNetboxClient) makeRequest(ctx context.Context, method, path string, q url.Values, ib io.Reader, o interface{}) error {
-        u, err := url.Parse(c.Endpoint)
-        if err != nil {
-                return err
-        }
-        u.Path = path
-        u.RawQuery = q.Encode()
-
-        return c.makeRequestRaw(ctx, method, u.String(), ib, o)
+func MustNewBasicNetboxClient(apiKey, endpoint string) NetboxClient {
+        return &BasicNetboxClient{MustNewNetboxHttpClient(apiKey, endpoint)}
 }
 
 func (c *BasicNetboxClient) GetSitePrefixesWithTag(ctx context.Context, site string, tag string) ([]*net.IPNet, error) {
@@ -71,12 +29,12 @@ func (c *BasicNetboxClient) GetSitePrefixesWithTag(ctx context.Context, site str
 
         out := []*net.IPNet{}
 
-        q := url.Values{}
+        q := NewNetboxGetRequest("/api/ipam/prefixes/")
         q.Add("site_id", strconv.Itoa(s))
         q.Add("tag", tag)
 
         page := &PrefixList{}
-        if err := c.makeRequest(ctx, http.MethodGet, "/api/ipam/prefixes/", q, nil, page); err != nil {
+        if err := c.Do(ctx, q, page); err != nil {
                 return nil, err
         }
 
@@ -90,7 +48,7 @@ func (c *BasicNetboxClient) GetSitePrefixesWithTag(ctx context.Context, site str
 
         for page.Next != "" {
                 page = &PrefixList{}
-                if err := c.makeRequestRaw(ctx, http.MethodGet, page.Next, nil, page); err != nil {
+                if err := c.Do(ctx, &NetboxRawGet{page.Next}, page); err != nil {
                         return nil, err
                 }
 
@@ -109,11 +67,11 @@ func (c *BasicNetboxClient) GetSitePrefixesWithTag(ctx context.Context, site str
 func (c *BasicNetboxClient) GetPrefixesWithTag(ctx context.Context, tag string) ([]*net.IPNet, error) {
         out := []*net.IPNet{}
 
-        q := url.Values{}
+        q := NewNetboxGetRequest("/api/ipam/prefixes/")
         q.Add("tag", tag)
 
         page := &PrefixList{}
-        if err := c.makeRequest(ctx, http.MethodGet, "/api/ipam/prefixes/", q, nil, page); err != nil {
+        if err := c.Do(ctx, q, page); err != nil {
                 return nil, err
         }
 
@@ -127,7 +85,7 @@ func (c *BasicNetboxClient) GetPrefixesWithTag(ctx context.Context, tag string)
 
         for page.Next != "" {
                 page = &PrefixList{}
-                if err := c.makeRequestRaw(ctx, http.MethodGet, page.Next, nil, page); err != nil {
+                if err := c.Do(ctx, &NetboxRawGet{page.Next}, page); err != nil {
                         return nil, err
                 }
 
@@ -144,11 +102,11 @@ func (c *BasicNetboxClient) GetPrefixesWithTag(ctx context.Context, tag string)
 }
 
 func (c *BasicNetboxClient) resolveSiteNameToId(ctx context.Context, s string) (int, error) {
-        q := url.Values{}
+        q := NewNetboxGetRequest("/api/dcim/sites/")
         q.Add("name", s)
 
         out := &SiteList{}
-        if err := c.makeRequest(ctx, http.MethodGet, "/api/dcim/sites/", q, nil, out); err != nil {
+        if err := c.Do(ctx, q, out); err != nil {
                 return 0, err
         }
 
@@ -162,11 +120,11 @@ func (c *BasicNetboxClient) resolveSiteNameToId(ctx context.Context, s string) (
 func (c *BasicNetboxClient) GetServicesForVm(ctx context.Context, vmName string) ([]*Service, error) {
         out := []*Service{}
 
-        q := url.Values{}
+        q := NewNetboxGetRequest("/api/ipam/services/")
         q.Add("virtual_machine", vmName)
 
         page := &ServiceList{}
-        if err := c.makeRequest(ctx, http.MethodGet, "/api/ipam/services/", q, nil, page); err != nil {
+        if err := c.Do(ctx, q, page); err != nil {
                 return nil, err
         }
 
@@ -176,7 +134,7 @@ func (c *BasicNetboxClient) GetServicesForVm(ctx context.Context, vmName string)
 
         for page.Next != "" {
                 page = &ServiceList{}
-                if err := c.makeRequestRaw(ctx, http.MethodGet, page.Next, nil, page); err != nil {
+                if err := c.Do(ctx, &NetboxRawGet{page.Next}, page); err != nil {
                         return nil, err
                 }