Maintenance: simplify top level publicip package API (#186)

Author: qdm12

pkg/publicip/publicip.go

@@ -17,11 +17,9 @@ type Fetcher interface {
 
 type fetcher struct {
 	settings settings
-	dns      Fetcher
-	http     Fetcher
+	fetchers []Fetcher
 	// Cycling effect if both are enabled
-	counter    *uint32 // 32 bit for 32 bit systems
-	fetchTypes []FetchType
+	counter *uint32 // 32 bit for 32 bit systems
 }
 
 var ErrNoFetchTypeSpecified = errors.New("at least one fetcher type must be specified")
@@ -38,22 +36,22 @@ func NewFetcher(dnsSettings DNSSettings, httpSettings HTTPSettings) (f Fetcher,
 	}
 
 	if settings.dns.Enabled {
-		fetcher.dns, err = dns.New(settings.dns.Options...)
+		subFetcher, err := dns.New(settings.dns.Options...)
 		if err != nil {
 			return nil, err
 		}
-		fetcher.fetchTypes = append(fetcher.fetchTypes, DNS)
+		fetcher.fetchers = append(fetcher.fetchers, subFetcher)
 	}
 
 	if settings.http.Enabled {
-		fetcher.http, err = http.New(settings.http.Client, settings.http.Options...)
+		subFetcher, err := http.New(settings.http.Client, settings.http.Options...)
 		if err != nil {
 			return nil, err
 		}
-		fetcher.fetchTypes = append(fetcher.fetchTypes, HTTP)
+		fetcher.fetchers = append(fetcher.fetchers, subFetcher)
 	}
 
-	if len(fetcher.fetchTypes) == 0 {
+	if len(fetcher.fetchers) == 0 {
 		return nil, ErrNoFetchTypeSpecified
 	}
 

pkg/publicip/subfetcher.go

@@ -1,26 +1,14 @@
 package publicip
 
 import (
-	"errors"
-	"fmt"
 	"sync/atomic"
 )
 
-var ErrFetcherUndefined = errors.New("fetcher type undefined")
-
 func (f *fetcher) getSubFetcher() Fetcher {
-	fetcherType := f.fetchTypes[0]
-	if len(f.fetchTypes) > 1 { // cycling effect
-		index := int(atomic.AddUint32(f.counter, 1)) % len(f.fetchTypes)
-		fetcherType = f.fetchTypes[index]
-	}
-
-	switch fetcherType {
-	case DNS:
-		return f.dns
-	case HTTP:
-		return f.http
-	default:
-		panic(fmt.Sprintf("fetcher type undefined: %d", fetcherType))
+	fetcher := f.fetchers[0]
+	if len(f.fetchers) > 1 { // cycling effect
+		index := int(atomic.AddUint32(f.counter, 1)) % len(f.fetchers)
+		fetcher = f.fetchers[index]
 	}
+	return fetcher
 }