fix defaults not handled by yaml configuration

.github/workflows/e2e.yml

@@ -45,6 +45,8 @@ jobs:
             loglevel: info
           - folder: docker4
             loglevel: info
+          - folder: docker5
+            loglevel: info
           - folder: dockerfile1
             loglevel: debug
           - folder: dockerfile2

internal/app/job.go

@@ -118,7 +118,7 @@ func (di *Diun) createJob(job model.Job) {
 		sublog.Error().Err(err).Msgf("Invoking job")
 	}
 
-	if job.Image.WatchRepo == nil || !*job.Image.WatchRepo || len(job.RegImage.Domain) == 0 {
+	if !*job.Image.WatchRepo || len(job.RegImage.Domain) == 0 {
 		return
 	}
 

internal/config/config_test.go

@@ -58,8 +58,10 @@ func TestLoadFile(t *testing.T) {
 						BaseURL: "https://hc-ping.com/",
 						UUID:    "5bf66975-d4c7-4bf5-bcc8-b8d8a82ea278",
 					},
-					ImageDefaults: &model.Image{
+					ImageDefaults: &model.ImageDefaults{
-						NotifyOn: model.NotifyOnDefaults,
+						WatchRepo: utl.NewFalse(),
+						NotifyOn:  []model.NotifyOn{model.NotifyOnNew},
+						MaxTags:   5,
 						SortTags:  registry.SortTagReverse,
 					},
 				},

internal/config/fixtures/config.test.yml

@@ -11,6 +11,10 @@ watch:
   healthchecks:
     baseURL: https://hc-ping.com/
     uuid: 5bf66975-d4c7-4bf5-bcc8-b8d8a82ea278
+  imageDefaults:
+    notifyOn:
+      - new
+    maxTags: 5
 
 notif:
   amqp:

internal/model/watch.go

@@ -3,7 +3,6 @@ package model
 import (
 	"time"
 
-	"github.com/crazy-max/diun/v4/pkg/registry"
 	"github.com/crazy-max/diun/v4/pkg/utl"
 )
 
@@ -16,7 +15,7 @@ type Watch struct {
 	RunOnStartup    *bool          `yaml:"runOnStartup,omitempty" json:"runOnStartup,omitempty" validate:"required"`
 	CompareDigest   *bool          `yaml:"compareDigest,omitempty" json:"compareDigest,omitempty" validate:"required"`
 	Healthchecks    *Healthchecks  `yaml:"healthchecks,omitempty" json:"healthchecks,omitempty"`
-	ImageDefaults   *Image         `yaml:"defaults,omitempty" json:"defaults,omitempty"`
+	ImageDefaults   *ImageDefaults `yaml:"imageDefaults,omitempty" json:"imageDefaults,omitempty"`
 }
 
 // GetDefaults gets the default values
@@ -33,8 +32,4 @@ func (s *Watch) SetDefaults() {
 	s.FirstCheckNotif = utl.NewFalse()
 	s.RunOnStartup = utl.NewTrue()
 	s.CompareDigest = utl.NewTrue()
-	s.ImageDefaults = &Image{
-		NotifyOn: NotifyOnDefaults,
-		SortTags: registry.SortTagReverse,
-	}
 }

internal/model/watch_imagedefaults.go

@@ -0,0 +1,31 @@
+package model
+
+import (
+	"github.com/crazy-max/diun/v4/pkg/registry"
+	"github.com/crazy-max/diun/v4/pkg/utl"
+)
+
+// ImageDefaults holds data necessary for image defaults configuration
+type ImageDefaults struct {
+	WatchRepo   *bool             `yaml:"watchRepo,omitempty" json:"watchRepo,omitempty"`
+	NotifyOn    []NotifyOn        `yaml:"notifyOn,omitempty" json:"notifyOn,omitempty"`
+	MaxTags     int               `yaml:"maxTags,omitempty" json:"maxTags,omitempty"`
+	SortTags    registry.SortTag  `yaml:"sortTags,omitempty" json:"sortTags,omitempty"`
+	IncludeTags []string          `yaml:"includeTags,omitempty" json:"includeTags,omitempty"`
+	ExcludeTags []string          `yaml:"excludeTags,omitempty" json:"excludeTags,omitempty"`
+	Metadata    map[string]string `yaml:"metadata,omitempty" json:"metadata,omitempty"`
+}
+
+// GetDefaults gets the default values
+func (s *ImageDefaults) GetDefaults() *Watch {
+	n := &Watch{}
+	n.SetDefaults()
+	return n
+}
+
+// SetDefaults sets the default values
+func (s *ImageDefaults) SetDefaults() {
+	s.WatchRepo = utl.NewFalse()
+	s.NotifyOn = NotifyOnDefaults
+	s.SortTags = registry.SortTagReverse
+}

internal/provider/common.go

@@ -18,19 +18,25 @@ var (
 )
 
 // ValidateImage returns a standard image through Docker labels
-func ValidateImage(image string, metadata, labels map[string]string, watchByDef bool, imageDefaults model.Image) (img model.Image, err error) {
+func ValidateImage(image string, metadata, labels map[string]string, watchByDef bool, imageDefaults *model.ImageDefaults) (img model.Image, err error) {
 	img = model.Image{
 		Name: image,
 	}
 
-	if err := mergo.Merge(&img, imageDefaults); err != nil {
+	if imageDefaults != nil {
-		return img, &invalidLabelError{errors.Wrapf(err, "failed to merge image defaults for image %s", image)}
+		img.WatchRepo = imageDefaults.WatchRepo
+		img.NotifyOn = imageDefaults.NotifyOn
+		img.MaxTags = imageDefaults.MaxTags
+		img.SortTags = imageDefaults.SortTags
+		img.IncludeTags = imageDefaults.IncludeTags
+		img.ExcludeTags = imageDefaults.ExcludeTags
+		img.Metadata = imageDefaults.Metadata
 	}
 
 	if enableStr, ok := labels["diun.enable"]; ok {
 		enable, err := strconv.ParseBool(enableStr)
 		if err != nil {
-			return img, &invalidLabelError{errors.Wrapf(err, "cannot parse %q value of label diun.enable", enableStr)}
+			return img, errors.Wrapf(err, "cannot parse %q value of label diun.enable", enableStr)
 		}
 		if !enable {
 			return model.Image{}, nil
@@ -47,7 +53,7 @@ func ValidateImage(image string, metadata, labels map[string]string, watchByDef
 			if watchRepo, err := strconv.ParseBool(value); err == nil {
 				img.WatchRepo = &watchRepo
 			} else {
-				return img, &invalidLabelError{errors.Wrapf(err, "cannot parse %q value of label %s", value, key)}
+				return img, errors.Wrapf(err, "cannot parse %q value of label %s", value, key)
 			}
 		case key == "diun.notify_on":
 			if len(value) == 0 {
@@ -57,7 +63,7 @@ func ValidateImage(image string, metadata, labels map[string]string, watchByDef
 			for _, no := range strings.Split(value, ";") {
 				notifyOn := model.NotifyOn(no)
 				if !notifyOn.Valid() {
-					return img, &invalidLabelError{errors.Errorf("unknown notify status %q", value)}
+					return img, errors.Errorf("unknown notify status %q", value)
 				}
 				img.NotifyOn = append(img.NotifyOn, notifyOn)
 			}
@@ -67,12 +73,12 @@ func ValidateImage(image string, metadata, labels map[string]string, watchByDef
 			}
 			sortTags := registry.SortTag(value)
 			if !sortTags.Valid() {
-				return img, &invalidLabelError{errors.Errorf("unknown sort tags type %q", value)}
+				return img, errors.Errorf("unknown sort tags type %q", value)
 			}
 			img.SortTags = sortTags
 		case key == "diun.max_tags":
 			if img.MaxTags, err = strconv.Atoi(value); err != nil {
-				return img, &invalidLabelError{errors.Wrapf(err, "cannot parse %q value of label %s", value, key)}
+				return img, errors.Wrapf(err, "cannot parse %q value of label %s", value, key)
 			}
 		case key == "diun.include_tags":
 			img.IncludeTags = strings.Split(value, ";")
@@ -85,7 +91,7 @@ func ValidateImage(image string, metadata, labels map[string]string, watchByDef
 		case key == "diun.platform":
 			platform, err := platforms.Parse(value)
 			if err != nil {
-				return img, &invalidLabelError{errors.Wrapf(err, "cannot parse %q platform of label %s", value, key)}
+				return img, errors.Wrapf(err, "cannot parse %q platform of label %s", value, key)
 			}
 			img.Platform = model.ImagePlatform{
 				OS:      platform.OS,
@@ -98,7 +104,7 @@ func ValidateImage(image string, metadata, labels map[string]string, watchByDef
 				break
 			}
 			if err := validateMetadataKey(mkey); err != nil {
-				return img, &invalidLabelError{errors.Wrapf(err, "invalid metadata key %q", mkey)}
+				return img, errors.Wrapf(err, "invalid metadata key %q", mkey)
 			}
 			if img.Metadata == nil {
 				img.Metadata = map[string]string{}
@@ -121,15 +127,3 @@ func validateMetadataKey(key string) error {
 	}
 	return nil
 }
-
-type invalidLabelError struct {
-	error
-}
-
-func (e *invalidLabelError) Error() string {
-	return e.Error()
-}
-
-func (e *invalidLabelError) Unwrap() error {
-	return e
-}

internal/provider/common_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/crazy-max/diun/v4/internal/model"
 	"github.com/crazy-max/diun/v4/pkg/registry"
 	"github.com/crazy-max/diun/v4/pkg/utl"
+	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -16,9 +17,9 @@ func TestValidateImage(t *testing.T) {
 		metadata      map[string]string
 		labels        map[string]string
 		watchByDef    bool
-		imageDefaults model.Image
+		imageDefaults *model.ImageDefaults
 		expectedImage model.Image
-		expectedErr   interface{}
+		expectedErr   error
 	}{
 		{
 			name:       "Test with digest",
@@ -76,9 +77,8 @@ func TestValidateImage(t *testing.T) {
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.Errorf(`cannot parse "chickens" value of label diun.enable`),
 		},
-		// Test diun.regopt
 		{
 			name:  "Set regopt",
 			image: "myimg",
@@ -86,7 +86,7 @@ func TestValidateImage(t *testing.T) {
 				"diun.regopt": "foo",
 			},
 			watchByDef:    true,
-			imageDefaults: model.Image{},
+			imageDefaults: &model.ImageDefaults{},
 			expectedImage: model.Image{
 				Name:   "myimg",
 				RegOpt: "foo",
@@ -100,49 +100,17 @@ func TestValidateImage(t *testing.T) {
 				"diun.regopt": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:   "myimg",
 				RegOpt: "",
 			},
 			expectedErr: nil,
 		},
-		{
-			name:       "Default regopt",
-			image:      "myimg",
-			watchByDef: true,
-			labels:     map[string]string{},
-			imageDefaults: model.Image{
-				RegOpt: "foo",
-			},
-			expectedImage: model.Image{
-				Name:   "myimg",
-				RegOpt: "foo",
-			},
-			expectedErr: nil,
-		},
-		{
-			name:       "Override default regopt",
-			image:      "myimg",
-			watchByDef: true,
-			labels: map[string]string{
-				"diun.regopt": "bar",
-			},
-			imageDefaults: model.Image{
-				RegOpt: "foo",
-			},
-			expectedImage: model.Image{
-				Name:   "myimg",
-				RegOpt: "bar",
-			},
-			expectedErr: nil,
-		},
-		// Test watch_repo
 		{
 			name:       "Include using global settings",
 			image:      "myimg",
 			watchByDef: true,
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				WatchRepo: utl.NewTrue(),
 			},
 			expectedImage: model.Image{
@@ -158,11 +126,11 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.watch_repo": "chickens",
 			},
-			imageDefaults: model.Image{},
+			imageDefaults: &model.ImageDefaults{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`cannot parse "chickens" value of label diun.watch_repo`),
 		},
 		{
 			name:       "Override default image values with labels (true > false)",
@@ -171,7 +139,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.watch_repo": "false",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				WatchRepo: utl.NewTrue(),
 			},
 			expectedImage: model.Image{
@@ -187,7 +155,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.watch_repo": "true",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				WatchRepo: utl.NewFalse(),
 			},
 			expectedImage: model.Image{
@@ -196,7 +164,6 @@ func TestValidateImage(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		// Test diun.notify_on
 		{
 			name:  "Set valid notify_on",
 			image: "myimg",
@@ -204,7 +171,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.notify_on": "new",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:     "myimg",
 				NotifyOn: []model.NotifyOn{model.NotifyOnNew},
@@ -218,12 +184,11 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.notify_on": "chickens",
 			},
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:     "myimg",
 				NotifyOn: []model.NotifyOn{},
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`unknown notify status "chickens"`),
 		},
 		{
 			name:       "Set empty notify_on",
@@ -232,7 +197,6 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.notify_on": "",
 			},
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
@@ -243,7 +207,7 @@ func TestValidateImage(t *testing.T) {
 			image:      "myimg",
 			watchByDef: true,
 			labels:     map[string]string{},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				NotifyOn: []model.NotifyOn{model.NotifyOnNew},
 			},
 			expectedImage: model.Image{
@@ -259,7 +223,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.notify_on": "update",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				NotifyOn: []model.NotifyOn{model.NotifyOnNew},
 			},
 			expectedImage: model.Image{
@@ -268,7 +232,6 @@ func TestValidateImage(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		// Test diun.sort_tags
 		{
 			name:  "Set valid sort_tags",
 			image: "myimg",
@@ -276,7 +239,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.sort_tags": "semver",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:     "myimg",
 				SortTags: registry.SortTagSemver,
@@ -290,11 +252,10 @@ func TestValidateImage(t *testing.T) {
 				"diun.sort_tags": "chickens",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`unknown sort tags type "chickens"`),
 		},
 		{
 			name:  "Set empty sort_tags",
@@ -303,7 +264,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.sort_tags": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
@@ -314,7 +274,7 @@ func TestValidateImage(t *testing.T) {
 			image:      "myimg",
 			watchByDef: true,
 			labels:     map[string]string{},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				SortTags: registry.SortTagSemver,
 			},
 			expectedImage: model.Image{
@@ -330,7 +290,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.sort_tags": "reverse",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				SortTags: registry.SortTagSemver,
 			},
 			expectedImage: model.Image{
@@ -339,7 +299,6 @@ func TestValidateImage(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		// Test diun.max_tags
 		{
 			name:  "Set valid max_tags",
 			image: "myimg",
@@ -347,7 +306,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.max_tags": "10",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:    "myimg",
 				MaxTags: 10,
@@ -361,11 +319,10 @@ func TestValidateImage(t *testing.T) {
 				"diun.max_tags": "chickens",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`cannot parse "chickens" value of label diun.max_tags`),
 		},
 		{
 			name:  "Set empty max_tags",
@@ -374,18 +331,17 @@ func TestValidateImage(t *testing.T) {
 				"diun.max_tags": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`cannot parse "" value of label diun.max_tags`),
 		},
 		{
 			name:       "Default max_tags",
 			image:      "myimg",
 			watchByDef: true,
 			labels:     map[string]string{},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				MaxTags: 10,
 			},
 			expectedImage: model.Image{
@@ -401,7 +357,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.max_tags": "11",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				MaxTags: 10,
 			},
 			expectedImage: model.Image{
@@ -410,7 +366,6 @@ func TestValidateImage(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		// Test diun.include_tags
 		{
 			name:  "Set include_tags",
 			image: "myimg",
@@ -418,7 +373,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.include_tags": "alpine;ubuntu",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:        "myimg",
 				IncludeTags: []string{"alpine", "ubuntu"},
@@ -432,7 +386,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.include_tags": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:        "myimg",
 				IncludeTags: []string{""},
@@ -444,7 +397,7 @@ func TestValidateImage(t *testing.T) {
 			image:      "myimg",
 			watchByDef: true,
 			labels:     map[string]string{},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				IncludeTags: []string{"alpine"},
 			},
 			expectedImage: model.Image{
@@ -460,7 +413,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.include_tags": "ubuntu",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				IncludeTags: []string{"alpine"},
 			},
 			expectedImage: model.Image{
@@ -469,7 +422,6 @@ func TestValidateImage(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		// Test diun.exclude_tags
 		{
 			name:  "Set exclude_tags",
 			image: "myimg",
@@ -477,7 +429,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.exclude_tags": "alpine;ubuntu",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:        "myimg",
 				ExcludeTags: []string{"alpine", "ubuntu"},
@@ -491,7 +442,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.exclude_tags": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:        "myimg",
 				ExcludeTags: []string{""},
@@ -503,7 +453,7 @@ func TestValidateImage(t *testing.T) {
 			image:      "myimg",
 			watchByDef: true,
 			labels:     map[string]string{},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				ExcludeTags: []string{"alpine"},
 			},
 			expectedImage: model.Image{
@@ -519,7 +469,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.exclude_tags": "ubuntu",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				ExcludeTags: []string{"alpine"},
 			},
 			expectedImage: model.Image{
@@ -528,7 +478,6 @@ func TestValidateImage(t *testing.T) {
 			},
 			expectedErr: nil,
 		},
-		// Test diun.hub_tpl
 		{
 			name:  "Set hub_tpl",
 			image: "myimg",
@@ -536,7 +485,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.hub_tpl": "foo",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:   "myimg",
 				HubTpl: "foo",
@@ -550,44 +498,12 @@ func TestValidateImage(t *testing.T) {
 				"diun.hub_tpl": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:   "myimg",
 				HubTpl: "",
 			},
 			expectedErr: nil,
 		},
-		{
-			name:       "Default hub_tpl",
-			image:      "myimg",
-			watchByDef: true,
-			labels:     map[string]string{},
-			imageDefaults: model.Image{
-				HubTpl: "foo",
-			},
-			expectedImage: model.Image{
-				Name:   "myimg",
-				HubTpl: "foo",
-			},
-			expectedErr: nil,
-		},
-		{
-			name:       "Override default hub_tpl",
-			image:      "myimg",
-			watchByDef: true,
-			labels: map[string]string{
-				"diun.hub_tpl": "bar",
-			},
-			imageDefaults: model.Image{
-				HubTpl: "foo",
-			},
-			expectedImage: model.Image{
-				Name:   "myimg",
-				HubTpl: "bar",
-			},
-			expectedErr: nil,
-		},
-		// Test diun.hub_link
 		{
 			name:  "Set hub_link",
 			image: "myimg",
@@ -595,7 +511,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.hub_link": "foo",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:    "myimg",
 				HubLink: "foo",
@@ -609,44 +524,12 @@ func TestValidateImage(t *testing.T) {
 				"diun.hub_link": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:    "myimg",
 				HubLink: "",
 			},
 			expectedErr: nil,
 		},
-		{
-			name:       "Default hub_link",
-			image:      "myimg",
-			watchByDef: true,
-			labels:     map[string]string{},
-			imageDefaults: model.Image{
-				HubLink: "foo",
-			},
-			expectedImage: model.Image{
-				Name:    "myimg",
-				HubLink: "foo",
-			},
-			expectedErr: nil,
-		},
-		{
-			name:       "Override default hub_link",
-			image:      "myimg",
-			watchByDef: true,
-			labels: map[string]string{
-				"diun.hub_link": "bar",
-			},
-			imageDefaults: model.Image{
-				HubLink: "foo",
-			},
-			expectedImage: model.Image{
-				Name:    "myimg",
-				HubLink: "bar",
-			},
-			expectedErr: nil,
-		},
-		// Test diun.platform
 		{
 			name:  "Set valid platform",
 			image: "myimg",
@@ -654,7 +537,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.platform": "linux/arm/v7",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 				Platform: model.ImagePlatform{
@@ -672,11 +554,10 @@ func TestValidateImage(t *testing.T) {
 				"diun.platform": "chickens",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`cannot parse "chickens" platform of label diun.platform`),
 		},
 		{
 			name:  "Set empty platform",
@@ -685,60 +566,12 @@ func TestValidateImage(t *testing.T) {
 				"diun.platform": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name:     "myimg",
 				Platform: model.ImagePlatform{},
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`cannot parse "" platform of label diun.platform`),
 		},
-		{
-			name:       "Default platform",
-			image:      "myimg",
-			watchByDef: true,
-			labels:     map[string]string{},
-			imageDefaults: model.Image{
-				Platform: model.ImagePlatform{
-					OS:      "linux",
-					Arch:    "arm",
-					Variant: "v7",
-				},
-			},
-			expectedImage: model.Image{
-				Name: "myimg",
-				Platform: model.ImagePlatform{
-					OS:      "linux",
-					Arch:    "arm",
-					Variant: "v7",
-				},
-			},
-			expectedErr: nil,
-		},
-		{
-			name:       "Override default platform",
-			image:      "myimg",
-			watchByDef: true,
-			labels: map[string]string{
-				"diun.platform": "linux/arm/v6",
-			},
-			imageDefaults: model.Image{
-				Platform: model.ImagePlatform{
-					OS:      "linux",
-					Arch:    "arm",
-					Variant: "v7",
-				},
-			},
-			expectedImage: model.Image{
-				Name: "myimg",
-				Platform: model.ImagePlatform{
-					OS:      "linux",
-					Arch:    "arm",
-					Variant: "v6",
-				},
-			},
-			expectedErr: nil,
-		},
-		// Test diun.metadata
 		{
 			name:  "Set valid metadata",
 			image: "myimg",
@@ -746,7 +579,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.metadata.foo123": "bar",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 				Metadata: map[string]string{
@@ -762,11 +594,10 @@ func TestValidateImage(t *testing.T) {
 				"diun.metadata.lots of chickens": "bar",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
-			expectedErr: &invalidLabelError{},
+			expectedErr: errors.New(`invalid metadata key "lots of chickens"`),
 		},
 		{
 			name:  "Set empty metadata key",
@@ -775,7 +606,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.metadata.": "bar",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
@@ -787,7 +617,6 @@ func TestValidateImage(t *testing.T) {
 				"diun.metadata.foo123": "",
 			},
 			watchByDef: true,
-			imageDefaults: model.Image{},
 			expectedImage: model.Image{
 				Name: "myimg",
 			},
@@ -797,7 +626,7 @@ func TestValidateImage(t *testing.T) {
 			image:      "myimg",
 			watchByDef: true,
 			labels:     map[string]string{},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				Metadata: map[string]string{
 					"foo123": "bar",
 				},
@@ -817,7 +646,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.metadata.biz123": "baz",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				Metadata: map[string]string{
 					"foo123": "bar",
 				},
@@ -838,7 +667,7 @@ func TestValidateImage(t *testing.T) {
 			labels: map[string]string{
 				"diun.metadata.foo123": "baz",
 			},
-			imageDefaults: model.Image{
+			imageDefaults: &model.ImageDefaults{
 				Metadata: map[string]string{
 					"foo123": "bar",
 				},
@@ -856,7 +685,6 @@ func TestValidateImage(t *testing.T) {
 	for _, tt := range cases {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
 			img, err := ValidateImage(
 				tt.image,
 				tt.metadata,
@@ -868,12 +696,7 @@ func TestValidateImage(t *testing.T) {
 				assert.NoError(t, err)
 				assert.Equal(t, tt.expectedImage, img)
 			} else {
-				switch err.(type) {
+				assert.ErrorContains(t, err, tt.expectedErr.Error())
-				case *invalidLabelError:
-					assert.Error(t, err)
-				default:
-					assert.Error(t, err)
-				}
 			}
 		})
 	}

internal/provider/docker/container.go

@@ -91,7 +91,7 @@ func (c *Client) listContainerImage() []model.Image {
 			Str("ctn_image", imageName).
 			Interface("ctn_labels", ctn.Labels).
 			Msg("Validate image")
-		image, err := provider.ValidateImage(imageName, metadata(ctn), ctn.Labels, *c.config.WatchByDefault, *c.imageDefaults)
+		image, err := provider.ValidateImage(imageName, metadata(ctn), ctn.Labels, *c.config.WatchByDefault, c.imageDefaults)
 
 		if err != nil {
 			c.logger.Error().Err(err).

internal/provider/docker/docker.go

@@ -12,11 +12,11 @@ type Client struct {
 	*provider.Client
 	config        *model.PrdDocker
 	logger        zerolog.Logger
-	imageDefaults *model.Image
+	imageDefaults *model.ImageDefaults
 }
 
 // New creates new docker provider instance
-func New(config *model.PrdDocker, imageDefaults *model.Image) *provider.Client {
+func New(config *model.PrdDocker, imageDefaults *model.ImageDefaults) *provider.Client {
 	return &provider.Client{
 		Handler: &Client{
 			config:        config,

internal/provider/dockerfile/dockerfile.go

@@ -12,11 +12,11 @@ type Client struct {
 	*provider.Client
 	config        *model.PrdDockerfile
 	logger        zerolog.Logger
-	imageDefaults *model.Image
+	imageDefaults *model.ImageDefaults
 }
 
 // New creates new dockerfile provider instance
-func New(config *model.PrdDockerfile, imageDefaults *model.Image) *provider.Client {
+func New(config *model.PrdDockerfile, imageDefaults *model.ImageDefaults) *provider.Client {
 	return &provider.Client{
 		Handler: &Client{
 			config:        config,

internal/provider/dockerfile/image.go

@@ -32,7 +32,7 @@ func (c *Client) listExtImage() (list []model.Image) {
 				Interface("dfile_comments", fromImage.Comments).
 				Int("dfile_line", fromImage.Line).
 				Msg("Validate image")
-			image, err := provider.ValidateImage(fromImage.Name, nil, c.extractLabels(fromImage.Comments), true, *c.imageDefaults)
+			image, err := provider.ValidateImage(fromImage.Name, nil, c.extractLabels(fromImage.Comments), true, c.imageDefaults)
 			if err != nil {
 				c.logger.Error().Err(err).
 					Str("dfile_image", fromImage.Name).

internal/provider/file/file.go

@@ -12,11 +12,11 @@ type Client struct {
 	*provider.Client
 	config        *model.PrdFile
 	logger        zerolog.Logger
-	imageDefaults *model.Image
+	imageDefaults *model.ImageDefaults
 }
 
 // New creates new file provider instance
-func New(config *model.PrdFile, imageDefaults *model.Image) *provider.Client {
+func New(config *model.PrdFile, imageDefaults *model.ImageDefaults) *provider.Client {
 	return &provider.Client{
 		Handler: &Client{
 			config:        config,

internal/provider/file/file_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	defaultImageDefaults = model.Image{
+	defaultImageDefaults = model.ImageDefaults{
 		NotifyOn: model.NotifyOnDefaults,
 		SortTags: registry.SortTagReverse,
 	}
@@ -173,7 +173,9 @@ func TestListJobDirectory(t *testing.T) {
 func TestDefaultImageOptions(t *testing.T) {
 	fc := New(&model.PrdFile{
 		Filename: "./fixtures/dockerhub.yml",
-	}, &model.Image{WatchRepo: utl.NewTrue()})
+	}, &model.ImageDefaults{
+		WatchRepo: utl.NewTrue(),
+	})
 
 	for _, job := range fc.ListJob() {
 		assert.True(t, *job.Image.WatchRepo)

internal/provider/kubernetes/kubernetes.go

@@ -12,11 +12,11 @@ type Client struct {
 	*provider.Client
 	config        *model.PrdKubernetes
 	logger        zerolog.Logger
-	imageDefaults *model.Image
+	imageDefaults *model.ImageDefaults
 }
 
 // New creates new kubernetes provider instance
-func New(config *model.PrdKubernetes, imageDefaults *model.Image) *provider.Client {
+func New(config *model.PrdKubernetes, imageDefaults *model.ImageDefaults) *provider.Client {
 	return &provider.Client{
 		Handler: &Client{
 			config:        config,

internal/provider/kubernetes/pod.go

@@ -41,7 +41,7 @@ func (c *Client) listPodImage() []model.Image {
 				Str("ctn_image", ctn.Image).
 				Msg("Validate image")
 
-			image, err := provider.ValidateImage(ctn.Image, metadata(pod, ctn), pod.Annotations, *c.config.WatchByDefault, *c.imageDefaults)
+			image, err := provider.ValidateImage(ctn.Image, metadata(pod, ctn), pod.Annotations, *c.config.WatchByDefault, c.imageDefaults)
 			if err != nil {
 				c.logger.Error().Err(err).
 					Str("pod_name", pod.Name).

internal/provider/nomad/nomad.go

@@ -12,11 +12,11 @@ type Client struct {
 	*provider.Client
 	config        *model.PrdNomad
 	logger        zerolog.Logger
-	imageDefaults *model.Image
+	imageDefaults *model.ImageDefaults
 }
 
 // New creates new nomad provider instance
-func New(config *model.PrdNomad, imageDefaults *model.Image) *provider.Client {
+func New(config *model.PrdNomad, imageDefaults *model.ImageDefaults) *provider.Client {
 	return &provider.Client{
 		Handler: &Client{
 			config:        config,

internal/provider/nomad/task.go

@@ -101,7 +101,7 @@ func (c *Client) listTaskImages() []model.Image {
 						c.logger.Error().Err(err).Msg("Cannot merge task metadata")
 					}
 
-					image, err := provider.ValidateImage(imageName, metadata(job, taskGroup, task), labels, *c.config.WatchByDefault, *c.imageDefaults)
+					image, err := provider.ValidateImage(imageName, metadata(job, taskGroup, task), labels, *c.config.WatchByDefault, c.imageDefaults)
 					if err != nil {
 						c.logger.Error().
 							Err(err).

internal/provider/swarm/service.go

@@ -37,7 +37,7 @@ func (c *Client) listServiceImage() []model.Image {
 			Str("ctn_image", svc.Spec.TaskTemplate.ContainerSpec.Image).
 			Msg("Validate image")
 
-		image, err := provider.ValidateImage(svc.Spec.TaskTemplate.ContainerSpec.Image, metadata(svc), svc.Spec.Labels, *c.config.WatchByDefault, *c.imageDefaults)
+		image, err := provider.ValidateImage(svc.Spec.TaskTemplate.ContainerSpec.Image, metadata(svc), svc.Spec.Labels, *c.config.WatchByDefault, c.imageDefaults)
 		if err != nil {
 			c.logger.Error().Err(err).
 				Str("svc_name", svc.Spec.Name).

internal/provider/swarm/swarm.go

@@ -12,11 +12,11 @@ type Client struct {
 	*provider.Client
 	config        *model.PrdSwarm
 	logger        zerolog.Logger
-	imageDefaults *model.Image
+	imageDefaults *model.ImageDefaults
 }
 
 // New creates new swarm provider instance
-func New(config *model.PrdSwarm, imageDefaults *model.Image) *provider.Client {
+func New(config *model.PrdSwarm, imageDefaults *model.ImageDefaults) *provider.Client {
 	return &provider.Client{
 		Handler: &Client{
 			config:        config,

test/docker5/diun.yml

@@ -0,0 +1,11 @@
+watch:
+  workers: 20
+  schedule: "0 */6 * * *"
+  imageDefaults:
+    watchRepo: true
+    notifyOn:
+      - new
+    maxTags: 5
+
+providers:
+  docker: {}