More efficient error messages

Author: javuto

cmd/cli/main.go

@@ -2050,13 +2050,13 @@ func cliWrapper(action func(*cli.Context) error) func(*cli.Context) error {
 				log.Debug().Msg("Initializing DB from file")
 				db, err = backend.CreateDBManagerFile(dbConfigFile)
 				if err != nil {
-					return fmt.Errorf("error in CreateDBManagerFile - %w", err)
+					return fmt.Errorf("in CreateDBManagerFile - %w", err)
 				}
 			} else {
 				log.Debug().Msg("Creating DB manager from config")
 				db, err = backend.CreateDBManager(dbConfig)
 				if err != nil {
-					return fmt.Errorf("error in CreateDBManager - %w", err)
+					return fmt.Errorf("in CreateDBManager - %w", err)
 				}
 			}
 			// Initialize users

cmd/tls/handlers/post.go

@@ -93,7 +93,7 @@ func (h *HandlersTLS) EnrollHandler(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	} else {
-		log.Err(err).Msg("error invalid enrolling secret")
+		log.Err(err).Msg("invalid enrolling secret")
 		utils.HTTPResponse(w, "", http.StatusForbidden, []byte(""))
 		return
 	}

pkg/environments/osqueryconf.go

@@ -233,7 +233,7 @@ func (environment *EnvManager) NodePacksEntries(configuration []byte, platform s
 func (environment *EnvManager) GenPacksEntries(configuration []byte) (PacksEntries, error) {
 	packsConf, err := environment.GenStructPacks(configuration)
 	if err != nil {
-		return PacksEntries{}, fmt.Errorf("error in GenStructPacks %w", err)
+		return PacksEntries{}, fmt.Errorf("in GenStructPacks %w", err)
 	}
 	packsEntries := make(PacksEntries)
 	for k, p := range packsConf {
@@ -243,11 +243,11 @@ func (environment *EnvManager) GenPacksEntries(configuration []byte) (PacksEntri
 		default:
 			rawdata, err := json.Marshal(v)
 			if err != nil {
-				return PacksEntries{}, fmt.Errorf("error in Marshal %w", err)
+				return PacksEntries{}, fmt.Errorf("in Marshal %w", err)
 			}
 			var parsed PackEntry
 			if err := json.Unmarshal(rawdata, &parsed); err != nil {
-				return PacksEntries{}, fmt.Errorf("error in Unmarshal %w", err)
+				return PacksEntries{}, fmt.Errorf("in Unmarshal %w", err)
 			}
 			packsEntries[k] = parsed
 		}

pkg/nodes/nodes.go

@@ -361,7 +361,7 @@ func (n *NodeManager) Archive(uuid, trigger string) error {
 	}
 	archivedNode := nodeArchiveFromNode(node, trigger)
 	if err := n.DB.Create(&archivedNode).Error; err != nil {
-		return fmt.Errorf("error in Create %w", err)
+		return fmt.Errorf("in Create %w", err)
 	}
 	return nil
 }
@@ -373,7 +373,7 @@ func (n *NodeManager) UpdateByUUID(data OsqueryNode, uuid string) error {
 		return fmt.Errorf("getNodeByUUID %w", err)
 	}
 	if err := n.DB.Model(&node).Updates(data).Error; err != nil {
-		return fmt.Errorf("error in UpdateByUUID %w", err)
+		return fmt.Errorf("in UpdateByUUID %w", err)
 	}
 	return nil
 }

pkg/queries/saved.go

@@ -60,7 +60,7 @@ func (q *Queries) UpdateSaved(name, query, creator string, envid uint) error {
 		EnvironmentID: envid,
 	}
 	if err := q.DB.Model(&saved).Updates(data).Error; err != nil {
-		return fmt.Errorf("error in Updates %w", err)
+		return fmt.Errorf("in Updates %w", err)
 	}
 	return nil
 }
@@ -72,7 +72,7 @@ func (q *Queries) DeleteSaved(name, creator string, envid uint) error {
 		return fmt.Errorf("error getting saved query %w", err)
 	}
 	if err := q.DB.Unscoped().Delete(&saved).Error; err != nil {
-		return fmt.Errorf("error in DeleteSaved %w", err)
+		return fmt.Errorf("in DeleteSaved %w", err)
 	}
 	return nil
 }