Bump golang from 1.24-alpine to 1.25-alpine (#454)

Bumps golang from 1.24-alpine to 1.25-alpine.

---
updated-dependencies:
- dependency-name: golang
  dependency-version: 1.25-alpine
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine as builder
+FROM golang:1.25-alpine as builder
 
 WORKDIR /app
 COPY go.* .

cmd/backup.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/colors"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -14,12 +15,14 @@ var backupCmd = &cobra.Command{
 	Short: "Create backups for given locations",
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
+		dry, _ := cmd.Flags().GetBool("dry-run")
 
 		selected, err := internal.GetAllOrSelected(cmd, false)
 		CheckErr(err)
+
 		errors := 0
 		for _, name := range selected {
 			var splitted = strings.Split(name, "@")
@@ -28,7 +31,7 @@ var backupCmd = &cobra.Command{
 				specificBackend = splitted[1]
 			}
 			location, _ := internal.GetLocation(splitted[0])
-			errs := location.Backup(false, specificBackend)
+			errs := location.Backup(false, dry, specificBackend)
 			for _, err := range errs {
 				colors.Error.Printf("%s\n\n", err)
 				errors++
@@ -43,4 +46,5 @@ var backupCmd = &cobra.Command{
 func init() {
 	rootCmd.AddCommand(backupCmd)
 	internal.AddFlagsToCommand(backupCmd, false)
+	backupCmd.Flags().Bool("dry-run", false, "do not write changes, show what would be affected")
 }

cmd/check.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/colors"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -11,9 +12,9 @@ var checkCmd = &cobra.Command{
 	Short: "Check if everything is setup",
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
 
 		CheckErr(internal.CheckConfig())
 

cmd/cron.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/flags"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -12,9 +13,9 @@ var cronCmd = &cobra.Command{
 	Long:  `Intended to be mainly triggered by an automated system like systemd or crontab. For each location checks if a cron backup is due and runs it.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
 
 		err = internal.RunCron()
 		CheckErr(err)

cmd/exec.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/colors"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -13,9 +14,9 @@ var execCmd = &cobra.Command{
 	Short: "Execute arbitrary native restic commands for given backends",
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
 
 		selected, err := internal.GetAllOrSelected(cmd, true)
 		CheckErr(err)

cmd/forget.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/cupcakearmy/autorestic/internal"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -10,9 +11,9 @@ var forgetCmd = &cobra.Command{
 	Short: "Forget and optionally prune snapshots according the specified policies",
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
 
 		selected, err := internal.GetAllOrSelected(cmd, false)
 		CheckErr(err)

cmd/restore.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/cupcakearmy/autorestic/internal"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -13,9 +14,9 @@ var restoreCmd = &cobra.Command{
 	Args:  cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
 
 		location, _ := cmd.Flags().GetString("location")
 		l, ok := internal.GetLocation(location)

cmd/root.go

@@ -8,6 +8,7 @@ import (
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/colors"
 	"github.com/cupcakearmy/autorestic/internal/flags"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 
 	homedir "github.com/mitchellh/go-homedir"
@@ -17,7 +18,7 @@ import (
 func CheckErr(err error) {
 	if err != nil {
 		colors.Error.Fprintln(os.Stderr, "Error:", err)
-		internal.Unlock()
+		lock.Unlock()
 		os.Exit(1)
 	}
 }
@@ -41,7 +42,6 @@ func init() {
 	rootCmd.PersistentFlags().BoolVarP(&flags.VERBOSE, "verbose", "v", false, "verbose mode")
 	rootCmd.PersistentFlags().StringVar(&flags.RESTIC_BIN, "restic-bin", "restic", "specify custom restic binary")
 	rootCmd.PersistentFlags().StringVar(&flags.DOCKER_IMAGE, "docker-image", "cupcakearmy/autorestic:"+internal.VERSION, "specify a custom docker image")
-	rootCmd.PersistentFlags().StringVar(&flags.LOCKFILE_PATH, "lockfile-path", "", "specify a custom path for the lockfile (defaults to .autorestic.lock.yml next to the loaded autorestic config file)")
 	cobra.OnInitialize(initConfig)
 }
 

cmd/unlock.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/colors"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -32,7 +33,7 @@ To check you can run "ps aux | grep autorestic".`,
 			}
 		}
 
-		err := internal.Unlock()
+		err := lock.Unlock()
 		if err != nil {
 			colors.Error.Println("Could not unlock:", err)
 			return

docs/pages/cli/backup.md

@@ -1,11 +1,14 @@
 # Backup
 
 ```bash
-autorestic backup [-l, --location] [-a, --all]
+autorestic backup [-l, --location] [-a, --all] [--dry-run]
 ```
 
 Performs a backup of all locations if the `-a` flag is passed. To only backup some locations pass one or more `-l` or `--location` flags.
 
+The `--dry-run` flag will do a dry run showing what would have been deleted, but won't touch the actual data.
+
+
 ```bash
 # All
 autorestic backup -a

docs/pages/cli/general.md

@@ -34,11 +34,3 @@ With `--restic-bin` you can specify to run a specific restic binary. This can be
 ```bash
 autorestic --restic-bin /some/path/to/my/custom/restic/binary
 ```
-
-## `--lockfile-path`
-
-Specify the path for the lockfile used by `autorestic`. If omitted, this will default to `.autorestic.lock.yml` next to the loaded config file.
-
-```bash
-autorestic --lockfile-path /path/to/my/.autorestic.lock.yml
-```

internal/config.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/cupcakearmy/autorestic/internal/colors"
 	"github.com/cupcakearmy/autorestic/internal/flags"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/joho/godotenv"
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
@@ -23,7 +24,6 @@ type Options map[string]OptionMap
 
 type Config struct {
 	Version   string              `mapstructure:"version" yaml:"version"`
-	Lockfile  string              `mapstructure:"lockfile,omitempty" yaml:"lockfile,omitempty"`
 	Extras    interface{}         `mapstructure:"extras" yaml:"extras"`
 	Locations map[string]Location `mapstructure:"locations" yaml:"locations"`
 	Backends  map[string]Backend  `mapstructure:"backends" yaml:"backends"`
@@ -40,7 +40,7 @@ func exitConfig(err error, msg string) {
 	if msg != "" {
 		colors.Error.Println(msg)
 	}
-	Unlock()
+	lock.Unlock()
 	os.Exit(1)
 }
 
@@ -188,15 +188,31 @@ func CheckConfig() error {
 	if !CheckIfResticIsCallable() {
 		return fmt.Errorf(`%s was not found. Install either with "autorestic install" or manually`, flags.RESTIC_BIN)
 	}
-	for name, backend := range c.Backends {
-		backend.name = name
-		if err := backend.validate(); err != nil {
+
+	cwd, _ := GetPathRelativeToConfig(".")
+	for name, location := range c.Locations {
+		location.name = name
+
+		// Hooks before location validation
+		options := ExecuteOptions{
+			Command: "bash",
+			Dir:     cwd,
+			Envs: map[string]string{
+				"AUTORESTIC_LOCATION": location.name,
+			},
+		}
+		if err := location.ExecuteHooks(location.Hooks.PreValidate, options); err != nil {
+			return err
+		}
+
+		if err := location.validate(); err != nil {
 			return err
 		}
 	}
-	for name, location := range c.Locations {
-		location.name = name
-		if err := location.validate(); err != nil {
+
+	for name, backend := range c.Backends {
+		backend.name = name
+		if err := backend.validate(); err != nil {
 			return err
 		}
 	}

internal/flags/flags.go

@@ -6,5 +6,4 @@ var (
 	CRON_LEAN  bool = false
 	RESTIC_BIN string
 	DOCKER_IMAGE string
-	LOCKFILE_PATH string
 )

internal/location.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/cupcakearmy/autorestic/internal/colors"
 	"github.com/cupcakearmy/autorestic/internal/flags"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/cupcakearmy/autorestic/internal/metadata"
 	"github.com/robfig/cron"
 )
@@ -167,7 +168,7 @@ func (l Location) getLocationTags() string {
 	return buildTag("location", l.name)
 }
 
-func (l Location) Backup(cron bool, specificBackend string) []error {
+func (l Location) Backup(cron bool, dry bool, specificBackend string) []error {
 	var errors []error
 	var backends []string
 	colors.PrimaryPrint("  Backing up location \"%s\"  ", l.name)
@@ -227,6 +228,9 @@ func (l Location) Backup(cron bool, specificBackend string) []error {
 		if cron {
 			cmd = append(cmd, "--tag", buildTag("cron"))
 		}
+		if dry {
+			cmd = append(cmd, "--dry-run")
+		}
 		cmd = append(cmd, "--tag", l.getLocationTags())
 		backupOptions := ExecuteOptions{
 			Envs: env,
@@ -441,12 +445,12 @@ func (l Location) RunCron() error {
 	if err != nil {
 		return err
 	}
-	last := time.Unix(GetCron(l.name), 0)
+	last := time.Unix(lock.GetCron(l.name), 0)
 	next := schedule.Next(last)
 	now := time.Now()
 	if now.After(next) {
-		SetCron(l.name, now.Unix())
-		errs := l.Backup(true, "")
+		lock.SetCron(l.name, now.Unix())
+		errs := l.Backup(true, false, "")
 		if len(errs) > 0 {
 			return fmt.Errorf("Failed to backup location \"%s\":\n%w", l.name, errors.Join(errs...))
 		}

internal/lock/lock.go

@@ -1,9 +1,8 @@
-package internal
+package lock
 
 import (
 	"os"
 	"path"
-	"path/filepath"
 	"sync"
 
 	"github.com/cupcakearmy/autorestic/internal/colors"
@@ -13,47 +12,24 @@ import (
 
 var lock *viper.Viper
 var file string
-var lockOnce sync.Once
+var once sync.Once
 
 const (
 	RUNNING = "running"
 )
 
-// getLockfilePath returns the path to the lockfile. The path for the lockfile
-// can be sources from multiple places If flags.LOCKFILE_PATH is set, its value
-// is used; if the config has the `lockfile` option set, its value is used;
-// otherwise the path is generated relative to the config file.
-func getLockfilePath() string {
-	if flags.LOCKFILE_PATH != "" {
-		abs, err := filepath.Abs(flags.LOCKFILE_PATH)
-		if err != nil {
-			return flags.LOCKFILE_PATH
-		}
-		return abs
-	}
-
-	if lockfile := GetConfig().Lockfile; lockfile != "" {
-		abs, err := filepath.Abs(lockfile)
-		if err != nil {
-			return lockfile
-		}
-		return abs
-	}
+func getLock() *viper.Viper {
+	if lock == nil {
 
+		once.Do(func() {
+			lock = viper.New()
+			lock.SetDefault("running", false)
 			p := viper.ConfigFileUsed()
 			if p == "" {
 				colors.Error.Println("cannot lock before reading config location")
 				os.Exit(1)
 			}
-	return path.Join(path.Dir(p), ".autorestic.lock.yml")
-}
-
-func getLock() *viper.Viper {
-	if lock == nil {
-		lockOnce.Do(func() {
-			lock = viper.New()
-			lock.SetDefault("running", false)
-			file = getLockfilePath()
+			file = path.Join(path.Dir(p), ".autorestic.lock.yml")
 			if !flags.CRON_LEAN {
 				colors.Faint.Println("Using lock:\t", file)
 			}

internal/lock/lock_test.go

@@ -1,4 +1,4 @@
-package internal
+package lock
 
 import (
 	"log"
@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/cupcakearmy/autorestic/internal/flags"
 	"github.com/spf13/viper"
 )
 
@@ -29,37 +28,6 @@ func setup(t *testing.T) {
 	})
 }
 
-func TestGetLockfilePath(t *testing.T) {
-	t.Run("when flags.LOCKFILE_PATH is set", func(t *testing.T) {
-		flags.LOCKFILE_PATH = "/path/to/my/autorestic.lock.yml"
-		defer func() { flags.LOCKFILE_PATH = "" }()
-
-		p := getLockfilePath()
-
-		if p != "/path/to/my/autorestic.lock.yml" {
-			t.Errorf("got %v, want %v", p, "/path/to/my/autorestic.lock.yml")
-		}
-	})
-
-	t.Run("when flags.LOCKFILE_PATH is set", func(t *testing.T) {
-		d, err := os.MkdirTemp("", testDirectory)
-		if err != nil {
-			log.Fatalf("error creating temp dir: %v", err)
-			return
-		}
-		viper.SetConfigFile(d + "/.autorestic.yml")
-		defer viper.Reset()
-
-		flags.LOCKFILE_PATH = ""
-
-		p := getLockfilePath()
-
-		if p != d+"/.autorestic.lock.yml" {
-			t.Errorf("got %v, want %v", p, d+"/.autorestic.lock.yml")
-		}
-	})
-}
-
 func TestLock(t *testing.T) {
 	setup(t)
 

main.go

@@ -22,7 +22,7 @@ import (
 	"syscall"
 
 	"github.com/cupcakearmy/autorestic/cmd"
-	"github.com/cupcakearmy/autorestic/internal"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 )
 
 func handleCtrlC() {
@@ -31,7 +31,7 @@ func handleCtrlC() {
 	go func() {
 		sig := <-c
 		fmt.Println("Signal:", sig)
-		internal.Unlock()
+		lock.Unlock()
 		os.Exit(0)
 	}()
 }