dont return full check config

Author: moshloop

pkg/aggregate/aggregate.go

@@ -91,7 +91,7 @@ func Handler(w nethttp.ResponseWriter, req *nethttp.Request) {
 			Name:        c.Name,
 			Type:        c.Type,
 			Description: c.Description,
-			Endpoint:    c.CheckConf.GetEndpoint(),
+			Endpoint:    c.Endpoint,
 			ServerURL:   "local",
 			Health: map[string]CheckHealth{
 				localServerId: {c.Latency, c.Uptime},
@@ -125,7 +125,7 @@ func Handler(w nethttp.ResponseWriter, req *nethttp.Request) {
 					Name:        c.Name,
 					Type:        c.Type,
 					Description: c.Description,
-					Endpoint:    c.CheckConf.GetEndpoint(),
+					Endpoint:    c.Endpoint,
 					ServerURL:   serverURL,
 					Health: map[string]CheckHealth{
 						serverId: {c.Latency, c.Uptime},

pkg/api.go

@@ -1,16 +1,13 @@
 package pkg
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
 
 	"github.com/flanksource/canary-checker/api/external"
 	v1 "github.com/flanksource/canary-checker/api/v1"
 	"github.com/flanksource/commons/console"
-	"github.com/mitchellh/mapstructure"
-	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,16 +42,15 @@ type CheckStatus struct {
 }
 
 type Check struct {
-	Key         string
+	Key         string        `json:"key"`
 	Type        string        `json:"type"`
 	Name        string        `json:"name"`
 	Description string        `json:"description"`
+	Endpoint    string        `json:"endpoint"`
 	Uptime      string        `json:"uptime"`
 	Latency     string        `json:"latency"`
 	Statuses    []CheckStatus `json:"checkStatuses" mapstructure:"-"`
-	// CheckConf is the configuration
-	CheckConf   external.Check `json:"checkConf" mapstructure:"-"`
-	CheckCanary *v1.Canary     `json:"-"`
+	CheckCanary *v1.Canary    `json:"-"`
 }
 
 type Checks []Check
@@ -78,51 +74,6 @@ func (c Check) GetDescription() string {
 	return c.Description
 }
 
-func (c *Check) UnmarshalJSON(data []byte) error {
-	// Unmarshalling checkStatuses because of custom JSONTime
-	var objmap map[string]json.RawMessage
-	if err := json.Unmarshal(data, &objmap); err != nil {
-		return errors.Wrapf(err, "unmarshal map[string]json.RawMessage error")
-	}
-
-	var statuses []CheckStatus
-	if err := json.Unmarshal(objmap["checkStatuses"], &statuses); err != nil {
-		return errors.Wrapf(err, "unmarshal statuses error")
-	}
-
-	// Unmarshalling to interface to getting proper CheckConf type
-	var m map[string]interface{}
-	if err := json.Unmarshal(data, &m); err != nil {
-		return errors.Wrapf(err, "unmarshal map[string]interface{} error")
-	}
-
-	checkType := fmt.Sprintf("%v", m["type"])
-
-	var checkConf external.Check
-	for _, _c := range v1.AllChecks {
-		c := _c
-		if c.GetType() == checkType {
-			checkConf = c
-		}
-	}
-	if checkConf == nil {
-		return fmt.Errorf("external check type not found %s", checkType)
-	}
-
-	if err := mapstructure.Decode(m["checkConf"], &checkConf); err != nil {
-		return errors.Wrapf(err, "external check mapstructure err")
-	}
-
-	// Decode rest of check fields
-	if err := mapstructure.Decode(m, c); err != nil {
-		return errors.Wrapf(err, "check mapstructure err")
-	}
-
-	c.CheckConf = checkConf
-	c.Statuses = statuses
-	return nil
-}
-
 type Config struct {
 	HTTP           []v1.HTTPCheck           `yaml:"http,omitempty" json:"http,omitempty"`
 	DNS            []v1.DNSCheck            `yaml:"dns,omitempty" json:"dns,omitempty"`

pkg/api/api.go

@@ -107,7 +107,12 @@ func TriggerCheckHandler(w http.ResponseWriter, req *http.Request) {
 			return
 		}
 
-		result := checker.Check(check.CheckConf)
+		conf := cache.GetConfig(td.CheckKey)
+		if conf == nil {
+			http.Error(w, "Check config not found", http.StatusNotFound)
+			return
+		}
+		result := checker.Check(conf)
 		cache.AddCheck(*check.CheckCanary, result)
 		metrics.Record(*check.CheckCanary, result)
 	} else {

pkg/cache/cache.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/flanksource/canary-checker/api/external"
 	v1 "github.com/flanksource/canary-checker/api/v1"
 	"github.com/flanksource/canary-checker/pkg"
 	"github.com/flanksource/canary-checker/pkg/metrics"
@@ -14,12 +15,18 @@ import (
 var Size = 5
 
 type cache struct {
-	Checks map[string]pkg.Check
-	mtx    sync.Mutex
+	Checks       map[string]pkg.Check
+	CheckConfigs map[string]external.Check
+	mtx          sync.Mutex
 }
 
 var Cache = &cache{
-	Checks: make(map[string]pkg.Check),
+	Checks:       make(map[string]pkg.Check),
+	CheckConfigs: make(map[string]external.Check),
+}
+
+func GetConfig(key string) external.Check {
+	return Cache.CheckConfigs[key]
 }
 
 func AddCheck(check v1.Canary, result *pkg.CheckResult) *pkg.Check {
@@ -41,6 +48,7 @@ func (c *cache) RemoveCheck(checks v1.Canary) {
 		key := checks.GetKey(check)
 		logger.Errorf("removing %s", key)
 		delete(c.Checks, key)
+		delete(c.CheckConfigs, key)
 	}
 }
 
@@ -54,7 +62,9 @@ func (c *cache) InitCheck(checks v1.Canary) {
 			Type:        check.GetType(),
 			Name:        checks.ID(),
 			Description: check.GetDescription(),
+			Endpoint:    check.GetEndpoint(),
 		}
+		c.CheckConfigs[key] = check
 	}
 }
 
@@ -71,7 +81,7 @@ func (c *cache) AddCheck(checks v1.Canary, result *pkg.CheckResult) *pkg.Check {
 		Type:        result.Check.GetType(),
 		Name:        checks.ID(),
 		Description: checks.GetDescription(result.Check),
-		CheckConf:   result.Check,
+		Endpoint:    result.Check.GetEndpoint(),
 		CheckCanary: &checks,
 		Statuses: []pkg.CheckStatus{
 			{