fix(schedule,ntp,certificate): errors read as the convention says

internal/provider/node/certificate/debian.go

@@ -104,12 +104,12 @@ func (d *Debian) Create(
 		Metadata:   map[string]string{"source": "custom"},
 	})
 	if err != nil {
-		return nil, fmt.Errorf("create certificate: %w", err)
+		return nil, fmt.Errorf("certificate create: %w", err)
 	}
 
 	if result.Changed {
 		if err := d.updateCACertificates(ctx); err != nil {
-			return nil, fmt.Errorf("create certificate: %w", err)
+			return nil, fmt.Errorf("certificate create: %w", err)
 		}
 	}
 
@@ -153,12 +153,12 @@ func (d *Debian) Update(
 		Metadata:   map[string]string{"source": "custom"},
 	})
 	if err != nil {
-		return nil, fmt.Errorf("update certificate: %w", err)
+		return nil, fmt.Errorf("certificate update: %w", err)
 	}
 
 	if result.Changed {
 		if err := d.updateCACertificates(ctx); err != nil {
-			return nil, fmt.Errorf("update certificate: %w", err)
+			return nil, fmt.Errorf("certificate update: %w", err)
 		}
 	}
 
@@ -190,12 +190,12 @@ func (d *Debian) Delete(
 		Path: filePath,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("delete certificate: %w", err)
+		return nil, fmt.Errorf("certificate delete: %w", err)
 	}
 
 	if result.Changed {
 		if err := d.updateCACertificates(ctx); err != nil {
-			return nil, fmt.Errorf("delete certificate: %w", err)
+			return nil, fmt.Errorf("certificate delete: %w", err)
 		}
 	}
 
@@ -218,7 +218,7 @@ func (d *Debian) updateCACertificates(
 ) error {
 	_, err := d.execManager.RunPrivilegedCmd(ctx, "update-ca-certificates", nil)
 	if err != nil {
-		return fmt.Errorf("update-ca-certificates: %w", err)
+		return fmt.Errorf("certificate update: update-ca-certificates: %w", err)
 	}
 
 	return nil
@@ -275,11 +275,11 @@ func validateName(
 	name string,
 ) error {
 	if name == "" {
-		return fmt.Errorf("invalid certificate name: empty")
+		return fmt.Errorf("certificate: name must not be empty")
 	}
 	if !validName.MatchString(name) {
 		return fmt.Errorf(
-			"invalid certificate name %q: must match %s",
+			"certificate: name %q must match %s",
 			name,
 			validName.String(),
 		)

internal/provider/node/certificate/debian_list.go

@@ -34,7 +34,7 @@ func (d *Debian) List(
 ) ([]Entry, error) {
 	systemCAs, err := d.listSystemCAs()
 	if err != nil {
-		return nil, fmt.Errorf("list certificates: %w", err)
+		return nil, fmt.Errorf("certificate list: %w", err)
 	}
 
 	customCAs := d.listCustomCAs(ctx)

internal/provider/node/certificate/debian_list_public_test.go

@@ -171,7 +171,7 @@ func (suite *DebianListPublicTestSuite) TestList() {
 			) {
 				suite.Error(err)
 				suite.Nil(entries)
-				suite.Contains(err.Error(), "list certificates")
+				suite.Contains(err.Error(), "certificate list")
 			},
 		},
 		{

internal/provider/node/certificate/debian_public_test.go

@@ -192,7 +192,7 @@ func (suite *DebianPublicTestSuite) TestCreate() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "create certificate")
+				suite.Contains(err.Error(), "certificate create")
 			},
 		},
 		{
@@ -231,7 +231,7 @@ func (suite *DebianPublicTestSuite) TestCreate() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "invalid certificate name")
+				suite.Contains(err.Error(), "certificate: name")
 			},
 		},
 		{
@@ -247,7 +247,7 @@ func (suite *DebianPublicTestSuite) TestCreate() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "invalid certificate name")
+				suite.Contains(err.Error(), "certificate: name")
 			},
 		},
 		{
@@ -360,7 +360,7 @@ func (suite *DebianPublicTestSuite) TestUpdate() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "update certificate")
+				suite.Contains(err.Error(), "certificate update")
 			},
 		},
 		{
@@ -430,7 +430,7 @@ func (suite *DebianPublicTestSuite) TestUpdate() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "invalid certificate name")
+				suite.Contains(err.Error(), "certificate: name")
 			},
 		},
 		{
@@ -606,7 +606,7 @@ func (suite *DebianPublicTestSuite) TestDelete() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "delete certificate")
+				suite.Contains(err.Error(), "certificate delete")
 			},
 		},
 		{
@@ -644,7 +644,7 @@ func (suite *DebianPublicTestSuite) TestDelete() {
 			) {
 				suite.Error(err)
 				suite.Nil(result)
-				suite.Contains(err.Error(), "invalid certificate name")
+				suite.Contains(err.Error(), "certificate: name")
 			},
 		},
 	}

internal/provider/node/ntp/debian.go

@@ -77,14 +77,14 @@ func (d *Debian) Get(
 ) (*Status, error) {
 	trackingOutput, err := d.execManager.RunCmd(ctx, "chronyc", []string{"tracking"})
 	if err != nil {
-		return nil, fmt.Errorf("ntp: chronyc tracking: %w", err)
+		return nil, fmt.Errorf("ntp get: chronyc tracking: %w", err)
 	}
 
 	status := parseTracking(trackingOutput)
 
 	sourcesOutput, err := d.execManager.RunCmd(ctx, "chronyc", []string{"sources", "-c"})
 	if err != nil {
-		return nil, fmt.Errorf("ntp: chronyc sources: %w", err)
+		return nil, fmt.Errorf("ntp list: chronyc sources: %w", err)
 	}
 
 	status.Servers = parseSources(sourcesOutput)
@@ -113,7 +113,7 @@ func (d *Debian) Create(
 	}
 
 	if mkErr := d.fs.MkdirAll(sourcesDir, 0o755); mkErr != nil {
-		return nil, fmt.Errorf("ntp: create directory: %w", mkErr)
+		return nil, fmt.Errorf("ntp create: create directory: %w", mkErr)
 	}
 
 	if writeErr := fsutil.WriteFileAtomic(
@@ -122,7 +122,7 @@ func (d *Debian) Create(
 		content,
 		0o644,
 	); writeErr != nil {
-		return nil, fmt.Errorf("ntp: write file: %w", writeErr)
+		return nil, fmt.Errorf("ntp create: write file: %w", writeErr)
 	}
 
 	d.reloadSources(ctx)
@@ -145,7 +145,7 @@ func (d *Debian) Update(
 ) (*UpdateResult, error) {
 	existing, err := d.fs.ReadFile(sourcesFile)
 	if err != nil {
-		return nil, fmt.Errorf("ntp config: %w", provider.ErrNotManaged)
+		return nil, fmt.Errorf("ntp update: %w", provider.ErrNotManaged)
 	}
 
 	content := generateContent(config.Servers)
@@ -167,7 +167,7 @@ func (d *Debian) Update(
 		content,
 		0o644,
 	); writeErr != nil {
-		return nil, fmt.Errorf("ntp: write file: %w", writeErr)
+		return nil, fmt.Errorf("ntp create: write file: %w", writeErr)
 	}
 
 	d.reloadSources(ctx)
@@ -187,11 +187,11 @@ func (d *Debian) Delete(
 	ctx context.Context,
 ) (*DeleteResult, error) {
 	if _, err := d.fs.Stat(sourcesFile); err != nil {
-		return nil, fmt.Errorf("ntp config: %w", provider.ErrNotManaged)
+		return nil, fmt.Errorf("ntp update: %w", provider.ErrNotManaged)
 	}
 
 	if removeErr := d.fs.Remove(sourcesFile); removeErr != nil {
-		return nil, fmt.Errorf("ntp: remove file: %w", removeErr)
+		return nil, fmt.Errorf("ntp delete: remove file: %w", removeErr)
 	}
 
 	d.reloadSources(ctx)

internal/provider/node/ntp/debian_public_test.go

@@ -155,7 +155,7 @@ Leap status     : Not synchronised`
 			validateFunc: func(got *ntp.Status, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp: chronyc tracking: command not found")
+				suite.Contains(err.Error(), "ntp get: chronyc tracking: command not found")
 			},
 		},
 		{
@@ -171,7 +171,7 @@ Leap status     : Not synchronised`
 			validateFunc: func(got *ntp.Status, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp: chronyc sources: connection refused")
+				suite.Contains(err.Error(), "ntp list: chronyc sources: connection refused")
 			},
 		},
 	}
@@ -296,7 +296,7 @@ func (suite *DebianPublicTestSuite) TestCreate() {
 			validateFunc: func(got *ntp.CreateResult, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp: create directory: permission denied")
+				suite.Contains(err.Error(), "ntp create: create directory: permission denied")
 			},
 		},
 		{
@@ -330,7 +330,7 @@ func (suite *DebianPublicTestSuite) TestCreate() {
 			validateFunc: func(got *ntp.CreateResult, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp: write file: create temp file")
+				suite.Contains(err.Error(), "ntp create: write file: create temp file")
 			},
 		},
 		{
@@ -432,7 +432,7 @@ func (suite *DebianPublicTestSuite) TestUpdate() {
 			validateFunc: func(got *ntp.UpdateResult, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp config: not managed by osapi")
+				suite.Contains(err.Error(), "ntp update: not managed by osapi")
 			},
 		},
 		{
@@ -477,7 +477,7 @@ func (suite *DebianPublicTestSuite) TestUpdate() {
 			validateFunc: func(got *ntp.UpdateResult, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp: write file: create temp file")
+				suite.Contains(err.Error(), "ntp create: write file: create temp file")
 			},
 		},
 		{
@@ -555,7 +555,7 @@ func (suite *DebianPublicTestSuite) TestDelete() {
 			validateFunc: func(got *ntp.DeleteResult, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp config: not managed by osapi")
+				suite.Contains(err.Error(), "ntp update: not managed by osapi")
 			},
 		},
 		{
@@ -587,7 +587,7 @@ func (suite *DebianPublicTestSuite) TestDelete() {
 			validateFunc: func(got *ntp.DeleteResult, err error) {
 				suite.Require().Error(err)
 				suite.Nil(got)
-				suite.Contains(err.Error(), "ntp: remove file: permission denied")
+				suite.Contains(err.Error(), "ntp delete: remove file: permission denied")
 			},
 		},
 		{

internal/provider/schedule/cron/debian.go

@@ -93,7 +93,7 @@ func (d *Debian) List(
 	// Scan /etc/cron.d/ for schedule-based entries.
 	cronDirEntries, err := d.fs.ReadDir(cronDir)
 	if err != nil {
-		return nil, fmt.Errorf("list cron entries: %w", err)
+		return nil, fmt.Errorf("schedule list: %w", err)
 	}
 
 	for _, dirEntry := range cronDirEntries {
@@ -152,18 +152,18 @@ func (d *Debian) Get(
 
 	filePath, _ := d.findEntryPath(name)
 	if filePath == "" {
-		return nil, fmt.Errorf("cron entry %q: %w", name, provider.ErrNotFound)
+		return nil, fmt.Errorf("schedule %q: %w", name, provider.ErrNotFound)
 	}
 
 	if !d.isManagedFile(ctx, filePath) {
-		return nil, fmt.Errorf("cron entry %q: %w", name, provider.ErrNotManaged)
+		return nil, fmt.Errorf("schedule %q: %w", name, provider.ErrNotManaged)
 	}
 
 	source := d.sourceForPath(filePath)
 
 	entry := d.buildEntryFromState(ctx, name, filePath, source)
 	if entry == nil {
-		return nil, fmt.Errorf("cron entry %q: failed to read state", name)
+		return nil, fmt.Errorf("schedule %q: read state", name)
 	}
 
 	return entry, nil
@@ -204,7 +204,7 @@ func (d *Debian) Create(
 		Metadata:    buildCronMetadata(entry),
 	})
 	if err != nil {
-		return nil, fmt.Errorf("create cron entry: %w", err)
+		return nil, fmt.Errorf("schedule create: %w", err)
 	}
 
 	return &CreateResult{
@@ -224,7 +224,7 @@ func (d *Debian) Update(
 
 	filePath, perm := d.findEntryPath(entry.Name)
 	if filePath == "" {
-		return nil, fmt.Errorf("cron entry %q: %w", entry.Name, provider.ErrNotManaged)
+		return nil, fmt.Errorf("schedule %q: %w", entry.Name, provider.ErrNotManaged)
 	}
 
 	// If no new object was specified, preserve the current one.
@@ -248,7 +248,7 @@ func (d *Debian) Update(
 		Metadata:    buildCronMetadata(entry),
 	})
 	if err != nil {
-		return nil, fmt.Errorf("update cron entry: %w", err)
+		return nil, fmt.Errorf("schedule update: %w", err)
 	}
 
 	return &UpdateResult{
@@ -278,7 +278,7 @@ func (d *Debian) Delete(
 		Path: filePath,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("delete cron entry: %w", err)
+		return nil, fmt.Errorf("schedule delete: %w", err)
 	}
 
 	return &DeleteResult{
@@ -417,10 +417,10 @@ func validateName(
 	name string,
 ) error {
 	if name == "" {
-		return fmt.Errorf("invalid cron entry name: empty")
+		return fmt.Errorf("schedule: name must not be empty")
 	}
 	if !validName.MatchString(name) {
-		return fmt.Errorf("invalid cron entry name %q: must match %s", name, validName.String())
+		return fmt.Errorf("schedule: name %q must match %s", name, validName.String())
 	}
 
 	return nil