Skip to content

fix(service,user): errors read as the convention says #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
retr0h merged 1 commit into from
Oct 2, 2026
Merged

fix(service,user): errors read as the convention says #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/provider/node/service/debian.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ func validateName(
name string,
) error {
if name == "" {
return fmt.Errorf("invalid service name: empty")
return fmt.Errorf("service: name must not be empty")
}
if !validName.MatchString(name) {
return fmt.Errorf(
"invalid service name %q: must match %s",
"service: name %q must match %s",
name,
validName.String(),
)
Expand Down
20 changes: 10 additions & 10 deletions internal/provider/node/service/debian_action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (d *Debian) Start(
name string,
) (*ActionResult, error) {
if err := validateName(name); err != nil {
return nil, fmt.Errorf("service: start: %w", err)
return nil, fmt.Errorf("service start: %w", err)
}

unitName := managedPrefix + name + ".service"
Expand All @@ -47,7 +47,7 @@ func (d *Debian) Start(
}

if _, err := d.execManager.RunPrivilegedCmd(ctx, "systemctl", []string{"start", unitName}); err != nil {
return nil, fmt.Errorf("service: start: %w", err)
return nil, fmt.Errorf("service start: %w", err)
}

return &ActionResult{Name: name, Changed: true}, nil
Expand All @@ -60,7 +60,7 @@ func (d *Debian) Stop(
name string,
) (*ActionResult, error) {
if err := validateName(name); err != nil {
return nil, fmt.Errorf("service: stop: %w", err)
return nil, fmt.Errorf("service stop: %w", err)
}

unitName := managedPrefix + name + ".service"
Expand All @@ -73,7 +73,7 @@ func (d *Debian) Stop(
}

if _, err := d.execManager.RunPrivilegedCmd(ctx, "systemctl", []string{"stop", unitName}); err != nil {
return nil, fmt.Errorf("service: stop: %w", err)
return nil, fmt.Errorf("service stop: %w", err)
}

return &ActionResult{Name: name, Changed: true}, nil
Expand All @@ -85,15 +85,15 @@ func (d *Debian) Restart(
name string,
) (*ActionResult, error) {
if err := validateName(name); err != nil {
return nil, fmt.Errorf("service: restart: %w", err)
return nil, fmt.Errorf("service restart: %w", err)
}

unitName := managedPrefix + name + ".service"

d.logger.Debug("executing service.Restart", slog.String("name", unitName))

if _, err := d.execManager.RunPrivilegedCmd(ctx, "systemctl", []string{"restart", unitName}); err != nil {
return nil, fmt.Errorf("service: restart: %w", err)
return nil, fmt.Errorf("service restart: %w", err)
}

return &ActionResult{Name: name, Changed: true}, nil
Expand All @@ -106,7 +106,7 @@ func (d *Debian) Enable(
name string,
) (*ActionResult, error) {
if err := validateName(name); err != nil {
return nil, fmt.Errorf("service: enable: %w", err)
return nil, fmt.Errorf("service enable: %w", err)
}

unitName := managedPrefix + name + ".service"
Expand All @@ -119,7 +119,7 @@ func (d *Debian) Enable(
}

if _, err := d.execManager.RunPrivilegedCmd(ctx, "systemctl", []string{"enable", unitName}); err != nil {
return nil, fmt.Errorf("service: enable: %w", err)
return nil, fmt.Errorf("service enable: %w", err)
}

return &ActionResult{Name: name, Changed: true}, nil
Expand All @@ -132,7 +132,7 @@ func (d *Debian) Disable(
name string,
) (*ActionResult, error) {
if err := validateName(name); err != nil {
return nil, fmt.Errorf("service: disable: %w", err)
return nil, fmt.Errorf("service disable: %w", err)
}

unitName := managedPrefix + name + ".service"
Expand All @@ -145,7 +145,7 @@ func (d *Debian) Disable(
}

if _, err := d.execManager.RunPrivilegedCmd(ctx, "systemctl", []string{"disable", unitName}); err != nil {
return nil, fmt.Errorf("service: disable: %w", err)
return nil, fmt.Errorf("service disable: %w", err)
}

return &ActionResult{Name: name, Changed: true}, nil
Expand Down
20 changes: 10 additions & 10 deletions internal/provider/node/service/debian_action_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (suite *DebianActionPublicTestSuite) TestStart() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "service: start:")
suite.Contains(err.Error(), "service start:")
},
},
{
Expand All @@ -143,7 +143,7 @@ func (suite *DebianActionPublicTestSuite) TestStart() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid service name")
suite.Contains(err.Error(), "service: name")
},
},
}
Expand Down Expand Up @@ -222,7 +222,7 @@ func (suite *DebianActionPublicTestSuite) TestStop() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "service: stop:")
suite.Contains(err.Error(), "service stop:")
},
},
{
Expand All @@ -235,7 +235,7 @@ func (suite *DebianActionPublicTestSuite) TestStop() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid service name")
suite.Contains(err.Error(), "service: name")
},
},
}
Expand Down Expand Up @@ -290,7 +290,7 @@ func (suite *DebianActionPublicTestSuite) TestRestart() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "service: restart:")
suite.Contains(err.Error(), "service restart:")
},
},
{
Expand All @@ -303,7 +303,7 @@ func (suite *DebianActionPublicTestSuite) TestRestart() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid service name")
suite.Contains(err.Error(), "service: name")
},
},
}
Expand Down Expand Up @@ -382,7 +382,7 @@ func (suite *DebianActionPublicTestSuite) TestEnable() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "service: enable:")
suite.Contains(err.Error(), "service enable:")
},
},
{
Expand All @@ -395,7 +395,7 @@ func (suite *DebianActionPublicTestSuite) TestEnable() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid service name")
suite.Contains(err.Error(), "service: name")
},
},
}
Expand Down Expand Up @@ -474,7 +474,7 @@ func (suite *DebianActionPublicTestSuite) TestDisable() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "service: disable:")
suite.Contains(err.Error(), "service disable:")
},
},
{
Expand All @@ -487,7 +487,7 @@ func (suite *DebianActionPublicTestSuite) TestDisable() {
) {
suite.Error(err)
suite.Nil(result)
suite.Contains(err.Error(), "invalid service name")
suite.Contains(err.Error(), "service: name")
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/node/service/debian_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ func (d *Debian) Get(
"--no-pager",
})
if err != nil {
return nil, fmt.Errorf("service: get: %w", err)
return nil, fmt.Errorf("service get: %w", err)
}

props, err := parseProperties(output)
if err != nil {
return nil, fmt.Errorf("service: get: %w", err)
return nil, fmt.Errorf("service get: %w", err)
}

pid, _ := strconv.Atoi(props["MainPID"])
Expand Down
6 changes: 3 additions & 3 deletions internal/provider/node/service/debian_get_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (suite *DebianGetPublicTestSuite) TestGet() {
) {
suite.Error(err)
suite.Nil(info)
suite.Contains(err.Error(), "service: get:")
suite.Contains(err.Error(), "service get:")
},
},
{
Expand Down Expand Up @@ -208,7 +208,7 @@ func (suite *DebianGetPublicTestSuite) TestGet() {
) {
suite.Error(err)
suite.Nil(info)
suite.Contains(err.Error(), "invalid service name")
suite.Contains(err.Error(), "service: name")
},
},
{
Expand All @@ -221,7 +221,7 @@ func (suite *DebianGetPublicTestSuite) TestGet() {
) {
suite.Error(err)
suite.Nil(info)
suite.Contains(err.Error(), "invalid service name: empty")
suite.Contains(err.Error(), "service: name must not be empty")
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/node/service/debian_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ func (d *Debian) List(
"--output=json",
})
if err != nil {
return nil, fmt.Errorf("service: list: %w", err)
return nil, fmt.Errorf("service list: %w", err)
}

var units []systemctlUnit
if err := json.Unmarshal([]byte(unitsJSON), &units); err != nil {
return nil, fmt.Errorf("service: list: parse units: %w", err)
return nil, fmt.Errorf("service list: parse units: %w", err)
}

enabledMap := d.buildEnabledMap(ctx)
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/node/service/debian_list_public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (suite *DebianListPublicTestSuite) TestList() {
) {
suite.Error(err)
suite.Nil(infos)
suite.Contains(err.Error(), "service: list:")
suite.Contains(err.Error(), "service list:")
},
},
{
Expand Down Expand Up @@ -229,7 +229,7 @@ func (suite *DebianListPublicTestSuite) TestList() {
) {
suite.Error(err)
suite.Nil(infos)
suite.Contains(err.Error(), "service: list: parse units:")
suite.Contains(err.Error(), "service list: parse units:")
},
},
{
Expand Down
16 changes: 8 additions & 8 deletions internal/provider/node/service/debian_unit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ func (d *Debian) Create(
Metadata: map[string]string{"source": "custom"},
})
if err != nil {
return nil, fmt.Errorf("service: create: %w", err)
return nil, fmt.Errorf("service create: %w", err)
}

if result.Changed {
if err := d.daemonReload(ctx); err != nil {
return nil, fmt.Errorf("service: create: %w", err)
return nil, fmt.Errorf("service create: %w", err)
}
}

Expand Down Expand Up @@ -97,7 +97,7 @@ func (d *Debian) Update(
existing := d.buildEntryFromState(ctx, entry.Name, filePath)
if existing == nil {
return nil, fmt.Errorf(
"service: update: failed to read existing state for %q",
"service update: failed to read existing state for %q",
entry.Name,
)
}
Expand All @@ -116,12 +116,12 @@ func (d *Debian) Update(
Metadata: map[string]string{"source": "custom"},
})
if err != nil {
return nil, fmt.Errorf("service: update: %w", err)
return nil, fmt.Errorf("service update: %w", err)
}

if result.Changed {
if err := d.daemonReload(ctx); err != nil {
return nil, fmt.Errorf("service: update: %w", err)
return nil, fmt.Errorf("service update: %w", err)
}
}

Expand Down Expand Up @@ -177,12 +177,12 @@ func (d *Debian) Delete(
Path: filePath,
})
if err != nil {
return nil, fmt.Errorf("service: delete: %w", err)
return nil, fmt.Errorf("service delete: %w", err)
}

if result.Changed {
if err := d.daemonReload(ctx); err != nil {
return nil, fmt.Errorf("service: delete: %w", err)
return nil, fmt.Errorf("service delete: %w", err)
}
}

Expand All @@ -205,7 +205,7 @@ func (d *Debian) daemonReload(
) error {
_, err := d.execManager.RunPrivilegedCmd(ctx, "systemctl", []string{"daemon-reload"})
if err != nil {
return fmt.Errorf("daemon-reload: %w", err)
return fmt.Errorf("service reload: daemon-reload: %w", err)
}

return nil
Expand Down
Loading
Loading