Port configuration to ccConfig scheme

Decentralize config validation
Modularize configuration handling

internal/taskManager/commitJobService.go

@@ -7,7 +7,6 @@ package taskManager
 import (
 	"time"
 
-	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/internal/repository"
 	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
@@ -15,8 +14,8 @@ import (
 
 func RegisterCommitJobService() {
 	var frequency string
-	if config.Keys.CronFrequency != nil && config.Keys.CronFrequency.CommitJobWorker != "" {
-		frequency = config.Keys.CronFrequency.CommitJobWorker
+	if Keys.CommitJobWorker != "" {
+		frequency = Keys.CommitJobWorker
 	} else {
 		frequency = "2m"
 	}

internal/taskManager/taskManager.go

@@ -5,9 +5,11 @@
 package taskManager
 
 import (
+	"bytes"
 	"encoding/json"
 	"time"
 
+	"github.com/ClusterCockpit/cc-backend/internal/auth"
 	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/internal/repository"
 	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
@@ -15,9 +17,26 @@ import (
 	"github.com/go-co-op/gocron/v2"
 )
 
+type Retention struct {
+	Policy    string `json:"policy"`
+	Location  string `json:"location"`
+	Age       int    `json:"age"`
+	IncludeDB bool   `json:"includeDB"`
+}
+
+type CronFrequency struct {
+	// Duration Update Worker [Defaults to '2m']
+	CommitJobWorker string `json:"commit-job-worker"`
+	// Duration Update Worker [Defaults to '5m']
+	DurationWorker string `json:"duration-worker"`
+	// Metric-Footprint Update Worker [Defaults to '10m']
+	FootprintWorker string `json:"footprint-worker"`
+}
+
 var (
 	s       gocron.Scheduler
 	jobRepo *repository.JobRepository
+	Keys    CronFrequency
 )
 
 func parseDuration(s string) (time.Duration, error) {
@@ -35,7 +54,7 @@ func parseDuration(s string) (time.Duration, error) {
 	return interval, nil
 }
 
-func Start() {
+func Start(cronCfg, archiveConfig json.RawMessage) {
 	var err error
 	jobRepo = repository.GetJobRepository()
 	s, err = gocron.NewScheduler()
@@ -47,13 +66,19 @@ func Start() {
 		RegisterStopJobsExceedTime()
 	}
 
+	dec := json.NewDecoder(bytes.NewReader(cronCfg))
+	dec.DisallowUnknownFields()
+	if err := dec.Decode(&Keys); err != nil {
+		cclog.Errorf("error while decoding ldap config: %v", err)
+	}
+
 	var cfg struct {
 		Retention   schema.Retention `json:"retention"`
 		Compression int              `json:"compression"`
 	}
 	cfg.Retention.IncludeDB = true
 
-	if err := json.Unmarshal(config.Keys.Archive, &cfg); err != nil {
+	if err := json.Unmarshal(archiveConfig, &cfg); err != nil {
 		cclog.Warn("Error while unmarshaling raw config json")
 	}
 
@@ -73,7 +98,7 @@ func Start() {
 		RegisterCompressionService(cfg.Compression)
 	}
 
-	lc := config.Keys.LdapConfig
+	lc := auth.Keys.LdapConfig
 
 	if lc != nil && lc.SyncInterval != "" {
 		RegisterLdapSyncService(lc.SyncInterval)

internal/taskManager/updateDurationService.go

@@ -7,15 +7,14 @@ package taskManager
 import (
 	"time"
 
-	"github.com/ClusterCockpit/cc-backend/internal/config"
 	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
 )
 
 func RegisterUpdateDurationWorker() {
 	var frequency string
-	if config.Keys.CronFrequency != nil && config.Keys.CronFrequency.DurationWorker != "" {
-		frequency = config.Keys.CronFrequency.DurationWorker
+	if Keys.DurationWorker != "" {
+		frequency = Keys.DurationWorker
 	} else {
 		frequency = "5m"
 	}

internal/taskManager/updateFootprintService.go

@@ -9,7 +9,6 @@ import (
 	"math"
 	"time"
 
-	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/internal/metricdata"
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
 	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
@@ -20,8 +19,8 @@ import (
 
 func RegisterFootprintWorker() {
 	var frequency string
-	if config.Keys.CronFrequency != nil && config.Keys.CronFrequency.FootprintWorker != "" {
-		frequency = config.Keys.CronFrequency.FootprintWorker
+	if Keys.FootprintWorker != "" {
+		frequency = Keys.FootprintWorker
 	} else {
 		frequency = "10m"
 	}