refa: improve signature of StartDiscoveryTask

steadybit · Oct 7, 2023 · e2a5664 · e2a5664
1 parent fb19415
commit e2a5664
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 25 deletions.
diff --git a/extaz/availablity_zone_discovery.go b/extaz/availablity_zone_discovery.go
@@ -22,6 +22,7 @@ import (
 	"github.com/steadybit/extension-kit/extutil"
 	"net/http"
 	"os"
+	"time"
 )
 
 var (
@@ -36,7 +37,7 @@ func RegisterDiscoveryHandlers(stopCh chan os.Signal) {
 	utils.StartDiscoveryTask(
 		stopCh,
 		"availability zone",
-		config.Config.DiscoveryIntervalZone,
+		time.Duration(config.Config.DiscoveryIntervalZone)*time.Second,
 		getTargetsForAccount,
 		func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError) {
 			targets = &updatedTargets
@@ -79,7 +80,7 @@ func getAZTargetDescription() discovery_kit_api.TargetDescription {
 	}
 }
 
-func getAZDiscoveryResults(w http.ResponseWriter, r *http.Request, _ []byte) {
+func getAZDiscoveryResults(w http.ResponseWriter, _ *http.Request, _ []byte) {
 	if discoveryError != nil {
 		exthttp.WriteError(w, *discoveryError)
 	} else {

diff --git a/extec2/instance_discovery.go b/extec2/instance_discovery.go
@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"time"
 )
 
 var (
@@ -51,7 +52,7 @@ func RegisterDiscoveryHandlers(stopCh chan os.Signal) {
 	utils.StartDiscoveryTask(
 		stopCh,
 		"ec2 instance",
-		config.Config.DiscoveryIntervalEc2,
+		time.Duration(config.Config.DiscoveryIntervalEc2)*time.Second,
 		getTargetsForAccount,
 		func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError) {
 			targets = &updatedTargets

diff --git a/extfis/template_discovery.go b/extfis/template_discovery.go
@@ -41,7 +41,7 @@ func RegisterFisInstanceDiscoveryHandlers(stopCh chan os.Signal) {
 	utils.StartDiscoveryTask(
 		stopCh,
 		"fis template",
-		config.Config.DiscoveryIntervalFis,
+		time.Duration(config.Config.DiscoveryIntervalFis)*time.Second,
 		getTargetsForAccount,
 		func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError) {
 			targets = &updatedTargets
@@ -112,7 +112,7 @@ func getFisTemplateAttributeDescriptions() discovery_kit_api.AttributeDescriptio
 	}
 }
 
-func getFisTemplateTargets(w http.ResponseWriter, r *http.Request, _ []byte) {
+func getFisTemplateTargets(w http.ResponseWriter, _ *http.Request, _ []byte) {
 	if discoveryError != nil {
 		exthttp.WriteError(w, *discoveryError)
 	} else {
@@ -255,9 +255,9 @@ func calculateTotalDuration(experimentTemplate *types.ExperimentTemplate) *time.
 
 	log.Debug().Msgf("Calculated total durations for FIS Experiment %s: %v", *experimentTemplate.Id, totalDurations)
 	longestDuration := time.Duration(0)
-	for _, duration := range totalDurations {
-		if duration > longestDuration {
-			longestDuration = duration
+	for _, d := range totalDurations {
+		if d > longestDuration {
+			longestDuration = d
 		}
 	}
 	return &longestDuration

diff --git a/extlambda/discovery.go b/extlambda/discovery.go
@@ -24,6 +24,7 @@ import (
 	"net/http"
 	"os"
 	"strconv"
+	"time"
 )
 
 const discoveryBasePath = "/lambda/discovery"
@@ -42,7 +43,7 @@ func RegisterDiscoveryHandlers(stopCh chan os.Signal) {
 	utils.StartDiscoveryTask(
 		stopCh,
 		"lambda function",
-		config.Config.DiscoveryIntervalLambda,
+		time.Duration(config.Config.DiscoveryIntervalLambda)*time.Second,
 		getTargetsForAccount,
 		func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError) {
 			targets = &updatedTargets
@@ -188,7 +189,7 @@ func getAttributeDescriptions() discovery_kit_api.AttributeDescriptions {
 	}
 }
 
-func getDiscoveredTargets(w http.ResponseWriter, r *http.Request, _ []byte) {
+func getDiscoveredTargets(w http.ResponseWriter, _ *http.Request, _ []byte) {
 	if discoveryError != nil {
 		exthttp.WriteError(w, *discoveryError)
 	} else {

diff --git a/extrds/cluster_discovery.go b/extrds/cluster_discovery.go
@@ -21,6 +21,7 @@ import (
 	"github.com/steadybit/extension-kit/extutil"
 	"net/http"
 	"os"
+	"time"
 )
 
 var (
@@ -37,7 +38,7 @@ func RegisterClusterDiscoveryHandlers(stopCh chan os.Signal) {
 	utils.StartDiscoveryTask(
 		stopCh,
 		"rds cluster",
-		config.Config.DiscoveryIntervalRds,
+		time.Duration(config.Config.DiscoveryIntervalRds)*time.Second,
 		getClusterTargetsForAccount,
 		func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError) {
 			clusterTargets = &updatedTargets
@@ -131,7 +132,7 @@ func getRdsClusterAttributeDescriptions() discovery_kit_api.AttributeDescription
 	}
 }
 
-func getRdsClusterDiscoveryResults(w http.ResponseWriter, r *http.Request, _ []byte) {
+func getRdsClusterDiscoveryResults(w http.ResponseWriter, _ *http.Request, _ []byte) {
 	if clusterDiscoveryError != nil {
 		exthttp.WriteError(w, *clusterDiscoveryError)
 	} else {

diff --git a/extrds/instance_discovery.go b/extrds/instance_discovery.go
@@ -22,6 +22,7 @@ import (
 	"github.com/steadybit/extension-kit/extutil"
 	"net/http"
 	"os"
+	"time"
 )
 
 var (
@@ -38,7 +39,7 @@ func RegisterInstanceDiscoveryHandlers(stopCh chan os.Signal) {
 	utils.StartDiscoveryTask(
 		stopCh,
 		"rds instance",
-		config.Config.DiscoveryIntervalRds,
+		time.Duration(config.Config.DiscoveryIntervalRds)*time.Second,
 		getInstanceTargetsForAccount,
 		func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError) {
 			instanceTargets = &updatedTargets
@@ -116,7 +117,7 @@ func getRdsInstanceAttributeDescriptions() discovery_kit_api.AttributeDescriptio
 	}
 }
 
-func getRdsInstanceDiscoveryResults(w http.ResponseWriter, r *http.Request, _ []byte) {
+func getRdsInstanceDiscoveryResults(w http.ResponseWriter, _ *http.Request, _ []byte) {
 	if discoveryError != nil {
 		exthttp.WriteError(w, *discoveryError)
 	} else {

diff --git a/utils/discovery_task.go b/utils/discovery_task.go
@@ -13,37 +13,37 @@ import (
 
 func StartDiscoveryTask(
 	stopCh chan os.Signal,
-	discovery string,
-	interval int,
+	discoveryName string,
+	interval time.Duration,
 	supplier func(account *AwsAccount, ctx context.Context) (*[]discovery_kit_api.Target, error),
 	updateResults func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError)) {
 	//init empty results
 	updateResults([]discovery_kit_api.Target{}, nil)
 	//start first discovery immediately
-	discover(supplier, discovery, updateResults)
+	discover(supplier, discoveryName, updateResults)
 	//start loop
 	go func() {
-		log.Info().Msgf("Starting %s discovery", discovery)
+		log.Info().Msgf("Starting %s discovery", discoveryName)
 		for {
 			select {
 			case <-stopCh:
-				log.Info().Msgf("Stopping %s discovery", discovery)
+				log.Info().Msgf("Stopping %s discovery", discoveryName)
 				return
-			case <-time.After(time.Duration(interval) * time.Second):
-				discover(supplier, discovery, updateResults)
+			case <-time.After(interval):
+				discover(supplier, discoveryName, updateResults)
 			}
 		}
 	}()
 }
 
-func discover(supplier func(account *AwsAccount, ctx context.Context) (*[]discovery_kit_api.Target, error), discovery string, updateResults func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError)) {
+func discover(supplier func(account *AwsAccount, ctx context.Context) (*[]discovery_kit_api.Target, error), discoveryName string, updateResults func(updatedTargets []discovery_kit_api.Target, err *extension_kit.ExtensionError)) {
 	start := time.Now()
-	updatedTargets, err := ForEveryAccount(Accounts, supplier, context.Background(), discovery)
+	updatedTargets, err := ForEveryAccount(Accounts, supplier, context.Background(), discoveryName)
 	if err != nil {
-		updateResults([]discovery_kit_api.Target{}, extutil.Ptr(extension_kit.ToError(fmt.Sprintf("Failed to collect %s information", discovery), err)))
+		updateResults([]discovery_kit_api.Target{}, extutil.Ptr(extension_kit.ToError(fmt.Sprintf("Failed to collect %s information", discoveryName), err)))
 	} else {
 		updateResults(*updatedTargets, nil)
 		elapsed := time.Since(start)
-		log.Debug().Msgf("Updated %d %s targets in %s", len(*updatedTargets), discovery, elapsed)
+		log.Debug().Msgf("Updated %d %s targets in %s", len(*updatedTargets), discoveryName, elapsed)
 	}
 }