Merge pull request #1891 from FabianKramm/master

refactor: update file permissions on initial sync

Author: FabianKramm

.github/workflows/e2e-tests.yaml

@@ -27,11 +27,11 @@ jobs:
       uses: actions/checkout@v2
 
     # Creates KinD with using k8s versions from the matrix above
-    - name: Set up kind with K8s version v1.21.1
+    - name: Set up kind with K8s version v1.22.4
       uses: engineerd/[email protected]
       with:
-        version: "v0.11.0"
-        image: kindest/node:v1.21.1
+        version: "v0.11.1"
+        image: kindest/node:v1.22.4
     - name: Testing kind cluster set-up
       run: |
           kubectl cluster-info
@@ -44,6 +44,15 @@ jobs:
       with:
         go-version: 1.17
 
+    - name: Build devspacehelper
+      run: |
+        mkdir -p ~/.devspace/devspacehelper/latest
+        CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-extldflags=-static" -o ~/.devspace/devspacehelper/latest/devspacehelper helper/main.go
+        chmod +x ~/.devspace/devspacehelper/latest/devspacehelper
+      env:
+        GOPATH: /Users/runner/work/devspace/go
+
     - name: e2e test
       working-directory: ./e2e
-      run: go test -v -ginkgo.v
+      run: |
+        go test -v -ginkgo.v     

e2e/framework/factory.go

@@ -4,15 +4,18 @@ import (
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/loft-sh/devspace/pkg/util/survey"
+	"github.com/sirupsen/logrus"
 )
 
 var _ factory.Factory = &DefaultFactory{}
 
 func NewDefaultFactory() *DefaultFactory {
+	logger := log.GetInstance()
+	logger.SetLevel(logrus.DebugLevel)
 	return &DefaultFactory{
 		Factory: factory.DefaultFactory(),
 		log: &DefaultLog{
-			Logger: log.GetInstance(),
+			Logger: logger,
 		},
 	}
 }

e2e/tests/sync/sync.go

@@ -36,6 +36,68 @@ var _ = DevSpaceDescribe("sync", func() {
 		framework.ExpectNoError(err)
 	})
 
+	ginkgo.It("devspace sync should override permissions on initial sync", func() {
+		tempDir, err := framework.CopyToTempDir("tests/sync/testdata/permissions")
+		framework.ExpectNoError(err)
+		defer framework.CleanupTempDir(initialDir, tempDir)
+
+		ns, err := kubeClient.CreateNamespace("sync")
+		framework.ExpectNoError(err)
+		defer func() {
+			err := kubeClient.DeleteNamespace(ns)
+			framework.ExpectNoError(err)
+		}()
+
+		// create a new dev command
+		deployCmd := &cmd.DeployCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+			},
+		}
+
+		// run the command
+		err = deployCmd.Run(f)
+		framework.ExpectNoError(err)
+
+		// wait until busybox pod is reachable
+		_, err = kubeClient.ExecByImageSelector("busybox", ns, []string{"sh", "-c", "mkdir /test_sync && echo -n 'echo \"Hello World!\"' > /test_sync/test.sh"})
+		framework.ExpectNoError(err)
+
+		// run single sync
+		syncCmd := &cmd.SyncCmd{
+			GlobalFlags: &flags.GlobalFlags{
+				NoWarn:    true,
+				Namespace: ns,
+				Debug:     true,
+			},
+			ContainerPath: "/test_sync",
+			NoWatch:       true,
+			ImageSelector: "busybox",
+		}
+
+		// run the command
+		err = syncCmd.Run(f)
+		framework.ExpectNoError(err)
+
+		// check if script is executable
+		_, err = kubeClient.ExecByImageSelector("busybox", ns, []string{"sh", "-c", "/test_sync/test.sh"})
+		framework.ExpectError(err)
+
+		// make script executable
+		err = os.Chmod("test.sh", 0755)
+		framework.ExpectNoError(err)
+
+		// rerun sync command
+		err = syncCmd.Run(f)
+		framework.ExpectNoError(err)
+
+		// make sure we got the right result this time
+		out, err := kubeClient.ExecByImageSelector("busybox", ns, []string{"sh", "-c", "/test_sync/test.sh"})
+		framework.ExpectNoError(err)
+		framework.ExpectEqual(string(out), "Hello World!\n")
+	})
+
 	ginkgo.It("devspace sync should work with and without config", func() {
 		tempDir, err := framework.CopyToTempDir("tests/sync/testdata/no-config")
 		framework.ExpectNoError(err)

e2e/tests/sync/testdata/permissions/devspace.yaml

@@ -0,0 +1,9 @@
+version: v1beta11
+deployments:
+  - name: test
+    helm:
+      componentChart: true
+      values:
+        containers:
+          - image: busybox
+            command: ["sleep", "999999999999"]

e2e/tests/sync/testdata/permissions/test.sh

@@ -0,0 +1 @@
+echo "Hello World!"

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/evanphx/json-patch v4.12.0+incompatible
 	github.com/evanphx/json-patch/v5 v5.1.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/golang/protobuf v1.5.2
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/websocket v1.4.2
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
@@ -45,6 +45,7 @@ require (
 	github.com/vmware-labs/yaml-jsonpath v0.3.2
 	golang.org/x/net v0.0.0-20210825183410-e898025ed96a
 	google.golang.org/grpc v1.40.0
+	google.golang.org/protobuf v1.27.1
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/src-d/enry.v1 v1.6.4
 	gopkg.in/src-d/go-git.v4 v4.13.1