fix(livelog): use sentence case in livelog messages and mark them as done

kangasta · kangasta · commit 3dd35e2d647a · 2022-04-21T11:09:21.000+03:00
diff --git a/internal/commands/ipaddress/modify.go b/internal/commands/ipaddress/modify.go
@@ -51,7 +51,7 @@ func (s *modifyCommand) Execute(exec commands.Executor, arg string) (output.Outp
 	if arg == "" {
 		return nil, errors.New("need ip address to modify")
 	}
-	msg := fmt.Sprintf("modifying ip-address %v", arg)
+	msg := fmt.Sprintf("Modifying ip-address %v", arg)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/ipaddress/remove.go b/internal/commands/ipaddress/remove.go
@@ -41,7 +41,7 @@ func (s *removeCommand) InitCommand() {
 
 // Execute implements commands.MultipleArgumentCommand
 func (s *removeCommand) Execute(exec commands.Executor, arg string) (output.Output, error) {
-	msg := fmt.Sprintf("removing ip-address %v", arg)
+	msg := fmt.Sprintf("Removing ip-address %v", arg)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/network/create.go b/internal/commands/network/create.go
@@ -101,7 +101,7 @@ func (s *createCommand) ExecuteWithoutArguments(exec commands.Executor) (output.
 	}
 	svc := exec.Network()
 
-	msg := fmt.Sprintf("creating network %v", s.name)
+	msg := fmt.Sprintf("Creating network %v", s.name)
 	logline := exec.NewLogEntry(msg)
 	logline.StartedNow()
 
diff --git a/internal/commands/network/delete.go b/internal/commands/network/delete.go
@@ -37,7 +37,7 @@ func (s *deleteCommand) InitCommand() {
 // Execute implements commands.MultipleArgumentCommand
 func (s *deleteCommand) Execute(exec commands.Executor, arg string) (output.Output, error) {
 	svc := exec.Network()
-	msg := fmt.Sprintf("deleting network %v", arg)
+	msg := fmt.Sprintf("Deleting network %v", arg)
 	logline := exec.NewLogEntry(msg)
 	logline.StartedNow()
 	err := svc.DeleteNetwork(&request.DeleteNetworkRequest{
diff --git a/internal/commands/server/create.go b/internal/commands/server/create.go
@@ -312,7 +312,7 @@ func (s *createCommand) ExecuteWithoutArguments(exec commands.Executor) (output.
 	serverSvc := exec.Server()
 	planSvc := exec.Plan()
 	storageSvc := exec.Storage()
-	msg := fmt.Sprintf("creating server %v", s.params.Hostname)
+	msg := fmt.Sprintf("Creating server %v", s.params.Hostname)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/server/delete.go b/internal/commands/server/delete.go
@@ -44,7 +44,7 @@ func (s *deleteCommand) InitCommand() {
 // Execute implements commands.MultipleArgumentCommand
 func (s *deleteCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {
 	svc := exec.Server()
-	msg := fmt.Sprintf("deleting server %v", uuid)
+	msg := fmt.Sprintf("Deleting server %v", uuid)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
@@ -68,6 +68,7 @@ func (s *deleteCommand) Execute(exec commands.Executor, uuid string) (output.Out
 	}
 
 	logline.SetMessage(fmt.Sprintf("%s: done", msg))
+	logline.MarkDone()
 
 	return output.None{}, nil
 }
diff --git a/internal/commands/server/modify.go b/internal/commands/server/modify.go
@@ -98,7 +98,7 @@ func (s *modifyCommand) Execute(exec commands.Executor, uuid string) (output.Out
 		s.params.Plan = "custom" // Valid for all custom plans.
 	}
 
-	msg := fmt.Sprintf("modifying server %v", uuid)
+	msg := fmt.Sprintf("Modifying server %v", uuid)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/server/restart.go b/internal/commands/server/restart.go
@@ -56,7 +56,7 @@ func (s *restartCommand) MaximumExecutions() int {
 // Execute implements commands.MultipleArgumentCommand
 func (s *restartCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {
 	svc := exec.Server()
-	msg := fmt.Sprintf("restarting server %v", uuid)
+	msg := fmt.Sprintf("Restarting server %v", uuid)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/server/start.go b/internal/commands/server/start.go
@@ -38,7 +38,7 @@ func (s *startCommand) InitCommand() {
 // Execute implements commands.MultipleArgumentCommand
 func (s *startCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {
 	svc := exec.Server()
-	msg := fmt.Sprintf("starting server %v", uuid)
+	msg := fmt.Sprintf("Starting server %v", uuid)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/server/stop.go b/internal/commands/server/stop.go
@@ -44,7 +44,7 @@ func (s *stopCommand) InitCommand() {
 // Execute implements commands.MultipleArgumentCommand
 func (s *stopCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {
 	svc := exec.Server()
-	msg := fmt.Sprintf("stopping server %v", uuid)
+	msg := fmt.Sprintf("Stopping server %v", uuid)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
diff --git a/internal/commands/storage/backup_create.go b/internal/commands/storage/backup_create.go
@@ -57,7 +57,7 @@ func (s *createBackupCommand) Execute(exec commands.Executor, uuid string) (outp
 	if s.params.Title == "" {
 		return nil, fmt.Errorf("title is required")
 	}
-	msg := fmt.Sprintf("backing up %v", uuid)
+	msg := fmt.Sprintf("Backing up storage %v to %v", uuid, s.params.Title)
 	logline := exec.NewLogEntry(msg)
 	logline.StartedNow()
 
diff --git a/internal/commands/storage/create.go b/internal/commands/storage/create.go
@@ -98,7 +98,7 @@ func (s *createCommand) ExecuteWithoutArguments(exec commands.Executor) (output.
 		return nil, err
 	}
 
-	msg := "creating storage"
+	msg := fmt.Sprintf("Creating storage %s", s.params.Title)
 	logline := exec.NewLogEntry(msg)
 	logline.StartedNow()
 
diff --git a/internal/commands/storage/delete.go b/internal/commands/storage/delete.go
@@ -43,7 +43,7 @@ func (s *deleteCommand) MaximumExecutions() int {
 // Execute implements commands.MultipleArgumentCommand
 func (s *deleteCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {
 	svc := exec.Storage()
-	msg := fmt.Sprintf("deleting storage %v", uuid)
+	msg := fmt.Sprintf("Deleting storage %v", uuid)
 	logline := exec.NewLogEntry(msg)
 
 	logline.StartedNow()
@@ -58,6 +58,7 @@ func (s *deleteCommand) Execute(exec commands.Executor, uuid string) (output.Out
 	}
 
 	logline.SetMessage(fmt.Sprintf("%s: done", msg))
+	logline.MarkDone()
 
 	return output.None{}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (s *modifyCommand) Execute(exec commands.Executor, arg string) (output.Outp`
`51`	`51`	`if arg == "" {`
`52`	`52`	`return nil, errors.New("need ip address to modify")`
`53`	`53`	`}`
`54`		`- msg := fmt.Sprintf("modifying ip-address %v", arg)`
	`54`	`+ msg := fmt.Sprintf("Modifying ip-address %v", arg)`
`55`	`55`	`logline := exec.NewLogEntry(msg)`
`56`	`56`
`57`	`57`	`logline.StartedNow()`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func (s *createCommand) ExecuteWithoutArguments(exec commands.Executor) (output.`
`101`	`101`	`}`
`102`	`102`	`svc := exec.Network()`
`103`	`103`
`104`		`- msg := fmt.Sprintf("creating network %v", s.name)`
	`104`	`+ msg := fmt.Sprintf("Creating network %v", s.name)`
`105`	`105`	`logline := exec.NewLogEntry(msg)`
`106`	`106`	`logline.StartedNow()`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (s *deleteCommand) InitCommand() {`
`44`	`44`	`// Execute implements commands.MultipleArgumentCommand`
`45`	`45`	`func (s *deleteCommand) Execute(exec commands.Executor, uuid string) (output.Output, error) {`
`46`	`46`	`svc := exec.Server()`
`47`		`- msg := fmt.Sprintf("deleting server %v", uuid)`
	`47`	`+ msg := fmt.Sprintf("Deleting server %v", uuid)`
`48`	`48`	`logline := exec.NewLogEntry(msg)`
`49`	`49`
`50`	`50`	`logline.StartedNow()`
`@@ -68,6 +68,7 @@ func (s *deleteCommand) Execute(exec commands.Executor, uuid string) (output.Out`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`logline.SetMessage(fmt.Sprintf("%s: done", msg))`
	`71`	`+ logline.MarkDone()`
`71`	`72`
`72`	`73`	`return output.None{}, nil`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (s *modifyCommand) Execute(exec commands.Executor, uuid string) (output.Out`
`98`	`98`	`s.params.Plan = "custom" // Valid for all custom plans.`
`99`	`99`	`}`
`100`	`100`
`101`		`- msg := fmt.Sprintf("modifying server %v", uuid)`
	`101`	`+ msg := fmt.Sprintf("Modifying server %v", uuid)`
`102`	`102`	`logline := exec.NewLogEntry(msg)`
`103`	`103`
`104`	`104`	`logline.StartedNow()`