Make etcd token a full URL (#23)

Author: andrewrynhard

pkg/config/config.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"io/ioutil"
-	"log"
 
 	"github.com/kelseyhightower/envconfig"
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
@@ -45,7 +44,7 @@ func GetConfig() (*Config, error) {
 
 	err = envconfig.Process("argus", c)
 	if err != nil {
-		log.Fatal(err.Error())
+		return nil, err
 	}
 
 	return c, nil

pkg/etcd/etcd.go

@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"path"
 	"strings"
 
 	"github.com/logicmonitor/k8s-argus/pkg/types"
@@ -17,9 +16,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// PublicDiscoveryEndpoint is the official CoreOS discovery service.
-const PublicDiscoveryEndpoint = "discovery.etcd.io"
-
 // Controller is the etcd controller for discovering etcd nodes.
 type Controller struct {
 	*types.Base
@@ -34,7 +30,7 @@ type Member struct {
 // DiscoverByToken discovers the etcd node IP addresses using the etcd discovery service.
 func (c *Controller) DiscoverByToken() ([]*Member, error) {
 	members := []*Member{}
-	response, err := http.Get("https://" + path.Join(PublicDiscoveryEndpoint, c.Config.EtcdDiscoveryToken))
+	response, err := http.Get(c.Config.EtcdDiscoveryToken)
 	if err != nil {
 		return nil, err
 	}

pkg/watch/namespace/namespace.go

@@ -6,7 +6,7 @@ import (
 	"github.com/logicmonitor/k8s-argus/pkg/constants"
 	"github.com/logicmonitor/k8s-argus/pkg/types"
 	lm "github.com/logicmonitor/lm-sdk-go"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/runtime"
 )
@@ -48,18 +48,18 @@ func (w Watcher) AddFunc() func(obj interface{}) {
 
 			parentDeviceGroup, err := w.findDeviceGroup(parentID)
 			if err != nil {
-				logrus.Errorf("Failed to find namespace: %v", err)
+				log.Errorf("Failed to find namespace: %v", err)
 
 				return
 			}
 			_, err = w.createDeviceGroup(namespace.Name, appliesTo, parentDeviceGroup.Id)
 			if err != nil {
-				logrus.Errorf("Failed to add namespace: %v", err)
+				log.Errorf("Failed to add namespace: %v", err)
 
 				return
 			}
 
-			logrus.Printf("Added namespace %s", namespace.Name)
+			log.Printf("Added namespace %s", namespace.Name)
 		}
 	}
 }
@@ -79,15 +79,15 @@ func (w Watcher) DeleteFunc() func(obj interface{}) {
 		for name, parentID := range w.DeviceGroups {
 			deviceGroup, err := w.findDeviceGroup(parentID)
 			if err != nil {
-				logrus.Printf("Failed to find namespace %s: %v", name, err)
+				log.Printf("Failed to find namespace %s: %v", name, err)
 
 				return
 			}
 			for _, subGroup := range deviceGroup.SubGroups {
 				if subGroup.Name == namespace.Name {
 					restResponse, apiResponse, err := w.LMClient.DeleteDeviceGroupById(subGroup.Id, true)
 					if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
-						logrus.Errorf("Failed to delete namespace %q: %v", subGroup.Name, _err)
+						log.Errorf("Failed to delete namespace %q: %v", subGroup.Name, _err)
 
 						return
 					}
@@ -100,13 +100,13 @@ func (w Watcher) DeleteFunc() func(obj interface{}) {
 func (w *Watcher) findDeviceGroup(parentID int32) (deviceGroup *lm.RestDeviceGroup, err error) {
 	restResponse, apiResponse, err := w.LMClient.GetDeviceGroupById(parentID, "")
 	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
-		logrus.Errorf("Failed to find namespace: %v", _err)
+		log.Errorf("Failed to find namespace: %v", _err)
 
 		return
 	}
 
 	deviceGroup = &restResponse.Data
-	logrus.Debugf("%#v", restResponse)
+	log.Debugf("%#v", restResponse)
 
 	return
 }
@@ -120,7 +120,7 @@ func (w *Watcher) createDeviceGroup(name, appliesTo string, parentID int32) (dev
 		DisableAlerting: w.Config.DisableAlerting,
 	})
 	if _err := utilities.CheckAllErrors(restResponse, apiResponse, err); _err != nil {
-		logrus.Errorf("Failed to add namespace %q: %v", name, _err)
+		log.Errorf("Failed to add namespace %q: %v", name, _err)
 
 		return
 	}