Move DefaultConfig closer to Config

That way it becomes clear what we treat as the default config.
knl · Feb 13, 2020 · 8d0a10c · 8d0a10c
1 parent 92eba6e
commit 8d0a10c
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -57,6 +57,25 @@ type Config struct { // nolint
 	AggregateStrategyContexts []contextDescriptor // PULLEY_STRATEGY_AGGREGATE_REPO_REGEX_<int> = repo_regex && PULLEY_STRATEGY_AGGREGATE_CONTEXT_REGEX_<int> = regex
 }
 
+func DefaultConfig() *Config {
+	var descriptors []contextDescriptor
+	descriptors = append(descriptors, contextDescriptor{
+		repo:    regexp.MustCompile(".*"),
+		context: regexp.MustCompile(":all-jobs$"),
+	})
+
+	return &Config{
+		Host:                      "localhost",
+		Port:                      "1701",
+		WebhookPath:               "",
+		WebhookToken:              make([]byte, 0),
+		Strategy:                  AggregateStrategy,
+		AggregateStrategyContexts: descriptors,
+		MetricsPath:               "metrics",
+		TrackBuildTimes:           false,
+	}
+}
+
 type ContextChecker func(repo, context string) bool
 
 func (config *Config) DefaultContextChecker() ContextChecker {
@@ -128,25 +147,6 @@ func processAggregateStrategyContexts() ([]contextDescriptor, error) {
 	return descriptors, nil
 }
 
-func DefaultConfig() *Config {
-	var descriptors []contextDescriptor
-	descriptors = append(descriptors, contextDescriptor{
-		repo:    regexp.MustCompile(".*"),
-		context: regexp.MustCompile(":all-jobs$"),
-	})
-
-	return &Config{
-		Host:                      "localhost",
-		Port:                      "1701",
-		WebhookPath:               "",
-		WebhookToken:              make([]byte, 0),
-		Strategy:                  AggregateStrategy,
-		AggregateStrategyContexts: descriptors,
-		MetricsPath:               "metrics",
-		TrackBuildTimes:           false,
-	}
-}
-
 // Setup configurations with environment variables
 func Setup() (*Config, error) {
 	config := DefaultConfig()