Port configuration to ccConfig scheme

Decentralize config validation
Modularize configuration handling

pkg/archive/ConfigSchema.go

@@ -0,0 +1,49 @@
+// Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
+// All rights reserved. This file is part of cc-backend.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+package archive
+
+var configSchema = `
+	{
+      "type": "object",
+      "properties": {
+        "kind": {
+          "description": "Backend type for job-archive",
+          "type": "string",
+          "enum": ["file", "s3"]
+        },
+        "path": {
+          "description": "Path to job archive for file backend",
+          "type": "string"
+        },
+        "compression": {
+          "description": "Setup automatic compression for jobs older than number of days",
+          "type": "integer"
+        },
+        "retention": {
+          "description": "Configuration keys for retention",
+          "type": "object",
+          "properties": {
+            "policy": {
+              "description": "Retention policy",
+              "type": "string",
+              "enum": ["none", "delete", "move"]
+            },
+            "includeDB": {
+              "description": "Also remove jobs from database",
+              "type": "boolean"
+            },
+            "age": {
+              "description": "Act on jobs with startTime older than age (in days)",
+              "type": "integer"
+            },
+            "location": {
+              "description": "The target directory for retention. Only applicable for retention move.",
+              "type": "string"
+            }
+          },
+          "required": ["policy"]
+        }
+      },
+      "required": ["kind"]}`

pkg/archive/archive.go

@@ -10,6 +10,7 @@ import (
 	"maps"
 	"sync"
 
+	"github.com/ClusterCockpit/cc-backend/internal/config"
 	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/ClusterCockpit/cc-lib/lrucache"
 	"github.com/ClusterCockpit/cc-lib/schema"
@@ -74,6 +75,7 @@ func Init(rawConfig json.RawMessage, disableArchive bool) error {
 			Kind string `json:"kind"`
 		}
 
+		config.Validate(configSchema, rawConfig)
 		if err = json.Unmarshal(rawConfig, &cfg); err != nil {
 			cclog.Warn("Error while unmarshaling raw config json")
 			return

pkg/archive/fsBackend.go

@@ -147,17 +147,17 @@ func loadJobStats(filename string, isCompressed bool) (schema.ScopedJobStats, er
 }
 
 func (fsa *FsArchive) Init(rawConfig json.RawMessage) (uint64, error) {
-	var config FsArchiveConfig
-	if err := json.Unmarshal(rawConfig, &config); err != nil {
+	var cfg FsArchiveConfig
+	if err := json.Unmarshal(rawConfig, &cfg); err != nil {
 		cclog.Warnf("Init() > Unmarshal error: %#v", err)
 		return 0, err
 	}
-	if config.Path == "" {
+	if cfg.Path == "" {
 		err := fmt.Errorf("Init() : empty config.Path")
 		cclog.Errorf("Init() > config.Path error: %v", err)
 		return 0, err
 	}
-	fsa.path = config.Path
+	fsa.path = cfg.Path
 
 	b, err := os.ReadFile(filepath.Join(fsa.path, "version.txt"))
 	if err != nil {

pkg/archive/fsBackend_test.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved. This file is part of cc-backend.
+// All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package archive

pkg/runtimeEnv/setup.go

@@ -1,73 +0,0 @@
-// Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved. This file is part of cc-backend.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-package runtimeEnv
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"os/user"
-	"strconv"
-	"syscall"
-
-	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
-)
-
-// Changes the processes user and group to that
-// specified in the config.json. The go runtime
-// takes care of all threads (and not only the calling one)
-// executing the underlying systemcall.
-func DropPrivileges(username string, group string) error {
-	if group != "" {
-		g, err := user.LookupGroup(group)
-		if err != nil {
-			cclog.Warn("Error while looking up group")
-			return err
-		}
-
-		gid, _ := strconv.Atoi(g.Gid)
-		if err := syscall.Setgid(gid); err != nil {
-			cclog.Warn("Error while setting gid")
-			return err
-		}
-	}
-
-	if username != "" {
-		u, err := user.Lookup(username)
-		if err != nil {
-			cclog.Warn("Error while looking up user")
-			return err
-		}
-
-		uid, _ := strconv.Atoi(u.Uid)
-		if err := syscall.Setuid(uid); err != nil {
-			cclog.Warn("Error while setting uid")
-			return err
-		}
-	}
-
-	return nil
-}
-
-// If started via systemd, inform systemd that we are running:
-// https://www.freedesktop.org/software/systemd/man/sd_notify.html
-func SystemdNotifiy(ready bool, status string) {
-	if os.Getenv("NOTIFY_SOCKET") == "" {
-		// Not started using systemd
-		return
-	}
-
-	args := []string{fmt.Sprintf("--pid=%d", os.Getpid())}
-	if ready {
-		args = append(args, "--ready")
-	}
-
-	if status != "" {
-		args = append(args, fmt.Sprintf("--status=%s", status))
-	}
-
-	cmd := exec.Command("systemd-notify", args...)
-	cmd.Run() // errors ignored on purpose, there is not much to do anyways.
-}