Move function to method on system artifacts

We can test nil-ness inside the method.
Azure · Jun 28, 2024 · 2276f8f · 2276f8f
1 parent 3c223e2
commit 2276f8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/frontend/rpm/template.go b/frontend/rpm/template.go
@@ -294,7 +294,7 @@ func (w *specWrapper) BuildSteps() fmt.Stringer {
 func (w *specWrapper) PreUn() fmt.Stringer {
  b := &strings.Builder{}
 
- if dalec.SystemdIsEmpty(w.Artifacts.Systemd) {
+ if w.Artifacts.Systemd.IsEmpty() {
  return b
  }
 
@@ -311,7 +311,7 @@ func (w *specWrapper) PreUn() fmt.Stringer {
 func (w *specWrapper) Post() fmt.Stringer {
  b := &strings.Builder{}
 
- if dalec.SystemdIsEmpty(w.Artifacts.Systemd) {
+ if w.Artifacts.Systemd.IsEmpty() {
  return b
  }
 
@@ -330,7 +330,7 @@ func (w *specWrapper) Post() fmt.Stringer {
 func (w *specWrapper) PostUn() fmt.Stringer {
  b := &strings.Builder{}
 
- if dalec.SystemdIsEmpty(w.Artifacts.Systemd) {
+ if w.Artifacts.Systemd.IsEmpty() {
  return b
  }
 

diff --git a/spec.go b/spec.go
@@ -683,7 +683,7 @@ func (c *CheckOutputError) Error() string {
  return fmt.Sprintf("expected %q %s %q, got %q", c.Path, c.Kind, c.Expected, c.Actual)
 }
 
-func SystemdIsEmpty(s *SystemdConfiguration) bool {
+func (s *SystemdConfiguration) IsEmpty() bool {
  if s == nil {
  return true
  }