Merge branch 'master' of https://github.com/devspace-cloud/devspace

Author: FabianKramm

.github/ISSUE_TEMPLATE/bug-report.md

@@ -23,7 +23,7 @@ version: ...
 **Local Environment:**  
 - DevSpace Version: [use `devspace --version`]
 - Operating System: windows | linux | mac
-
+- ARCH of the OS: AMD64 | ARM64 | i386
 **Kubernetes Cluster:**  
 - Cloud Provider: google | aws | azure | other
 - Kubernetes Version: [use `kubectl version`]

.github/workflows/e2e-tests.yaml

@@ -0,0 +1,49 @@
+name: E2E tests
+
+on:
+  release:
+    types: [created]
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "Dockerfile"
+      - "**.go"
+      - "!**_test.go" # exclude test files to ignore unit test changes
+      - "e2e/**_test.go" # include test files in e2e again
+      - ".github/workflows/e2e-tests.yaml"
+
+env:
+  GO111MODULE: on
+  GOFLAGS: -mod=vendor
+
+jobs:
+  test-e2e:
+    runs-on: ubuntu-latest
+
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - name: Checkout repo
+      uses: actions/checkout@v2
+
+    # Creates KinD with using k8s versions from the matrix above
+    - name: Set up kind with K8s version v1.21.1
+      uses: engineerd/[email protected]
+      with:
+        version: "v0.11.0"
+        image: kindest/node:v1.21.1
+    - name: Testing kind cluster set-up
+      run: |
+          kubectl cluster-info
+          kubectl get pods -n kube-system
+          echo "current-context:" $(kubectl config current-context)
+          echo "environment-kubeconfig:" ${KUBECONFIG}
+
+    - name: Set up Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.17
+
+    - name: e2e test
+      working-directory: ./e2e
+      run: go test -v -ginkgo.v

.github/workflows/lint.yaml

@@ -0,0 +1,27 @@
+name: Lint
+
+on:
+  release:
+    types: [created]
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "**.go"
+      - ".github/workflows/lint.yaml"
+      - ".golangci.yml"
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.29
+          args:
+            -v
+            --config=.golangci.yml
+            --max-same-issues=50

.github/workflows/pr-checks.yml

@@ -0,0 +1,54 @@
+name: Unit test
+
+on:
+  release:
+    types: [created]
+  pull_request:
+    branches:
+      - master
+    paths:
+      - "**.go"
+      - "!e2e/**" # exclude files from e2e tests
+      - ".github/workflows/unit-tests.yaml"
+
+env:
+  GO111MODULE: on
+  GOFLAGS: -mod=vendor
+
+jobs:
+  test-unit:
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
+    
+    name: unit-test-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.17
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - name: Test
+        run: ./hack/coverage.bash
+
+  test-unit-windows:
+    runs-on: windows-latest
+    name: unit-test-windows-latest
+    
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.17
+      
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - name: Test
+        run: ./hack/coverage.bash
+        shell: bash

.github/workflows/unit-tests.yaml

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -11,6 +10,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/loft-sh/devspace/pkg/devspace/imageselector"
+
 	"github.com/loft-sh/devspace/pkg/devspace/compose"
 	"github.com/loft-sh/devspace/pkg/devspace/hook"
 
@@ -374,6 +375,7 @@ func (cmd *InitCmd) Run(f factory.Factory) error {
 		"(?m)^(  open:)":                             "\n  # `dev.open` tells DevSpace to open certain URLs as soon as they return HTTP status 200\n  # Since we configured port-forwarding, we can use a localhost address here to access our application\n$1",
 		"(?m)^(  - url:.+)":                          "$1\n",
 		"(?m)^(  sync:)":                             "  # `dev.sync` configures a file sync between our Pods in k8s and your local project files\n$1",
+		"(?m)^(  (-| ) excludePaths:)":               "    # `excludePaths` option expects an array of strings with paths that should not be synchronized between the\n    # local filesystem and the remote container filesystem. It uses the same syntax as `.gitignore`.\n$1",
 		"(?m)^(  terminal:)":                         "\n  # `dev.terminal` tells DevSpace to open a terminal as a last step during `devspace dev`\n$1",
 		"(?m)^(    command:)":                        "    # With this optional `command` we can tell DevSpace to run a script when opening the terminal\n    # This is often useful to display help info for new users or perform initial tasks (e.g. installing dependencies)\n    # DevSpace has generated an example ./devspace_start.sh file in your local project - Feel free to customize it!\n$1",
 		"(?m)^(  replacePods:)":                      "\n  # Since our Helm charts and manifests deployments are often optimized for production,\n  # DevSpace let's you swap out Pods dynamically to get a better dev environment\n$1",

cmd/init.go

@@ -10,7 +10,6 @@ import (
 	"github.com/loft-sh/devspace/pkg/devspace/plugin"
 	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
 	"github.com/loft-sh/devspace/pkg/util/message"
-	"github.com/loft-sh/devspace/pkg/util/ptr"
 	"k8s.io/apimachinery/pkg/labels"
 
 	"github.com/loft-sh/devspace/cmd/flags"
@@ -29,9 +28,12 @@ type SyncCmd struct {
 	*flags.GlobalFlags
 
 	LabelSelector string
+	ImageSelector string
 	Container     string
 	Pod           string
 	Pick          bool
+	Wait          bool
+	Polling       bool
 
 	Exclude       []string
 	ContainerPath string
@@ -82,6 +84,7 @@ devspace sync --container-path=/my-path
 	syncCmd.Flags().StringVarP(&cmd.Container, "container", "c", "", "Container name within pod where to sync to")
 	syncCmd.Flags().StringVar(&cmd.Pod, "pod", "", "Pod to sync to")
 	syncCmd.Flags().StringVarP(&cmd.LabelSelector, "label-selector", "l", "", "Comma separated key=value selector list (e.g. release=test)")
+	syncCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, ${runtime.images.app}, nginx:${runtime.images.app.tag})")
 	syncCmd.Flags().BoolVar(&cmd.Pick, "pick", true, "Select a pod")
 
 	syncCmd.Flags().StringSliceVarP(&cmd.Exclude, "exclude", "e", []string{}, "Exclude directory from sync")
@@ -97,6 +100,9 @@ devspace sync --container-path=/my-path
 	syncCmd.Flags().BoolVar(&cmd.UploadOnly, "upload-only", false, "If set DevSpace will only upload files")
 	syncCmd.Flags().BoolVar(&cmd.DownloadOnly, "download-only", false, "If set DevSpace will only download files")
 
+	syncCmd.Flags().BoolVar(&cmd.Wait, "wait", true, "Wait for the pod(s) to start if they are not running")
+	syncCmd.Flags().BoolVar(&cmd.Polling, "polling", false, "If polling should be used to detect file changes in the container")
+
 	return syncCmd
 }
 
@@ -176,7 +182,16 @@ func (cmd *SyncCmd) Run(f factory.Factory) error {
 
 	// Build params
 	options := targetselector.NewOptionsFromFlags(cmd.Container, cmd.LabelSelector, cmd.Namespace, cmd.Pod, cmd.Pick)
-	options.Wait = ptr.Bool(false)
+	// get image selector if specified
+	imageSelector, err := getImageSelector(client, configLoader, configOptions, "", cmd.ImageSelector, logger)
+	if err != nil {
+		return err
+	}
+
+	// set image selector
+	options.ImageSelector = imageSelector
+	options.Wait = &cmd.Wait
+
 	if cmd.DownloadOnly && cmd.UploadOnly {
 		return errors.New("--upload-only cannot be used together with --download-only")
 	}
@@ -266,7 +281,7 @@ func (cmd *SyncCmd) applyFlagsToSyncConfig(syncConfig *latest.SyncConfig) error
 	if cmd.Container != "" {
 		syncConfig.ContainerName = ""
 	}
-	if cmd.LabelSelector != "" || cmd.Pod != "" {
+	if cmd.LabelSelector != "" || cmd.Pod != "" || cmd.ImageSelector != "" {
 		syncConfig.LabelSelector = nil
 		syncConfig.ImageSelector = ""
 	}
@@ -288,5 +303,9 @@ func (cmd *SyncCmd) applyFlagsToSyncConfig(syncConfig *latest.SyncConfig) error
 		syncConfig.InitialSync = latest.InitialSyncStrategy(cmd.InitialSync)
 	}
 
+	if cmd.Polling {
+		syncConfig.Polling = cmd.Polling
+	}
+
 	return nil
 }

cmd/sync.go

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 BINARY=$(command -v devspace)
-STAT=$(stat -L -f%z "$BINARY" 2>/dev/null || stat --printf="%s" "$BINARY" 2>/dev/null)
+STAT=$(stat -L -f%z "$BINARY" 2>/dev/null || stat -c"%s" "$BINARY" 2>/dev/null)
 
 if [ ! -f "$BINARY" ] || [ "$STAT" -lt 10000 ]; then
     echo "Finishing installation of DevSpace CLI"

dist/npm/bin/devspace

@@ -14,6 +14,7 @@ const ARCH_MAPPING = {
   x64: "amd64",
   x86_64: "amd64",
   arm: "arm",
+  arm64: "arm64",
   aarch64: "arm"
 };
 const PLATFORM_MAPPING = {
@@ -223,6 +224,13 @@ let continueProcess = function(askRemoveGlobalFolder) {
   } catch(e) {}
 
   let binaryPath = path.join(globalDir, binaryName);
+  if (process.argv.length > 3 && fs.existsSync(normalizePath(process.argv[3]))) {
+    let binaryDir = normalizePath(process.argv[3]);
+    let possibleBinaryPath = path.join(binaryDir, binaryName)
+    if (fs.existsSync(possibleBinaryPath)) {
+      binaryPath = possibleBinaryPath;
+    }
+  }
 
   try {
     fs.unlinkSync(binaryPath + downloadExtension);

dist/npm/index.js

@@ -44,8 +44,11 @@ devspace sync --container-path=/my-path
       --no-watch                   Synchronizes local and remote and then stops
       --pick                       Select a pod (default true)
       --pod string                 Pod to sync to
+      --polling bool               If polling should be used to detect file changes in the container
       --upload-only                If set DevSpace will only upload files
       --verbose                    Shows every file that is synced
+      --wait                       Wait for the pod(s) to start if they are not running
+
 ```
 
 
@@ -69,4 +72,3 @@ devspace sync --container-path=/my-path
       --var strings                  Variables to override during execution (e.g. --var=MYVAR=MYVALUE)
       --vars-secret string           The secret to restore/save the variables from/to, if --restore-vars or --save-vars is enabled (default "devspace-vars")
 ```
-