refactor: nil for retntion policies

Author: ItsNotGoodName

config/config.go

@@ -103,21 +103,21 @@ func Parse(raw Raw) (Config, error) {
 		rrules = append(rrules, rule)
 	}
 
-	var attachmentsSize int64
-	if raw.Retention.AttachmentSize != "" {
-		var err error
-		attachmentsSize, err = bytes.Parse(raw.Retention.AttachmentSize)
+	var attachmentsSize *int64
+	if raw.Retention.AttachmentSize != nil {
+		size, err := bytes.Parse(*raw.Retention.AttachmentSize)
 		if err != nil {
 			return Config{}, err
 		}
+		attachmentsSize = &size
 	}
-	var envelopeAge time.Duration
-	if raw.Retention.EnvelopeAge != "" {
-		var err error
-		envelopeAge, err = time.ParseDuration(raw.Retention.EnvelopeAge)
+	var envelopeAge *time.Duration
+	if raw.Retention.EnvelopeAge != nil {
+		age, err := time.ParseDuration(*raw.Retention.EnvelopeAge)
 		if err != nil {
 			return Config{}, err
 		}
+		envelopeAge = &age
 	}
 
 	retentionPolicy := models.RetentionPolicy{
@@ -147,9 +147,9 @@ type Raw struct {
 	MaxPayloadSize string `name:"max_payload_size" default:"25 MB"`
 	DataDirectory  string `name:"data_directory" default:"smtpbridge_data" arg:""`
 	Retention      struct {
-		EnvelopeCount  int    `name:"envelope_count"`
-		EnvelopeAge    string `name:"envelope_age"`
-		AttachmentSize string `name:"attachment_size"`
+		EnvelopeCount  *int    `name:"envelope_count"`
+		EnvelopeAge    *string `name:"envelope_age"`
+		AttachmentSize *string `name:"attachment_size"`
 	} `embed:"" prefix:"retention-"`
 	HTTP struct {
 		Disable bool

internal/models/retention.go

@@ -3,8 +3,8 @@ package models
 import "time"
 
 type RetentionPolicy struct {
-	EnvelopeCount  int
-	EnvelopeAge    time.Duration
+	EnvelopeCount  *int
+	EnvelopeAge    *time.Duration
 	MinEnvelopeAge time.Duration
-	AttachmentSize int64
+	AttachmentSize *int64
 }

internal/procs/gardener.go

@@ -73,41 +73,54 @@ func gardener(cc *core.Context, policy models.RetentionPolicy, envCreatedC <-cha
 	}
 }
 func gardenerDeleteByAttachmentSize(cc *core.Context, policy models.RetentionPolicy, storage models.Storage) {
-	if policy.AttachmentSize != 0 && storage.AttachmentSize > policy.AttachmentSize {
-		count := humanize.Bytes(uint64(storage.AttachmentSize - policy.AttachmentSize))
+	if policy.AttachmentSize == nil {
+		return
+	}
+	attachmentSize := *policy.AttachmentSize
+
+	if storage.AttachmentSize > attachmentSize {
+		count := humanize.Bytes(uint64(storage.AttachmentSize - attachmentSize))
 		log.Info().Str("count", count).Msg("Deleting attachment files by attachment size retention policy")
 
-		err := files.DeleteFileUntilSize(cc, storage.AttachmentSize, policy.AttachmentSize)
+		err := files.DeleteFileUntilSize(cc, storage.AttachmentSize, attachmentSize)
 		if err != nil {
 			log.Err(err).Msg("Failed to delete attachment files by attachment size retention policy")
 		}
 	}
 }
 
 func gardenerDeleteByEnvelopeCount(cc *core.Context, policy models.RetentionPolicy, storage models.Storage) {
-	if policy.EnvelopeCount != 0 && storage.EnvelopeCount > policy.EnvelopeCount {
+	if policy.EnvelopeCount == nil {
+		return
+	}
+	envelopeCount := *policy.EnvelopeCount
+
+	if storage.EnvelopeCount > envelopeCount {
 		date := time.Now().Add(-policy.MinEnvelopeAge)
-		count, err := db.EnvelopeDeleteUntilCount(cc, policy.EnvelopeCount, date)
+		count, err := db.EnvelopeDeleteUntilCount(cc, envelopeCount, date)
 		if err != nil {
-			log.Err(err).Time("age", date).Int("keep", policy.EnvelopeCount).Msg("Failed to envelopes by envelope count retention policy")
+			log.Err(err).Time("age", date).Int("keep", envelopeCount).Msg("Failed to envelopes by envelope count retention policy")
 		} else {
-			log.Info().Time("age", date).Int("keep", policy.EnvelopeCount).Int64("deleted", count).Msg("Deleted envelopes by envelope count retention policy")
+			log.Info().Time("age", date).Int("keep", envelopeCount).Int64("deleted", count).Msg("Deleted envelopes by envelope count retention policy")
 		}
 	}
 }
 
 func gardenerDeleteByAge(cc *core.Context, policy models.RetentionPolicy) {
-	if policy.EnvelopeAge != 0 {
-		date := time.Now().Add(-policy.EnvelopeAge)
-		if policy.MinEnvelopeAge > policy.EnvelopeAge {
-			date.Add(-policy.MinEnvelopeAge)
-		}
-		count, err := db.EnvelopeDeleteOlderThan(cc, date)
-		if err != nil {
-			log.Err(err).Time("age", date).Msg("Failed to delete envelopes by age retention policy")
-		} else {
-			log.Info().Time("age", date).Int64("deleted", count).Msg("Deleted envelopes by age retention policy")
-		}
+	if policy.EnvelopeAge == nil {
+		return
+	}
+	envelopeAge := *policy.EnvelopeAge
+
+	date := time.Now().Add(-envelopeAge)
+	if policy.MinEnvelopeAge > envelopeAge {
+		date.Add(-policy.MinEnvelopeAge)
+	}
+	count, err := db.EnvelopeDeleteOlderThan(cc, date)
+	if err != nil {
+		log.Err(err).Time("age", date).Msg("Failed to delete envelopes by age retention policy")
+	} else {
+		log.Info().Time("age", date).Int64("deleted", count).Msg("Deleted envelopes by age retention policy")
 	}
 }