Move systemd spec functions to separate file

Also removes a type we weren't using and adds additional helpers to
reduce boiler plate.

Signed-off-by: Brian Goff <[email protected]>

Author: cpuguy83

frontend/rpm/template.go

@@ -441,7 +441,7 @@ func (w *specWrapper) Install() fmt.Stringer {
 		return b
 	}
 
-	copyArtifact := func(root, p string, cfg dalec.ArtifactConfig) {
+	copyArtifact := func(root, p string, cfg *dalec.ArtifactConfig) {
 		targetDir := filepath.Join(root, cfg.SubPath)
 		fmt.Fprintln(b, "mkdir -p", targetDir)
 
@@ -458,13 +458,13 @@ func (w *specWrapper) Install() fmt.Stringer {
 	binKeys := dalec.SortMapKeys(w.Spec.Artifacts.Binaries)
 	for _, p := range binKeys {
 		cfg := w.Spec.Artifacts.Binaries[p]
-		copyArtifact(`%{buildroot}/%{_bindir}`, p, cfg)
+		copyArtifact(`%{buildroot}/%{_bindir}`, p, &cfg)
 	}
 
 	manKeys := dalec.SortMapKeys(w.Spec.Artifacts.Manpages)
 	for _, p := range manKeys {
 		cfg := w.Spec.Artifacts.Manpages[p]
-		copyArtifact(`%{buildroot}/%{_mandir}`, p, cfg)
+		copyArtifact(`%{buildroot}/%{_mandir}`, p, &cfg)
 	}
 
 	createArtifactDir := func(root, p string, cfg dalec.ArtifactDirConfig) {
@@ -495,14 +495,14 @@ func (w *specWrapper) Install() fmt.Stringer {
 		dataFileKeys := dalec.SortMapKeys(w.Spec.Artifacts.DataDirs)
 		for _, k := range dataFileKeys {
 			df := w.Spec.Artifacts.DataDirs[k]
-			copyArtifact(`%{buildroot}/%{_datadir}`, k, df)
+			copyArtifact(`%{buildroot}/%{_datadir}`, k, &df)
 		}
 	}
 
 	configKeys := dalec.SortMapKeys(w.Spec.Artifacts.ConfigFiles)
 	for _, c := range configKeys {
 		cfg := w.Spec.Artifacts.ConfigFiles[c]
-		copyArtifact(`%{buildroot}/%{_sysconfdir}`, c, cfg)
+		copyArtifact(`%{buildroot}/%{_sysconfdir}`, c, &cfg)
 	}
 
 	if w.Spec.Artifacts.Systemd != nil {
@@ -524,14 +524,14 @@ func (w *specWrapper) Install() fmt.Stringer {
 	for _, d := range docKeys {
 		cfg := w.Spec.Artifacts.Docs[d]
 		root := filepath.Join(`%{buildroot}/%{_docdir}`, w.Name)
-		copyArtifact(root, d, cfg)
+		copyArtifact(root, d, &cfg)
 	}
 
 	licenseKeys := dalec.SortMapKeys(w.Spec.Artifacts.Licenses)
 	for _, l := range licenseKeys {
 		cfg := w.Spec.Artifacts.Licenses[l]
 		root := filepath.Join(`%{buildroot}/%{_licensedir}`, w.Name)
-		copyArtifact(root, l, cfg)
+		copyArtifact(root, l, &cfg)
 	}
 
 	b.WriteString("\n")

spec.go

@@ -146,46 +146,6 @@ type Artifacts struct {
 	// TODO: other types of artifacts (libexec, etc)
 }
 
-type SystemdConfiguration struct {
-	// Units is a list of systemd units to include in the package.
-	Units map[string]SystemdUnitConfig `yaml:"units,omitempty" json:"units,omitempty"`
-	// Dropins is a list of systemd drop in files that should be included in the package
-	Dropins map[string]SystemdDropinConfig `yaml:"dropins,omitempty" json:"dropins,omitempty"`
-}
-
-type SystemdUnitConfig struct {
-	// Name is the name systemd unit should be copied under.
-	// Nested paths are not supported. It is the user's responsibility
-	// to name the service with the appropriate extension, i.e. .service, .timer, etc.
-	Name string `yaml:"name,omitempty" json:"name"`
-
-	// Enable is used to enable the systemd unit on install
-	// This determines what will be written to a systemd preset file
-	Enable bool `yaml:"enable,omitempty" json:"enable"`
-}
-
-func (s SystemdUnitConfig) Artifact() ArtifactConfig {
-	return ArtifactConfig{
-		SubPath: "",
-		Name:    s.Name,
-	}
-}
-
-type SystemdDropinConfig struct {
-	// Name is file or dir name to use for the artifact in the package.
-	// If empty, the file or dir name from the produced artifact will be used.
-	Name string `yaml:"name,omitempty" json:"name,omitempty"`
-	// Unit is the name of the systemd unit that the dropin files should be copied under.
-	Unit string `yaml:"unit" json:"unit"` // the unit named foo.service maps to the directory foo.service.d
-}
-
-func (s SystemdDropinConfig) Artifact() ArtifactConfig {
-	return ArtifactConfig{
-		SubPath: fmt.Sprintf("%s.d", s.Unit),
-		Name:    s.Name,
-	}
-}
-
 // CreateArtifactDirectories describes various directories that should be created on install.
 // CreateArtifactDirectories represents different directory paths that are common to RPM systems.
 type CreateArtifactDirectories struct {
@@ -222,23 +182,6 @@ func (a *ArtifactConfig) ResolveName(path string) string {
 	return filepath.Base(path)
 }
 
-// ServiceConfig is the configuration for a service to include in the package.
-type ServiceConfig struct {
-	Name string `yaml:"name" json:"name" jsonschema:"omitempty"`
-
-	// Some services don't support restarting, in which case this should be set to true
-	NoRestart bool `yaml:"noRestart,omitempty" json:"noRestart,omitempty"`
-
-	Disable bool `yaml:"disable,omitempty" json:"disable,omitempty"`
-}
-
-func (s ServiceConfig) Artifact() ArtifactConfig {
-	return ArtifactConfig{
-		SubPath: "",
-		Name:    s.Name,
-	}
-}
-
 // IsEmpty is used to determine if there are any artifacts to include in the package.
 func (a *Artifacts) IsEmpty() bool {
 	if len(a.Binaries) > 0 {

systemd.go

@@ -0,0 +1,73 @@
+package dalec
+
+import (
+	"fmt"
+	"maps"
+	"strings"
+)
+
+type SystemdConfiguration struct {
+	// Units is a list of systemd units to include in the package.
+	Units map[string]SystemdUnitConfig `yaml:"units,omitempty" json:"units,omitempty"`
+	// Dropins is a list of systemd drop in files that should be included in the package
+	Dropins map[string]SystemdDropinConfig `yaml:"dropins,omitempty" json:"dropins,omitempty"`
+}
+
+type SystemdUnitConfig struct {
+	// Name is the name systemd unit should be copied under.
+	// Nested paths are not supported. It is the user's responsibility
+	// to name the service with the appropriate extension, i.e. .service, .timer, etc.
+	Name string `yaml:"name,omitempty" json:"name"`
+
+	// Enable is used to enable the systemd unit on install
+	// This determines what will be written to a systemd preset file
+	Enable bool `yaml:"enable,omitempty" json:"enable"`
+}
+
+func (s SystemdUnitConfig) Artifact() *ArtifactConfig {
+	return &ArtifactConfig{
+		SubPath: "",
+		Name:    s.Name,
+	}
+}
+
+func (s SystemdUnitConfig) ResolveName(name string) string {
+	return s.Artifact().ResolveName(name)
+}
+
+// Splitname resolves a unit name and then gives its unit base name.
+// E.g. for  `foo.socket` this would be `foo` and `socket`.
+func (s SystemdUnitConfig) SplitName(name string) (string, string) {
+	name = s.ResolveName(name)
+	base, other, _ := strings.Cut(name, ".")
+	return base, other
+}
+
+type SystemdDropinConfig struct {
+	// Name is file or dir name to use for the artifact in the package.
+	// If empty, the file or dir name from the produced artifact will be used.
+	Name string `yaml:"name,omitempty" json:"name,omitempty"`
+	// Unit is the name of the systemd unit that the dropin files should be copied under.
+	Unit string `yaml:"unit" json:"unit"` // the unit named foo.service maps to the directory foo.service.d
+}
+
+func (s SystemdDropinConfig) Artifact() *ArtifactConfig {
+	return &ArtifactConfig{
+		SubPath: fmt.Sprintf("%s.d", s.Unit),
+		Name:    s.Name,
+	}
+}
+
+func (s *SystemdConfiguration) GetUnits() map[string]SystemdUnitConfig {
+	if s == nil {
+		return nil
+	}
+	return maps.Clone(s.Units)
+}
+
+func (s *SystemdConfiguration) GetDropins() map[string]SystemdDropinConfig {
+	if s == nil {
+		return nil
+	}
+	return maps.Clone(s.Dropins)
+}