Dedupe bins in provisioner output (#129)

unmango · Aug 13, 2024 · 227ded8 · 227ded8
1 parent cf18ef4
commit 227ded8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/provider/pkg/operation/operation.go b/provider/pkg/operation/operation.go
@@ -21,10 +21,12 @@ func DisplayAll(ops []*pb.Operation) string {
 	b := strings.Builder{}
 	b.WriteRune('[')
 
-	for _, o := range ops {
-		_, _ = b.WriteString(Display(o) + ", ")
+	d := make([]string, len(ops))
+	for i, o := range ops {
+		d[i] = Display(o)
 	}
 
+	b.WriteString(strings.Join(d, ", "))
 	b.WriteRune(']')
 	return b.String()
 }

diff --git a/provider/pkg/provisioner/command/service.go b/provider/pkg/provisioner/command/service.go
@@ -175,7 +175,10 @@ func (s *service) Delete(ctx context.Context, req *pb.DeleteRequest) (*pb.Delete
 
 		log.InfoContext(ctx, "finished executing command", "cmd", cmd.String())
 		commands = append(commands, &pb.Operation{
-			Command: &pb.Command{Bin: pb.Bin_BIN_RM, Args: cmd.Args},
+			Command: &pb.Command{
+				Bin:  pb.Bin_BIN_RM,
+				Args: cmd.Args[1:],
+			},
 			Result: &pb.Result{
 				ExitCode: int32(cmd.ProcessState.ExitCode()),
 				Stdout:   stdout.String(),
@@ -201,7 +204,10 @@ func (s *service) Delete(ctx context.Context, req *pb.DeleteRequest) (*pb.Delete
 
 		log.InfoContext(ctx, "finished executing command", "cmd", cmd.String())
 		commands = append(commands, &pb.Operation{
-			Command: &pb.Command{Bin: pb.Bin_BIN_MV, Args: cmd.Args},
+			Command: &pb.Command{
+				Bin:  pb.Bin_BIN_MV,
+				Args: cmd.Args[1:],
+			},
 			Result: &pb.Result{
 				ExitCode: int32(cmd.ProcessState.ExitCode()),
 				Stdout:   stdout.String(),