fix defaults not handled by yaml configuration

Author: crazy-max

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

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 {
-		return img, &invalidLabelError{errors.Wrapf(err, "failed to merge image defaults for image %s", image)}
+	if imageDefaults != nil {
+		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
-}