1 files changed, 11 insertions, 27 deletions

diff --git a/clients/netbox/client.go b/clients/netbox/client.go
index 97949f2..43ef64c 100644
--- a/clients/netbox/client.go
+++ b/clients/netbox/client.go
@@ -9,8 +9,6 @@ import (
         "net/http"
         "net/url"
         "strconv"
-
-        "code.crute.us/mcrute/golib/secrets"
 )
 
 type NetboxClient interface {
@@ -18,33 +16,19 @@ type NetboxClient interface {
         GetPrefixesWithTag(ctx context.Context, tag string) ([]*net.IPNet, error)
 }
 
-func NewNetboxClient(endpoint string, sc secrets.Client, secretName string) NetboxClient {
-        return &netboxClient{
-                endpoint:   endpoint,
-                secrets:    sc,
-                secretName: secretName,
-        }
-}
-
-type netboxClient struct {
-        secrets    secrets.Client
-        endpoint   string
-        secretName string
+type BasicNetboxClient struct {
+        ApiKey   string
+        Endpoint string
 }
 
-var _ NetboxClient = (*netboxClient)(nil)
-
-func (c *netboxClient) makeRequestRaw(ctx context.Context, method, u string, ib io.Reader, o interface{}) error {
-        apiKey := &secrets.ApiKey{}
-        if _, err := c.secrets.Secret(ctx, c.secretName, apiKey); err != nil {
-                return err
-        }
+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", apiKey.Key))
+        req.Header.Add("Authorization", fmt.Sprintf("Token %s", c.ApiKey))
 
         res, err := http.DefaultClient.Do(req)
         if err != nil {
@@ -59,8 +43,8 @@ func (c *netboxClient) makeRequestRaw(ctx context.Context, method, u string, ib
         return nil
 }
 
-func (c *netboxClient) makeRequest(ctx context.Context, method, path string, q url.Values, ib io.Reader, o interface{}) error {
-        u, err := url.Parse(c.endpoint)
+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
         }
@@ -70,7 +54,7 @@ func (c *netboxClient) makeRequest(ctx context.Context, method, path string, q u
         return c.makeRequestRaw(ctx, method, u.String(), ib, o)
 }
 
-func (c *netboxClient) GetSitePrefixesWithTag(ctx context.Context, site string, tag string) ([]*net.IPNet, error) {
+func (c *BasicNetboxClient) GetSitePrefixesWithTag(ctx context.Context, site string, tag string) ([]*net.IPNet, error) {
         s, err := c.resolveSiteNameToId(ctx, site)
         if err != nil {
                 return nil, err
@@ -113,7 +97,7 @@ func (c *netboxClient) GetSitePrefixesWithTag(ctx context.Context, site string,
         return out, nil
 }
 
-func (c *netboxClient) GetPrefixesWithTag(ctx context.Context, tag string) ([]*net.IPNet, error) {
+func (c *BasicNetboxClient) GetPrefixesWithTag(ctx context.Context, tag string) ([]*net.IPNet, error) {
         out := []*net.IPNet{}
 
         q := url.Values{}
@@ -150,7 +134,7 @@ func (c *netboxClient) GetPrefixesWithTag(ctx context.Context, tag string) ([]*n
         return out, nil
 }
 
-func (c *netboxClient) resolveSiteNameToId(ctx context.Context, s string) (int, error) {
+func (c *BasicNetboxClient) resolveSiteNameToId(ctx context.Context, s string) (int, error) {
         q := url.Values{}
         q.Add("name", s)