Merge c9c4258 into 6aacbe2

pkg/deploy/deploy.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/redhat-developer/odo/pkg/component"
 	"github.com/redhat-developer/odo/pkg/configAutomount"
-	"github.com/redhat-developer/odo/pkg/devfile/adapters/kubernetes/storage"
+	"github.com/redhat-developer/odo/pkg/dev/kubedev/storage"
 	"github.com/redhat-developer/odo/pkg/devfile/image"
 	"github.com/redhat-developer/odo/pkg/kclient"
 	odolabels "github.com/redhat-developer/odo/pkg/labels"

pkg/devfile/adapters/attributes.go → pkg/dev/common/attributes.go

@@ -1,4 +1,4 @@
-package adapters
+package common
 
 import (
 	"path/filepath"

pkg/devfile/adapters/attributes_test.go → pkg/dev/common/attributes_test.go

@@ -1,4 +1,4 @@
-package adapters
+package common
 
 import (
 	"testing"

pkg/devfile/adapters/errors.go → pkg/dev/common/errors.go

@@ -1,4 +1,4 @@
-package adapters
+package common
 
 import "fmt"
 

pkg/dev/common/types.go

@@ -0,0 +1,17 @@
+package common
+
+import (
+	"github.com/devfile/library/v2/pkg/devfile/parser"
+	"github.com/redhat-developer/odo/pkg/dev"
+)
+
+// PushParameters is a struct containing the parameters to be used when pushing to a devfile component
+type PushParameters struct {
+	StartOptions dev.StartOptions
+
+	Devfile                  parser.DevfileObj
+	WatchFiles               []string // Optional: WatchFiles is the list of changed files detected by odo watch. If empty or nil, odo will check .odo/odo-file-index.json to determine changed files
+	WatchDeletedFiles        []string // Optional: WatchDeletedFiles is the list of deleted files detected by odo watch. If empty or nil, odo will check .odo/odo-file-index.json to determine deleted files
+	Show                     bool     // Show tells whether the devfile command output should be shown on stdout
+	DevfileScanIndexForWatch bool     // DevfileScanIndexForWatch is true if watch's push should regenerate the index file during SyncFiles, false otherwise. See 'pkg/sync/adapter.go' for details
+}

pkg/dev/interface.go

@@ -2,8 +2,9 @@ package dev
 
 import (
 	"context"
-	"github.com/redhat-developer/odo/pkg/api"
 	"io"
+
+	"github.com/redhat-developer/odo/pkg/api"
 )
 
 type StartOptions struct {
@@ -31,6 +32,9 @@ type StartOptions struct {
 	ForwardLocalhost bool
 	// Variables to override in the Devfile
 	Variables map[string]string
+
+	Out    io.Writer
+	ErrOut io.Writer
 }
 
 type Client interface {
@@ -39,8 +43,6 @@ type Client interface {
 	// It logs messages and errors to out and errOut.
 	Start(
 		ctx context.Context,
-		out io.Writer,
-		errOut io.Writer,
 		options StartOptions,
 	) error