Simplify pkg/devfile/adapters/... packages

pkg/dev/dev.go

@@ -13,8 +13,7 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/redhat-developer/odo/pkg/devfile/adapters"
-	"github.com/redhat-developer/odo/pkg/devfile/adapters/common"
-	"github.com/redhat-developer/odo/pkg/devfile/adapters/kubernetes"
+	"github.com/redhat-developer/odo/pkg/devfile/adapters/kubernetes/component"
 	"github.com/redhat-developer/odo/pkg/watch"
 )
 
@@ -43,7 +42,7 @@ func NewDevClient(
 
 func (o *DevClient) Start(
 	devfileObj parser.DevfileObj,
-	platformContext kubernetes.KubernetesContext,
+	namespace string,
 	ignorePaths []string,
 	path string,
 	debug bool,
@@ -53,19 +52,22 @@ func (o *DevClient) Start(
 	errOut io.Writer,
 ) error {
 	klog.V(4).Infoln("Creating new adapter")
-	adapter, err := adapters.NewComponentAdapter(
+	adapter := component.NewKubernetesAdapter(
 		o.kubernetesClient, o.prefClient, o.portForwardClient,
-		devfileObj.GetMetadataName(), path, "app", devfileObj, platformContext, randomPorts, errOut)
-	if err != nil {
-		return err
-	}
+		component.AdapterContext{
+			ComponentName: devfileObj.GetMetadataName(),
+			Context:       path,
+			AppName:       "app",
+			Devfile:       devfileObj,
+		},
+		namespace, randomPorts, errOut)
 
 	envSpecificInfo, err := envinfo.NewEnvSpecificInfo(path)
 	if err != nil {
 		return err
 	}
 
-	pushParameters := common.PushParameters{
+	pushParameters := adapters.PushParameters{
 		EnvSpecificInfo: *envSpecificInfo,
 		DebugPort:       envSpecificInfo.GetDebugPort(),
 		Path:            path,

pkg/dev/interface.go

@@ -4,22 +4,20 @@ import (
 	"context"
 	"io"
 
-	"github.com/redhat-developer/odo/pkg/devfile/adapters/common"
-
 	"github.com/devfile/library/pkg/devfile/parser"
 
-	"github.com/redhat-developer/odo/pkg/devfile/adapters/kubernetes"
+	"github.com/redhat-developer/odo/pkg/devfile/adapters"
 	"github.com/redhat-developer/odo/pkg/watch"
 )
 
 type Client interface {
-	// Start the resources in devfileObj on the platformContext. It then pushes the files in path to the container.
+	// Start the resources in devfileObj on the namespace. It then pushes the files in path to the container.
 	// If debug is true, executes the debug command, or the run command by default.
 	// If buildCommand is set, this will look up the specified build command in the Devfile. Otherwise, it uses the default one.
 	// If runCommand is set, this will look up the specified run command in the Devfile and execute it. Otherwise, it uses the default one.
 	Start(
 		devfileObj parser.DevfileObj,
-		platformContext kubernetes.KubernetesContext,
+		namespace string,
 		ignorePaths []string,
 		path string,
 		debug bool,
@@ -50,5 +48,5 @@ type Client interface {
 }
 
 type Handler interface {
-	RegenerateAdapterAndPush(common.PushParameters, watch.WatchParameters) error
+	RegenerateAdapterAndPush(adapters.PushParameters, watch.WatchParameters) error
 }