refactor: allow image:tag in images.*.image

Author: FabianKramm

pkg/devspace/config/versions/adjust.go

@@ -1,8 +1,12 @@
 package versions
 
-import "github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
+import (
+	"github.com/loft-sh/devspace/pkg/devspace/config/versions/latest"
+	"github.com/loft-sh/devspace/pkg/util/dockerfile"
+	"github.com/pkg/errors"
+)
 
-func adjustConfig(config *latest.Config) {
+func adjustConfig(config *latest.Config) error {
 	for name, v := range config.Vars {
 		v.Name = name
 	}
@@ -28,6 +32,18 @@ func adjustConfig(config *latest.Config) {
 		newObjs := map[string]*latest.Image{}
 		for k, v := range config.Images {
 			if v != nil {
+				image, tag, err := dockerfile.GetStrippedDockerImageName(v.Image)
+				if err != nil {
+					return errors.Errorf("error parsing images.%s.image: '%s': %v", k, v.Image, err)
+				}
+				if tag != "" {
+					v.Image = image
+					oldTags := v.Tags
+					v.Tags = []string{}
+					v.Tags = append(v.Tags, tag)
+					v.Tags = append(v.Tags, oldTags...)
+				}
+
 				newObjs[k] = v
 			}
 		}
@@ -52,4 +68,5 @@ func adjustConfig(config *latest.Config) {
 		}
 		config.Hooks = newObjs
 	}
+	return nil
 }

pkg/devspace/config/versions/validate.go

@@ -46,6 +46,11 @@ func Validate(config *latest.Config) error {
 		return err
 	}
 
+	err = validateVars(config.Vars)
+	if err != nil {
+		return err
+	}
+
 	err = validatePipelines(config)
 	if err != nil {
 		return err

pkg/devspace/config/versions/versions.go

@@ -163,7 +163,10 @@ func Parse(data map[string]interface{}, log log.Logger) (*latest.Config, error)
 	latestConfigConverted.Version = latest.Version
 
 	// Filter out empty images, deployments etc.
-	adjustConfig(latestConfigConverted)
+	err = adjustConfig(latestConfigConverted)
+	if err != nil {
+		return nil, err
+	}
 
 	// validate config
 	err = Validate(latestConfigConverted)

pkg/devspace/config/versions/versions_test.go

@@ -11,19 +11,21 @@ import (
 func TestParse(t *testing.T) {
 	config, err := Parse(map[string]interface{}{
 		"version": "DoesNotExist",
+		"name":    "test",
 	}, log.Discard)
 	assert.Error(t, err, "Unrecognized config version DoesNotExist. Please upgrade devspace with `devspace upgrade`")
 	assert.Equal(t, true, config == nil, "Config from invalid version not nil")
 
 	config, err = Parse(map[string]interface{}{
 		"version": latest.Version,
+		"name":    "test",
 		"images": &map[string]*latest.Image{
-			"TestImg": {
-				Image: "TestImg",
+			"test-img": {
+				Image: "testimage",
 			},
 		},
 	}, log.Discard)
 	assert.NilError(t, err, "Error parsing map without defined version: %v")
 	assert.Equal(t, latest.Version, config.Version, "Conversion to latest version not correct")
-	assert.Equal(t, "TestImg", config.Images["TestImg"].Image, "Conversion to latest version not correct")
+	assert.Equal(t, "testimage", config.Images["test-img"].Image, "Conversion to latest version not correct")
 }