Fix outdated callsites in error strings

offen · Feb 16, 2024 · 2bd416a · 2bd416a
1 parent f393844
commit 2bd416a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cmd/backup/command.go b/cmd/backup/command.go
@@ -123,7 +123,7 @@ func (c *command) schedule(strategy configStrategy) error {
 		})
 
 		if err != nil {
-			return fmt.Errorf("addJob: error adding schedule %s: %w", config.BackupCronExpression, err)
+			return fmt.Errorf("schedule: error adding schedule %s: %w", config.BackupCronExpression, err)
 		}
 		c.logger.Info(fmt.Sprintf("Successfully scheduled backup %s with expression %s", config.source, config.BackupCronExpression))
 		if ok := checkCronSchedule(config.BackupCronExpression); !ok {

diff --git a/cmd/backup/config_provider.go b/cmd/backup/config_provider.go
@@ -77,7 +77,7 @@ func loadConfig(lookup envProxy) (*Config, error) {
 func loadConfigFromEnvVars() (*Config, error) {
 	c, err := loadConfig(os.LookupEnv)
 	if err != nil {
-		return nil, fmt.Errorf("loadEnvVars: error loading config from environment: %w", err)
+		return nil, fmt.Errorf("loadConfigFromEnvVars: error loading config from environment: %w", err)
 	}
 	c.source = "from environment"
 	return c, nil
@@ -89,7 +89,7 @@ func loadConfigsFromEnvFiles(directory string) ([]*Config, error) {
 		if os.IsNotExist(err) {
 			return nil, err
 		}
-		return nil, fmt.Errorf("loadEnvFiles: failed to read files from env directory: %w", err)
+		return nil, fmt.Errorf("loadConfigsFromEnvFiles: failed to read files from env directory: %w", err)
 	}
 
 	configs := []*Config{}
@@ -100,11 +100,11 @@ func loadConfigsFromEnvFiles(directory string) ([]*Config, error) {
 		p := filepath.Join(directory, item.Name())
 		f, err := os.ReadFile(p)
 		if err != nil {
-			return nil, fmt.Errorf("loadEnvFiles: error reading %s: %w", item.Name(), err)
+			return nil, fmt.Errorf("loadConfigsFromEnvFiles: error reading %s: %w", item.Name(), err)
 		}
 		envFile, err := godotenv.Unmarshal(os.ExpandEnv(string(f)))
 		if err != nil {
-			return nil, fmt.Errorf("loadEnvFiles: error reading config file %s: %w", p, err)
+			return nil, fmt.Errorf("loadConfigsFromEnvFiles: error reading config file %s: %w", p, err)
 		}
 		lookup := func(key string) (string, bool) {
 			val, ok := envFile[key]
@@ -115,7 +115,7 @@ func loadConfigsFromEnvFiles(directory string) ([]*Config, error) {
 		}
 		c, err := loadConfig(lookup)
 		if err != nil {
-			return nil, fmt.Errorf("loadEnvFiles: error loading config from file %s: %w", p, err)
+			return nil, fmt.Errorf("loadConfigsFromEnvFiles: error loading config from file %s: %w", p, err)
 		}
 		c.source = item.Name()
 		c.additionalEnvVars = envFile

diff --git a/cmd/backup/stop_restart.go b/cmd/backup/stop_restart.go
@@ -52,7 +52,7 @@ func awaitContainerCountForService(cli *client.Client, serviceID string, count i
 		select {
 		case <-timeout.C:
 			return fmt.Errorf(
-				"awaitContainerCount: timed out after waiting %s for service %s to reach desired container count of %d",
+				"awaitContainerCountForService: timed out after waiting %s for service %s to reach desired container count of %d",
 				timeoutAfter,
 				serviceID,
 				count,
@@ -65,7 +65,7 @@ func awaitContainerCountForService(cli *client.Client, serviceID string, count i
 				}),
 			})
 			if err != nil {
-				return fmt.Errorf("awaitContainerCount: error listing containers: %w", err)
+				return fmt.Errorf("awaitContainerCountForService: error listing containers: %w", err)
 			}
 			if len(containers) == count {
 				return nil