File sync for devfiles

.travis.yml

@@ -105,7 +105,7 @@ jobs:
 
     - <<: *base-test
       stage: test
-      name: "watch, storage, app, project and push command integration tests"
+      name: "watch, storage, app, project, push, and devfile push command integration tests"
       script:
         - ./scripts/oc-cluster.sh
         - make bin
@@ -116,6 +116,7 @@ jobs:
         - travis_wait make test-cmd-app
         - travis_wait make test-cmd-push
         - travis_wait make test-cmd-project
+        - travis_wait make test-cmd-devfile-push
         - odo logout
 
     - <<: *base-test

Makefile

@@ -193,6 +193,11 @@ test-cmd-pref-config:
 test-cmd-push:
 	ginkgo $(GINKGO_FLAGS) -focus="odo push command tests" tests/integration/
 
+# Run odo push devfile command tests
+.PHONY: test-cmd-devfile-push
+test-cmd-devfile-push:
+	ginkgo $(GINKGO_FLAGS) -focus="odo devfile push command tests" tests/integration/
+
 # Run odo storage command tests
 .PHONY: test-cmd-storage
 test-cmd-storage:

pkg/component/component.go

@@ -636,7 +636,7 @@ func PushLocal(client *occlient.Client, componentName string, applicationName st
 	glog.V(4).Infof("PushLocal: componentName: %s, applicationName: %s, path: %s, files: %s, delFiles: %s, isForcePush: %+v", componentName, applicationName, path, files, delFiles, isForcePush)
 
 	// Edge case: check to see that the path is NOT empty.
-	emptyDir, err := isEmpty(path)
+	emptyDir, err := util.IsEmpty(path)
 	if err != nil {
 		return errors.Wrapf(err, "Unable to check directory: %s", path)
 	} else if emptyDir {
@@ -1455,23 +1455,6 @@ func GetMachineReadableFormatForList(components []Component) ComponentList {
 
 }
 
-// isEmpty checks to see if a directory is empty
-// shamelessly taken from: https://stackoverflow.com/questions/30697324/how-to-check-if-directory-on-path-is-empty
-// this helps detect any edge cases where an empty directory is copied over
-func isEmpty(name string) (bool, error) {
-	f, err := os.Open(name)
-	if err != nil {
-		return false, err
-	}
-	defer f.Close() // #nosec G307
-
-	_, err = f.Readdirnames(1) // Or f.Readdir(1)
-	if err == io.EOF {
-		return true, nil
-	}
-	return false, err // Either not empty or error, suits both cases
-}
-
 // getStorageFromConfig gets all the storage from the config
 // returns a list of storage in storage struct format
 func getStorageFromConfig(localConfig *config.LocalConfigInfo) storage.StorageList {

pkg/devfile/adapters/common/interface.go

@@ -1,8 +1,8 @@
 package common
 
-// ComponentAdapter defines the component functions that platform-specific adapters must implement
+// ComponentAdapter defines the functions that platform-specific adapters must implement
 type ComponentAdapter interface {
-	Create() error
+	Push(path string, ignoredFiles []string, forceBuild bool, globExps []string) error
 }
 
 // StorageAdapter defines the storage functions that platform-specific adapters must implement

pkg/devfile/adapters/helper.go

@@ -1,14 +1,16 @@
 package adapters
 
 import (
+	"fmt"
+
 	"github.com/openshift/odo/pkg/devfile"
 	"github.com/openshift/odo/pkg/devfile/adapters/common"
 	"github.com/openshift/odo/pkg/devfile/adapters/kubernetes"
 	"github.com/openshift/odo/pkg/kclient"
 )
 
 // NewPlatformAdapter returns a Devfile adapter for the targeted platform
-func NewPlatformAdapter(componentName string, devObj devfile.DevfileObj) (PlatformAdapter, error) {
+func NewPlatformAdapter(componentName string, devObj devfile.DevfileObj, platformContext interface{}) (PlatformAdapter, error) {
 
 	adapterContext := common.AdapterContext{
 		ComponentName: componentName,
@@ -17,14 +19,23 @@ func NewPlatformAdapter(componentName string, devObj devfile.DevfileObj) (Platfo
 
 	// Only the kubernetes adapter is implemented at the moment
 	// When there are others this function should be updated to retrieve the correct adapter for the desired platform target
-	return createKubernetesAdapter(adapterContext)
+	kc, ok := platformContext.(kubernetes.KubernetesContext)
+	if !ok {
+		return nil, fmt.Errorf("Error retrieving context for Kubernetes")
+	}
+	return createKubernetesAdapter(adapterContext, kc.Namespace)
 }
 
-func createKubernetesAdapter(adapterContext common.AdapterContext) (PlatformAdapter, error) {
+func createKubernetesAdapter(adapterContext common.AdapterContext, namespace string) (PlatformAdapter, error) {
 	client, err := kclient.New()
 	if err != nil {
 		return nil, err
 	}
+
+	// If a namespace was passed in
+	if namespace != "" {
+		client.Namespace = namespace
+	}
 	return newKubernetesAdapter(adapterContext, *client)
 }
 

pkg/devfile/adapters/interface.go

@@ -1,5 +1,5 @@
 package adapters
 
 type PlatformAdapter interface {
-	Start() error
+	Push(path string, ignoredFiles []string, forceBuild bool, globExps []string) error
 }

pkg/devfile/adapters/kubernetes/adapter.go

@@ -12,6 +12,10 @@ type Adapter struct {
 	componentAdapter common.ComponentAdapter
 }
 
+type KubernetesContext struct {
+	Namespace string
+}
+
 // New instantiates a kubernetes adapter
 func New(adapterContext common.AdapterContext, client kclient.Client) Adapter {
 
@@ -22,10 +26,10 @@ func New(adapterContext common.AdapterContext, client kclient.Client) Adapter {
 	}
 }
 
-// Start creates Kubernetes resources that correspond to the devfile if they don't already exist
-func (k Adapter) Start() error {
+// Push creates Kubernetes resources that correspond to the devfile if they don't already exist
+func (k Adapter) Push(path string, ignoredFiles []string, forceBuild bool, globExps []string) error {
 
-	err := k.componentAdapter.Create()
+	err := k.componentAdapter.Push(path, ignoredFiles, forceBuild, globExps)
 	if err != nil {
 		return errors.Wrap(err, "Failed to create the component")
 	}