Merge branch 'master' into v6-docs

Author: LukasGentele

.github/workflows/lint.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.29
+          version: v1.45.2
           args:
             -v
             --config=.golangci.yml

cmd/attach.go

@@ -96,11 +96,7 @@ func (cmd *AttachCmd) Run(f factory.Factory, cobraCmd *cobra.Command, args []str
 	}
 
 	// create the context
-	ctx := &devspacecontext.Context{
-		Context:    context.Background(),
-		KubeClient: client,
-		Log:        log,
-	}
+	ctx := devspacecontext.NewContext(context.Background(), nil, log).WithKubeClient(client)
 
 	// Execute plugin hook
 	err = hook.ExecuteHooks(ctx, nil, "attach")

cmd/build.go

@@ -2,12 +2,13 @@ package cmd
 
 import (
 	"github.com/loft-sh/devspace/cmd/flags"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/spf13/cobra"
 )
 
 // NewBuildCmd creates a new devspace build command
-func NewBuildCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Command {
+func NewBuildCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *RawConfig) *cobra.Command {
 	cmd := &RunPipelineCmd{
 		GlobalFlags: globalFlags,
 		Pipeline:    "build",
@@ -23,10 +24,14 @@ func NewBuildCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Comma
 Builds all defined images and pushes them
 #######################################################`,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
-			return cmd.Run(cobraCmd, args, f, "build", "buildCommand")
+			return cmd.Run(cobraCmd, args, f, "buildCommand")
 		},
 	}
 
-	cmd.AddFlags(buildCmd)
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["build"]
+	}
+	cmd.AddPipelineFlags(f, buildCmd, pipeline)
 	return buildCmd
 }

cmd/deploy.go

@@ -2,12 +2,13 @@ package cmd
 
 import (
 	"github.com/loft-sh/devspace/cmd/flags"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/spf13/cobra"
 )
 
 // NewDeployCmd creates a new deploy command
-func NewDeployCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Command {
+func NewDeployCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *RawConfig) *cobra.Command {
 	cmd := &RunPipelineCmd{
 		GlobalFlags:             globalFlags,
 		SkipPushLocalKubernetes: true,
@@ -29,10 +30,14 @@ devspace deploy --kube-context=deploy-context
 #######################################################`,
 		Args: cobra.NoArgs,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
-			return cmd.Run(cobraCmd, args, f, "deploy", "deployCommand")
+			return cmd.Run(cobraCmd, args, f, "deployCommand")
 		},
 	}
 
-	cmd.AddFlags(deployCmd)
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["deploy"]
+	}
+	cmd.AddPipelineFlags(f, deployCmd, pipeline)
 	return deployCmd
 }

cmd/dev.go

@@ -2,12 +2,13 @@ package cmd
 
 import (
 	"github.com/loft-sh/devspace/cmd/flags"
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/spf13/cobra"
 )
 
 // NewDevCmd creates a new devspace dev command
-func NewDevCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Command {
+func NewDevCmd(f factory.Factory, globalFlags *flags.GlobalFlags, rawConfig *RawConfig) *cobra.Command {
 	cmd := &RunPipelineCmd{
 		GlobalFlags:             globalFlags,
 		SkipPushLocalKubernetes: true,
@@ -24,10 +25,14 @@ Starts your project in development mode
 #######################################################`,
 		Args: cobra.NoArgs,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
-			return cmd.Run(cobraCmd, args, f, "dev", "devCommand")
+			return cmd.Run(cobraCmd, args, f, "devCommand")
 		},
 	}
 
-	cmd.AddFlags(devCmd)
+	var pipeline *latest.Pipeline
+	if rawConfig != nil && rawConfig.Config != nil && rawConfig.Config.Pipelines != nil {
+		pipeline = rawConfig.Config.Pipelines["dev"]
+	}
+	cmd.AddPipelineFlags(f, devCmd, pipeline)
 	return devCmd
 }

cmd/enter.go

@@ -123,11 +123,7 @@ func (cmd *EnterCmd) Run(f factory.Factory, args []string) error {
 	}
 
 	// create the context
-	ctx := &devspacecontext.Context{
-		Context:    context.Background(),
-		KubeClient: client,
-		Log:        logger,
-	}
+	ctx := devspacecontext.NewContext(context.Background(), nil, logger).WithKubeClient(client)
 
 	// Execute plugin hook
 	err = hook.ExecuteHooks(ctx, nil, "enter")

cmd/flags/flags.go

@@ -15,7 +15,6 @@ type GlobalFlags struct {
 	Namespace                string
 	KubeContext              string
 	Profiles                 []string
-	ProfileRefresh           bool
 	DisableProfileActivation bool
 	SwitchContext            bool
 	ConfigPath               string
@@ -33,7 +32,6 @@ func (gf *GlobalFlags) ToConfigOptions() *loader.ConfigOptions {
 	return &loader.ConfigOptions{
 		OverrideName:             gf.OverrideName,
 		Profiles:                 profiles,
-		ProfileRefresh:           gf.ProfileRefresh,
 		DisableProfileActivation: gf.DisableProfileActivation,
 		Vars:                     gf.Vars,
 	}
@@ -51,15 +49,36 @@ func SetGlobalFlags(flags *flag.FlagSet) *GlobalFlags {
 	flags.BoolVar(&globalFlags.Debug, "debug", false, "Prints the stack trace if an error occurs")
 	flags.BoolVar(&globalFlags.Silent, "silent", false, "Run in silent mode and prevents any devspace log output except panics & fatals")
 
-	flags.StringVar(&globalFlags.ConfigPath, "config", "", "The devspace config file to use")
 	flags.StringSliceVarP(&globalFlags.Profiles, "profile", "p", []string{}, "The DevSpace profiles to apply. Multiple profiles are applied in the order they are specified")
-	flags.BoolVar(&globalFlags.ProfileRefresh, "profile-refresh", false, "If true will pull and re-download profile parent sources")
 	flags.BoolVar(&globalFlags.DisableProfileActivation, "disable-profile-activation", false, "If true will ignore all profile activations")
 	flags.BoolVarP(&globalFlags.SwitchContext, "switch-context", "s", false, "Switches and uses the last kube context and namespace that was used to deploy the DevSpace project")
 	flags.StringVarP(&globalFlags.Namespace, "namespace", "n", "", "The kubernetes namespace to use")
 	flags.StringVar(&globalFlags.KubeContext, "kube-context", "", "The kubernetes context to use")
 	flags.StringSliceVar(&globalFlags.Vars, "var", []string{}, "Variables to override during execution (e.g. --var=MYVAR=MYVALUE)")
 
 	flags.IntVar(&globalFlags.InactivityTimeout, "inactivity-timeout", 0, "Minutes the current user is inactive (no mouse or keyboard interaction) until DevSpace will exit automatically. 0 to disable. Only supported on windows and mac operating systems")
+	flags.AddFlag(&flag.Flag{
+		Name:   "config",
+		Usage:  "DEPRECATED: please use the DEVSPACE_CONFIG environment variable instead",
+		Hidden: true,
+		Value:  NewStringValue("", &globalFlags.ConfigPath),
+	})
 	return globalFlags
 }
+
+type StringValue string
+
+func NewStringValue(val string, p *string) *StringValue {
+	*p = val
+	return (*StringValue)(p)
+}
+
+func (s *StringValue) Set(val string) error {
+	*s = StringValue(val)
+	return nil
+}
+func (s *StringValue) Type() string {
+	return "string"
+}
+
+func (s *StringValue) String() string { return string(*s) }

cmd/flags/flags_test.go

@@ -3,71 +3,18 @@ package flags
 import (
 	"testing"
 
-	"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
-	"github.com/loft-sh/devspace/pkg/util/log"
-
 	"gotest.tools/assert"
 )
 
-type useLastContextTestCase struct {
-	name string
-
-	globalFlags     GlobalFlags
-	generatedConfig *localcache.Config
-
-	expectedErr string
-}
-
-func TestUseLastContext(t *testing.T) {
-	testCases := []useLastContextTestCase{
-		{
-			name: "Switch context to existent",
-			globalFlags: GlobalFlags{
-				SwitchContext: true,
-			},
-			generatedConfig: &localcache.Config{
-				ActiveProfile: "someProfile",
-				Profiles: map[string]*localcache.CacheConfig{
-					"someProfile": {
-						LastContext: &localcache.LastContextConfig{
-							Context:   "myKubeContext",
-							Namespace: "myNamespace",
-						},
-					},
-				},
-			},
-		},
-		{
-			name:        "Nothing happens",
-			globalFlags: GlobalFlags{},
-		},
-	}
-
-	for _, testCase := range testCases {
-		testUseLastContext(t, testCase)
-	}
-}
-
-func testUseLastContext(t *testing.T, testCase useLastContextTestCase) {
-	err := testCase.globalFlags.UseLastContext(testCase.generatedConfig, &log.DiscardLogger{})
-
-	if testCase.expectedErr == "" {
-		assert.NilError(t, err, "Unexpected error in testCase %s.", testCase.name)
-	} else {
-		assert.Error(t, err, testCase.expectedErr, "Wrong or no error in testCase %s.", testCase.name)
-	}
-}
-
 func TestToConfigOptions(t *testing.T) {
 	configOptions := (&GlobalFlags{
 		Profiles:    []string{"myProfile2", "myProfile"},
 		KubeContext: "myKubeContext",
 		Vars:        []string{"var1", "var2"},
-	}).ToConfigOptions(log.Discard)
+	}).ToConfigOptions()
 
 	assert.Equal(t, configOptions.Profiles[0], "myProfile2", "ConfigOptions has wrong profiles")
 	assert.Equal(t, configOptions.Profiles[1], "myProfile", "ConfigOptions has wrong profiles")
-	assert.Equal(t, configOptions.KubeContext, "myKubeContext", "ConfigOptions has wrong kube context")
 	assert.Equal(t, len(configOptions.Vars), 2, "ConfigOptions has wrong vars")
 	assert.Equal(t, configOptions.Vars[0], "var1", "ConfigOptions has wrong vars")
 	assert.Equal(t, configOptions.Vars[1], "var2", "ConfigOptions has wrong vars")