Merge 11c02cd into 5c38573

redhat-developer · Feb 6, 2023 · 2bd9cd5 · 2bd9cd5
2 parents 5c38573 + 11c02cd
commit 2bd9cd5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/pkg/component/delete/delete.go b/pkg/component/delete/delete.go
@@ -216,7 +216,8 @@ func (do *DeleteComponentClient) ExecutePreStopEvents(devfileObj parser.DevfileO
 
 	klog.V(4).Infof("Executing %q event commands for component %q", libdevfile.PreStop, componentName)
 	// ignore the failures if any; delete should not fail because preStop events failed to execute
-	err = libdevfile.ExecPreStopEvents(devfileObj, component.NewExecHandler(do.kubeClient, do.execClient, appName, componentName, pod.Name, "", false))
+	err = libdevfile.ExecPreStopEvents(devfileObj,
+		component.NewExecHandler(do.kubeClient, do.execClient, appName, componentName, pod.Name, "Executing pre-stop command in container", false))
 	if err != nil {
 		klog.V(4).Infof("Failed to execute %q event commands for component %q, cause: %v", libdevfile.PreStop, componentName, err.Error())
 	}

diff --git a/pkg/component/exec_handler.go b/pkg/component/exec_handler.go
@@ -55,7 +55,7 @@ func (o *execHandler) ApplyOpenShift(openshift v1alpha2.Component) error {
 func (o *execHandler) Execute(command v1alpha2.Command) error {
 	msg := o.msg
 	if msg == "" {
-		msg = fmt.Sprintf("Executing %s command %q on container %q", command.Id, command.Exec.CommandLine, command.Exec.Component)
+		msg = fmt.Sprintf("Executing %s command on container %q", command.Id, command.Exec.Component)
 	} else {
 		msg += " (command: " + command.Id + ")"
 	}

diff --git a/pkg/dev/podmandev/reconcile.go b/pkg/dev/podmandev/reconcile.go
@@ -62,7 +62,7 @@ func (o *DevClient) reconcile(
 			appName,
 			componentName,
 			pod.Name,
-			"",
+			"Executing post-start command in container",
 			false, /* TODO */
 		)
 		err = libdevfile.ExecPostStartEvents(*devfileObj, execHandler)

diff --git a/pkg/devfile/adapters/kubernetes/component/adapter.go b/pkg/devfile/adapters/kubernetes/component/adapter.go
@@ -257,7 +257,7 @@ func (a Adapter) Push(ctx context.Context, parameters adapters.PushParameters, c
 	// didn't previously exist
 	if !componentStatus.PostStartEventsDone && libdevfile.HasPostStartEvents(a.Devfile) {
 		err = libdevfile.ExecPostStartEvents(a.Devfile,
-			component.NewExecHandler(a.kubeClient, a.execClient, a.AppName, a.ComponentName, pod.Name, "", parameters.Show))
+			component.NewExecHandler(a.kubeClient, a.execClient, a.AppName, a.ComponentName, pod.Name, "Executing post-start command in container", parameters.Show))
 		if err != nil {
 			return err
 		}

diff --git a/tests/integration/cmd_delete_test.go b/tests/integration/cmd_delete_test.go
@@ -712,11 +712,9 @@ var _ = Describe("odo delete command tests", func() {
 			})
 			It("should delete the component", func() {
 				By("listing preStop events", func() {
-					helper.MatchAllInOutput(out, []string{
-						"Executing myprestop command",
-						"Executing secondprestop command",
-						"Executing thirdprestop command",
-					})
+					for _, cmdName := range []string{"myprestop", "secondprestop", "thirdprestop"} {
+						Expect(out).To(ContainSubstring("Executing pre-stop command in container (command: %s)", cmdName))
+					}
 				})
 				files := helper.ListFilesInDir(commonVar.Context)
 				if withFiles {