Merge pull request #541 from devspace-cloud/targetselector-fix

Fix nilpointer in target selector

Author: FabianKramm

pkg/devspace/config/configutil/get.go

@@ -447,7 +447,7 @@ func SetDevSpaceRoot() (bool, error) {
 }
 
 // GetSelector returns the service referenced by serviceName
-func GetSelector(selectorName string) (*latest.SelectorConfig, error) {
+func GetSelector(config *latest.Config, selectorName string) (*latest.SelectorConfig, error) {
 	if config.Dev.Selectors != nil {
 		for _, selector := range *config.Dev.Selectors {
 			if *selector.Name == selectorName {

pkg/devspace/config/configutil/load.go

@@ -126,8 +126,6 @@ var PredefinedVars = map[string]*predefinedVarDefinition{
 			}
 
 			return &accountName, nil
-
-			return nil, nil
 		},
 	},
 }

pkg/devspace/services/targetselector/selector_parameter.go

@@ -40,7 +40,7 @@ func (t *SelectorParameter) GetNamespace(config *latest.Config) (string, error)
 		return *t.ConfigParameter.Namespace, nil
 	}
 	if t.ConfigParameter.Selector != nil {
-		selector, err := configutil.GetSelector(*t.ConfigParameter.Selector)
+		selector, err := configutil.GetSelector(config, *t.ConfigParameter.Selector)
 		if err != nil {
 			return "", err
 		}
@@ -68,7 +68,7 @@ func (t *SelectorParameter) GetLabelSelector(config *latest.Config) (*string, er
 		return &labelSelector, nil
 	}
 	if t.ConfigParameter.Selector != nil {
-		selector, err := configutil.GetSelector(*t.ConfigParameter.Selector)
+		selector, err := configutil.GetSelector(config, *t.ConfigParameter.Selector)
 		if err != nil {
 			return nil, err
 		}