Move handler to pkg/component package

Author: feloy

pkg/component/delete/delete.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/redhat-developer/odo/pkg/component"
 	"github.com/redhat-developer/odo/pkg/configAutomount"
-	"github.com/redhat-developer/odo/pkg/dev/common"
 	"github.com/redhat-developer/odo/pkg/exec"
 	"github.com/redhat-developer/odo/pkg/kclient"
 	odolabels "github.com/redhat-developer/odo/pkg/labels"
@@ -221,7 +220,7 @@ func (do *DeleteComponentClient) ExecutePreStopEvents(ctx context.Context, devfi
 
 	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
-	handler := common.NewRunHandler(
+	handler := component.NewRunHandler(
 		ctx,
 		do.kubeClient,
 		do.execClient,

pkg/dev/common/exec_handler_test.go renamed to pkg/component/exec_handler_test.go

@@ -1,4 +1,4 @@
-package common
+package component
 
 /*
 var (

pkg/dev/common/handler.go renamed to pkg/component/handler.go

@@ -1,4 +1,4 @@
-package common
+package component
 
 import (
 	"context"
@@ -8,7 +8,6 @@ import (
 	"github.com/devfile/library/v2/pkg/devfile/parser"
 	"k8s.io/klog"
 
-	"github.com/redhat-developer/odo/pkg/component"
 	envcontext "github.com/redhat-developer/odo/pkg/config/context"
 	"github.com/redhat-developer/odo/pkg/configAutomount"
 	"github.com/redhat-developer/odo/pkg/devfile/image"
@@ -94,7 +93,7 @@ func (a *runHandler) ApplyKubernetes(kubernetes devfilev1.Component, kind v1alph
 	}
 	switch platform := a.platformClient.(type) {
 	case kclient.ClientInterface:
-		return component.ApplyKubernetes(mode, appName, componentName, a.devfile, kubernetes, platform, a.path)
+		return ApplyKubernetes(mode, appName, componentName, a.devfile, kubernetes, platform, a.path)
 	default:
 		klog.V(4).Info("apply kubernetes commands are not implemented on podman")
 		log.Warningf("Apply Kubernetes components are not supported on Podman. Skipping: %v.", kubernetes.Name)
@@ -113,7 +112,7 @@ func (a *runHandler) ApplyOpenShift(openshift devfilev1.Component, kind v1alpha2
 	}
 	switch platform := a.platformClient.(type) {
 	case kclient.ClientInterface:
-		return component.ApplyKubernetes(mode, appName, componentName, a.devfile, openshift, platform, a.path)
+		return ApplyKubernetes(mode, appName, componentName, a.devfile, openshift, platform, a.path)
 	default:
 		klog.V(4).Info("apply OpenShift commands are not implemented on podman")
 		log.Warningf("Apply OpenShift components are not supported on Podman. Skipping: %v.", openshift.Name)
@@ -127,11 +126,11 @@ func (a *runHandler) ExecuteNonTerminatingCommand(ctx context.Context, command d
 		appName       = odocontext.GetApplication(a.ctx)
 	)
 	if isContainerRunning(command.Exec.Component, a.containersRunning) {
-		return component.ExecuteRunCommand(ctx, a.execClient, a.platformClient, command, a.ComponentExists, a.podName, appName, componentName)
+		return ExecuteRunCommand(ctx, a.execClient, a.platformClient, command, a.ComponentExists, a.podName, appName, componentName)
 	}
 	switch platform := a.platformClient.(type) {
 	case kclient.ClientInterface:
-		return component.ExecuteInNewContainer(ctx, platform, a.configAutomountClient, a.devfile, componentName, appName, command)
+		return ExecuteInNewContainer(ctx, platform, a.configAutomountClient, a.devfile, componentName, appName, command)
 	default:
 		klog.V(4).Info("executing a command in a new container is not implemented on podman")
 		log.Warningf("executing a command in a new container is not implemented on podman. Skipping: %v.", command.Id)
@@ -145,11 +144,11 @@ func (a *runHandler) ExecuteTerminatingCommand(ctx context.Context, command devf
 		appName       = odocontext.GetApplication(a.ctx)
 	)
 	if isContainerRunning(command.Exec.Component, a.containersRunning) {
-		return component.ExecuteTerminatingCommand(ctx, a.execClient, a.platformClient, command, a.ComponentExists, a.podName, appName, componentName, a.msg, false)
+		return ExecuteTerminatingCommand(ctx, a.execClient, a.platformClient, command, a.ComponentExists, a.podName, appName, componentName, a.msg, false)
 	}
 	switch platform := a.platformClient.(type) {
 	case kclient.ClientInterface:
-		return component.ExecuteInNewContainer(ctx, platform, a.configAutomountClient, a.devfile, componentName, appName, command)
+		return ExecuteInNewContainer(ctx, platform, a.configAutomountClient, a.devfile, componentName, appName, command)
 	default:
 		klog.V(4).Info("executing a command in a new container is not implemented on podman")
 		log.Warningf("executing a command in a new container is not implemented on podman. Skipping: %v.", command.Id)

pkg/dev/common/handler_test.go renamed to pkg/component/handler_test.go

@@ -1,4 +1,4 @@
-package common
+package component
 
 import (
 	"context"

pkg/deploy/deploy.go

@@ -7,8 +7,8 @@ import (
 	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/library/v2/pkg/devfile/parser"
 
+	"github.com/redhat-developer/odo/pkg/component"
 	"github.com/redhat-developer/odo/pkg/configAutomount"
-	"github.com/redhat-developer/odo/pkg/dev/common"
 	"github.com/redhat-developer/odo/pkg/devfile/image"
 	"github.com/redhat-developer/odo/pkg/kclient"
 	"github.com/redhat-developer/odo/pkg/libdevfile"
@@ -39,7 +39,7 @@ func (o *DeployClient) Deploy(ctx context.Context) error {
 		path        = filepath.Dir(devfilePath)
 	)
 
-	handler := common.NewRunHandler(
+	handler := component.NewRunHandler(
 		ctx,
 		o.kubeClient,
 		nil,

pkg/dev/kubedev/innerloop.go

@@ -90,7 +90,7 @@ func (o *DevClient) innerloop(ctx context.Context, parameters common.PushParamet
 	if !componentStatus.PostStartEventsDone && libdevfile.HasPostStartEvents(parameters.Devfile) {
 		// PostStart events from the devfile will only be executed when the component
 		// didn't previously exist
-		handler := common.NewRunHandler(
+		handler := component.NewRunHandler(
 			ctx,
 			o.kubernetesClient,
 			o.execClient,
@@ -122,7 +122,7 @@ func (o *DevClient) innerloop(ctx context.Context, parameters common.PushParamet
 	var running bool
 	var isComposite bool
 
-	cmdHandler := common.NewRunHandler(
+	cmdHandler := component.NewRunHandler(
 		ctx,
 		o.kubernetesClient,
 		o.execClient,
@@ -161,7 +161,7 @@ func (o *DevClient) innerloop(ctx context.Context, parameters common.PushParamet
 		// Invoke the build command once (before calling libdevfile.ExecuteCommandByNameAndKind), as, if cmd is a composite command,
 		// the handler we pass will be called for each command in that composite command.
 		doExecuteBuildCommand := func() error {
-			execHandler := common.NewRunHandler(
+			execHandler := component.NewRunHandler(
 				ctx,
 				o.kubernetesClient,
 				o.execClient,

pkg/dev/podmandev/reconcile.go

@@ -64,7 +64,7 @@ func (o *DevClient) reconcile(
 	// PostStart events from the devfile will only be executed when the component
 	// didn't previously exist
 	if !componentStatus.PostStartEventsDone && libdevfile.HasPostStartEvents(devfileObj) {
-		execHandler := common.NewRunHandler(
+		execHandler := component.NewRunHandler(
 			ctx,
 			o.podmanClient,
 			o.execClient,
@@ -86,7 +86,7 @@ func (o *DevClient) reconcile(
 
 	if execRequired {
 		doExecuteBuildCommand := func() error {
-			execHandler := common.NewRunHandler(
+			execHandler := component.NewRunHandler(
 				ctx,
 				o.podmanClient,
 				o.execClient,
@@ -114,7 +114,7 @@ func (o *DevClient) reconcile(
 			cmdName = options.DebugCommand
 		}
 
-		cmdHandler := common.NewRunHandler(
+		cmdHandler := component.NewRunHandler(
 			ctx,
 			o.podmanClient,
 			o.execClient,