Merge branch 'main' of https://github.com/loft-sh/devspace

Author: FabianKramm

cmd/init.go

@@ -5,13 +5,14 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
-	"mvdan.cc/sh/v3/expand"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"mvdan.cc/sh/v3/expand"
+
 	"github.com/loft-sh/devspace/pkg/devspace/compose"
 	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
 	"github.com/sirupsen/logrus"
@@ -787,11 +788,15 @@ func (cmd *InitCmd) render(f factory.Factory, config *latest.Config) (string, er
 		return "", errors.Wrap(err, "temp render.yaml")
 	}
 
+	silent := true
+	if cmd.Debug {
+		silent = false
+	}
 	// Use the render command to render it.
 	writer := &bytes.Buffer{}
 	renderCmd := &RunPipelineCmd{
 		GlobalFlags: &flags.GlobalFlags{
-			Silent:     true,
+			Silent:     silent,
 			ConfigPath: renderPath,
 		},
 		Pipeline:     "deploy",

docs/pages/configuration/_partials/v2beta1/deployments/updateImageTags.mdx

@@ -2,7 +2,7 @@
 <details className="config-field" data-expandable="false" open>
 <summary>
 
-### `updateImageTags` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">false</span> <span className="config-field-enum"></span> {#deployments-updateImageTags}
+### `updateImageTags` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">true</span> <span className="config-field-enum"></span> {#deployments-updateImageTags}
 
 UpdateImageTags lets you define if DevSpace should update the tags of the images defined in the
 images section with their most recent built tag.

docs/pages/configuration/deployments/helm/values.mdx

@@ -65,7 +65,7 @@ DevSpace allows you to specify `values` (for inline values) and `valuesFiles` (f
 
 
 ## Update Image Tags
-If the `updateImageTags` is set to `true`, DevSpace searches through the Helm values for this deployment (specified via `values` or `valuesFiles`) and tries to find any images in the Helm values that are also defined in the `images` section of the `devspace.yaml`. If DevSpace finds an image, it updates the image tag in the Helm values dynamically, so the tag in the Helm values matches the tag that DevSpace created during the most recent image building process for this image. Image tag updates make sure that your application will always be started with the most up-to-date image that DevSpace has built for you.
+If the `updateImageTags` (defaults to true) is set to `true`, DevSpace searches through the Helm values for this deployment (specified via `values` or `valuesFiles`) and tries to find any images in the Helm values that are also defined in the `images` section of the `devspace.yaml`. If DevSpace finds an image, it updates the image tag in the Helm values dynamically, so the tag in the Helm values matches the tag that DevSpace created during the most recent image building process for this image. Image tag updates make sure that your application will always be started with the most up-to-date image that DevSpace has built for you.
 
 #### Example: Enable Tag Updates
 ```yaml {3}

docs/pages/configuration/dev/connections/restart-helper.mdx

@@ -7,7 +7,7 @@ import ConfigPartial from '../../_partials/v2beta1/dev/restartHelper.mdx'
 
 DevSpace provides a small shell script that can used as container entrypoint (PID 1 process) to start the container instead of your actual container start command.
 
-For example, if your entrypoint would be `pyhton main.py`, DevSpace would rewrite the container start command to:
+For example, if your entrypoint would be `python main.py`, DevSpace would rewrite the container start command to:
 ```bash
 /.devspace/devspace-restart-helper python main.py
 ```

docs/pages/configuration/variables.mdx

@@ -14,18 +14,21 @@ While there is no need to explicitly define a config variable, it allows you to
 
 ## Built-In Variables
 DevSpace provides a set of built-in variables:
-- `${DEVSPACE_NAMESPACE}` contains the current namespace
+
 - `${DEVSPACE_CONTEXT}` contains the name of the current kube-context (e.g. `minikube`)
-- `${DEVSPACE_NAME}` contains the value of the `name` field of the current `devspace.yaml` file
+- `${DEVSPACE_EXECUTABLE}` contains the path to the devspace binary used
 - `${DEVSPACE_GIT_BRANCH}` contains the name of the local git branch that the user is currently on
 - `${DEVSPACE_GIT_COMMIT}` contains the hash of the latest git commit in the current repository
+- `${DEVSPACE_KUBECTL_EXECUTABLE}` contains the path to the kubectl binary
+- `${DEVSPACE_NAME}` contains the value of the `name` field of the current `devspace.yaml` file
+- `${DEVSPACE_NAMESPACE}` contains the current namespace
+- `${DEVSPACE_PROFILE}` contains the profile that is currently active in DevSpace (e.g. the string provided via `-p / --profile` in a command such as `devspace dev -p my-profile`)
+- `${DEVSPACE_RANDOM}` contains a random 6 character long string
 - `${DEVSPACE_TIMESTAMP}` contains the current UNIX timestamp
-- `${DEVSPACE_USER_HOME}` contains the path to the current user's home directory
 - `${DEVSPACE_TMPDIR}` contains a path to a temporary folder that DevSpace cleans up after the `devspace` command terminates
-- `${DEVSPACE_PROFILE}` contains the profile that is currently active in DevSpace (e.g. the string provided via `-p / --profile` in a command such as `devspace dev -p my-profile`)
+- `${DEVSPACE_USER_HOME}` contains the path to the current user's home directory
 - `${DEVSPACE_VERSION}` contains the version of DevSpace that is currently running
 
-
 ## Custom Variables
 DevSpace lets you define custom varables inside `devspace.yaml` within the `vars` section.
 

pkg/devspace/docker/auth.go

@@ -39,7 +39,6 @@ func (c *client) Login(ctx context.Context, registryURL, user, password string,
 	}
 
 	authConfig, err := getDefaultAuthConfig(checkCredentialsStore, serverAddress, isDefaultRegistry)
-	authConfig.IdentityToken = ""
 	if err != nil || authConfig.Username == "" || authConfig.Password == "" || relogin {
 		authConfig.Username = strings.TrimSpace(user)
 		authConfig.Password = strings.TrimSpace(password)

pkg/devspace/pullsecrets/init.go

@@ -1,10 +1,11 @@
 package pullsecrets
 
 import (
+	"time"
+
 	devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
 	"github.com/loft-sh/devspace/pkg/devspace/docker"
 	"github.com/loft-sh/devspace/pkg/util/stringutil"
-	"time"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/hook"
@@ -166,6 +167,10 @@ func (r *client) createPullSecret(ctx devspacecontext.Context, dockerClient dock
 		if authConfig != nil {
 			username = authConfig.Username
 			password = authConfig.Password
+
+			if password == "" && authConfig.IdentityToken != "" {
+				password = authConfig.IdentityToken
+			}
 		}
 	}
 

pkg/devspace/server/download.go

@@ -6,28 +6,27 @@ import (
 	"compress/gzip"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"time"
 
 	"github.com/loft-sh/devspace/assets"
 
 	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
 	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
+	"github.com/loft-sh/devspace/pkg/util/git"
 
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 )
 
-// UIDownloadBaseURL is the base url where to look for the ui
-const UIDownloadBaseURL = "https://github.com/loft-sh/devspace/releases"
+// UIRepository is the repository containing the devspace UI
+const UIRepository = "https://github.com/loft-sh/devspace"
 
-// UIDownloadRegEx is the regexp that finds the correct download link for the ui
-var UIDownloadRegEx = regexp.MustCompile(`href="(\/loft-sh\/devspace\/releases\/download\/[^\/]*\/ui.tar.gz)"`)
+// UIDownloadBaseURL is the base url where to look for the ui
+const UIDownloadBaseURL = UIRepository + "/releases/download"
 
 // UITempFolder is the temp folder to cache the ui in
 const UITempFolder = "ui"
@@ -77,30 +76,15 @@ func downloadFile(version string, folder string) error {
 	}
 
 	// Create download url
-	url := ""
 	if version == "latest" {
-		url = fmt.Sprintf("%s/%s", UIDownloadBaseURL, version)
-	} else {
-		url = fmt.Sprintf("%s/tag/%s", UIDownloadBaseURL, version)
+		version, err = git.GetLatestVersion(UIRepository)
+		if err != nil {
+			return errors.Wrap(err, "get latest version")
+		}
 	}
 
-	// Download html
+	url := fmt.Sprintf("%s/%s/%s", UIDownloadBaseURL, version, "ui.tar.gz")
 	resp, err := http.Get(url)
-	if err != nil {
-		return errors.Wrap(err, "get url")
-	}
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return errors.Wrap(err, "read body")
-	}
-
-	matches := UIDownloadRegEx.FindStringSubmatch(string(body))
-	if len(matches) != 2 {
-		return errors.Errorf("Couldn't find ui in github release %s at url %s", version, url)
-	}
-
-	resp, err = http.Get("https://github.com" + matches[1])
 	if err != nil {
 		return errors.Wrap(err, "download ui archive")
 	}

pkg/devspace/services/inject/inject.go

@@ -6,40 +6,41 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
-	"github.com/loft-sh/devspace/assets"
-	"github.com/loft-sh/devspace/pkg/devspace/env"
 	"io"
 	"io/fs"
 	"io/ioutil"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/loft-sh/devspace/assets"
+	"github.com/loft-sh/devspace/pkg/devspace/env"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"github.com/loft-sh/devspace/pkg/devspace/config/constants"
 	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/devspace/kubectl"
 	"github.com/loft-sh/devspace/pkg/devspace/upgrade"
+	"github.com/loft-sh/devspace/pkg/util/git"
 	"github.com/loft-sh/devspace/pkg/util/hash"
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 )
 
+// DevSpaceHelperRepository is the repository containing the devspace helper
+const DevSpaceHelperRepository = "https://github.com/loft-sh/devspace"
+
 // DevSpaceHelperBaseURL is the base url where to look for the sync helper
-const DevSpaceHelperBaseURL = "https://github.com/loft-sh/devspace/releases"
+const DevSpaceHelperBaseURL = DevSpaceHelperRepository + "/releases/download"
 
 // DevSpaceHelperTempFolder is the local folder where we store the sync helper
 const DevSpaceHelperTempFolder = "devspacehelper"
 
-// helperBinaryRegEx is the regexp that finds the correct download link for the sync helper binary
-var helperBinaryRegEx = `href="(\/loft-sh\/devspace\/releases\/download\/[^\/]*\/%s)"`
-
 // DevSpaceHelperContainerPath is the path of the devspace helper in the container
 const DevSpaceHelperContainerPath = "/tmp/devspacehelper"
 
@@ -153,34 +154,15 @@ func installDevSpaceHelperInContainer(ctx context.Context, client kubectl.Client
 
 // getDownloadURL
 func devSpaceHelperDownloadURL(version, filename string) (string, error) {
-	url := ""
 	if version == "latest" {
-		url = fmt.Sprintf("%s/%s", DevSpaceHelperBaseURL, version)
-	} else {
-		url = fmt.Sprintf("%s/tag/%s", DevSpaceHelperBaseURL, version)
-	}
-
-	// Download html
-	resp, err := http.Get(url)
-	if err != nil {
-		return "", errors.Wrap(err, "get url")
-	}
-
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", errors.Wrap(err, "read body")
-	}
-
-	regEx, err := regexp.Compile(fmt.Sprintf(helperBinaryRegEx, filename))
-	if err != nil {
-		return "", err
+		var err error
+		version, err = git.GetLatestVersion(DevSpaceHelperRepository)
+		if err != nil {
+			return "", errors.Wrap(err, "get latest version")
+		}
 	}
 
-	matches := regEx.FindStringSubmatch(string(body))
-	if len(matches) != 2 {
-		return "", errors.Errorf("couldn't find %s in github release %s at url %s", filename, version, url)
-	}
-	return "https://github.com" + matches[1], nil
+	return fmt.Sprintf("%s/%s/%s", DevSpaceHelperBaseURL, version, filename), nil
 }
 
 func downloadSyncHelper(ctx context.Context, helperName, syncBinaryFolder, version string, log logpkg.Logger) error {

pkg/util/git/helper.go

@@ -2,15 +2,21 @@ package git
 
 import (
 	"context"
-	"github.com/loft-sh/devspace/pkg/util/command"
-	"mvdan.cc/sh/v3/expand"
+	"fmt"
+	"net/http"
 	"os"
+	"regexp"
 	"strings"
 
+	"github.com/loft-sh/devspace/pkg/util/command"
+	"mvdan.cc/sh/v3/expand"
+
 	"github.com/pkg/errors"
 	"gopkg.in/src-d/go-git.v4"
 )
 
+var LatestTagRegEx = regexp.MustCompile(`\/tag\/(.*)$`)
+
 // GetBranch retrieves the current HEADs name
 func GetBranch(localPath string) (string, error) {
 	repo, err := git.PlainOpen(localPath)
@@ -79,3 +85,28 @@ func GetRemote(localPath string) (string, error) {
 
 	return urls[0], nil
 }
+
+func GetLatestVersion(repository string) (string, error) {
+	client := &http.Client{
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+
+	resp, err := client.Get(repository + "/releases/latest")
+	if err != nil {
+		return "", err
+	}
+
+	redirect := resp.Header.Get("location")
+	if redirect == "" {
+		return "", fmt.Errorf("redirect URL not found")
+	}
+
+	matches := LatestTagRegEx.FindStringSubmatch(redirect)
+	if len(matches) != 2 {
+		return "", errors.Errorf("Couldn't find latest release version")
+	}
+
+	return matches[1], nil
+}