Log when attempting to push metrics to gateway

Defaults to remove all locks, even non-stale

.drone.yml

@@ -4,7 +4,7 @@ name: test
 
 steps:
   - name: test
-    image: golang:1.20
+    image: golang:1.21
     environment:
       VERSION: ${DRONE_TAG:-${DRONE_COMMIT}}
     commands:
@@ -13,7 +13,7 @@ steps:
       - make test
 
   - name: check
-    image: iamthefij/drone-pre-commit:personal
+    image: iamthefij/drone-pre-commit@sha256:30fa17489b86d7a4c3ad9c3ce2e152c25d82b8671e5609d322c6cae0baed89cd
 
 ---
 kind: pipeline
@@ -32,7 +32,7 @@ trigger:
 
 steps:
   - name: build all binaries
-    image: golang:1.17
+    image: golang:1.21
     environment:
       VERSION: ${DRONE_TAG:-${DRONE_COMMIT}}
     commands:

.gitignore

@@ -20,4 +20,9 @@ dist/
 
 # Built executable
 restic-scheduler
+resticscheduler
 data/
+
+# Itest temp dirs
+itest/data
+itest/repo

.golangci.yml

@@ -16,7 +16,6 @@ linters:
     - contextcheck
     - cyclop
     - decorder
-    - depguard
     - dupl
     - durationcheck
     - errchkjson
@@ -32,10 +31,8 @@ linters:
     - gocognit
     - goconst
     - gocritic
-    # - gocyclo  # Using cyclop
     - godot
-    # - goerr113  # Using errorlint
-    - gofmt
+    - gofumpt
     - goheader
     - goimports
     - gomnd
@@ -45,7 +42,6 @@ linters:
     - gosec
     - grouper
     - importas
-    # - ireturn
     - lll
     - maintidx
     - makezero
@@ -60,11 +56,9 @@ linters:
     - paralleltest
     - prealloc
     - predeclared
-    # - promlinter  # Not common enough
     - revive
     - rowserrcheck
     - sqlclosecheck
-    # - stylecheck  # Using revive
     - tagliatelle
     - tenv
     - testpackage
@@ -72,27 +66,11 @@ linters:
     - tparallel
     - unconvert
     - unparam
-    - varnamelen
     - wastedassign
     - whitespace
     - wrapcheck
     - wsl
 
-  disable:
-    - gochecknoglobals
-    - godox
-    - forbidigo
-    # Deprecated
-    - golint
-    - interfacer
-    - maligned
-    - scopelint
-    - ifshort
-    - varcheck
-    - structcheck
-    - deadcode
-    - exhaustivestruct
-
 linters-settings:
   gomnd:
     settings:

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml
@@ -11,10 +11,8 @@ repos:
       - id: end-of-file-fixer
       - id: check-merge-conflict
   - repo: https://github.com/dnephin/pre-commit-golang
-    rev: v0.4.0
+    rev: v0.5.1
     hooks:
-      - id: go-fmt
-      - id: go-imports
       - id: golangci-lint
         args:
           - --timeout=3m

Dockerfile

@@ -1,19 +1,23 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 RUN apk add --no-cache \
         bash~=5 \
-        consul~=1.14 \
-        nomad~=1.4 \
-        mariadb-client~=10.6 \
-        mariadb-connector-c~=3.3 \
-        rclone~=1.60 \
-        redis~=7.0 \
-        restic~=0.14 \
+        consul~=1 \
+        mariadb-client~=10 \
+        mariadb-connector-c~=3 \
+        nomad~=1 \
+        postgresql15-client~=15 \
+        rclone~=1.62 \
+        redis~=7 \
+        restic~=0.15 \
         sqlite~=3 \
+        tzdata~=2023 \
         ;
 
 ARG TARGETOS
 ARG TARGETARCH
 COPY ./dist/resticscheduler-$TARGETOS-$TARGETARCH /bin/resticscheduler
 
+HEALTHCHECK CMD ["wget", "-O", "-", "http://localhost:8080/health"]
+
 ENTRYPOINT [ "/bin/resticscheduler" ]

Makefile

@@ -32,6 +32,10 @@ test:
 	go test -v -coverprofile=coverage.out # -short
 	go tool cover -func=coverage.out
 
+.PHONY: itest
+itest: docker-build
+	./itest/run.sh
+
 # Installs pre-commit hooks
 .PHONY: install-hooks
 install-hooks:

itest/bootstrap-tests.sh

@@ -0,0 +1,46 @@
+#! /bin/sh
+set -ex
+
+# Create flat file
+echo "Hello" > /data/test.txt
+
+# Create Sqlite database
+touch /data/test_database.db
+sqlite3 /data/test_database.db <<-EOF
+CREATE TABLE test_table (
+  id INTEGER PRIMARY KEY,
+  data TEXT NOT NULL
+);
+
+INSERT INTO test_table(data)
+VALUES ("Test row");
+EOF
+
+# Create MySql database
+until mysql --host "$MYSQL_HOST" --user "$MYSQL_USER" --password="$MYSQL_PWD" --execute "SHOW DATABASES;"; do
+  sleep 1
+done
+mysql --host "$MYSQL_HOST" --user "$MYSQL_USER" --password="$MYSQL_PWD" main <<EOF
+CREATE TABLE test_table (
+  id INTEGER AUTO_INCREMENT PRIMARY KEY,
+  data TEXT NOT NULL
+);
+
+INSERT INTO test_table(data)
+VALUES ("Test row");
+EOF
+
+# Create Postgres database
+export PGPASSWORD="$PGSQL_PASS"
+until psql --host "$PGSQL_HOST" --username "$PGSQL_USER" --command "SELECT datname FROM pg_database;"; do
+  sleep 1
+done
+psql -v ON_ERROR_STOP=1 --host "$PGSQL_HOST" --username "$PGSQL_USER" main <<EOF
+CREATE TABLE test_table (
+  id SERIAL PRIMARY KEY,
+  data TEXT NOT NULL
+);
+
+INSERT INTO test_table(data)
+VALUES ('Test row');
+EOF

itest/docker-compose.yml

@@ -0,0 +1,57 @@
+---
+version: "3.9"
+
+services:
+  mysql:
+    image: mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: shhh
+      MYSQL_DATABASE: main
+
+  postgres:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: shhh
+      POSTGRES_DB: main
+
+  bootstrap:
+    image: resticscheduler
+    entrypoint: /bootstrap-tests.sh
+    environment:
+      MYSQL_HOST: mysql
+      MYSQL_USER: root
+      MYSQL_PWD: shhh
+      PGSQL_HOST: postgres
+      PGSQL_USER: postgres
+      PGSQL_PASS: shhh
+    volumes:
+      - ./bootstrap-tests.sh:/bootstrap-tests.sh
+      - ./data:/data
+
+  main:
+    image: resticscheduler
+    environment:
+      MYSQL_HOST: mysql
+      MYSQL_USER: root
+      MYSQL_PWD: shhh
+      PGSQL_HOST: postgres
+      PGSQL_USER: postgres
+      PGSQL_PASS: shhh
+    volumes:
+      - ./repo:/repo
+      - ./data:/data
+      - ./test-backup.hcl:/test-backup.hcl
+
+  validate:
+    image: resticscheduler
+    entrypoint: /validate-tests.sh
+    environment:
+      MYSQL_HOST: mysql
+      MYSQL_USER: root
+      MYSQL_PWD: shhh
+      PGSQL_HOST: postgres
+      PGSQL_USER: postgres
+      PGSQL_PASS: shhh
+    volumes:
+      - ./validate-tests.sh:/validate-tests.sh
+      - ./data:/data

itest/run.sh

@@ -0,0 +1,35 @@
+#! /bin/bash
+set -ex
+
+cd "$(dirname "$0")"
+mkdir -p ./repo ./data
+
+echo Clean everything
+docker-compose down -v
+rm -fr ./repo/* ./data/*
+sleep 5
+
+echo Boostrap databases and data
+docker-compose up -d mysql postgres
+docker-compose run bootstrap
+sleep 1
+
+echo Run backup job
+docker-compose run main -backup IntegrationTest -once /test-backup.hcl
+
+echo Clean data
+docker-compose down -v
+docker-compose up -d mysql postgres
+rm -fr ./data/*
+sleep 15
+
+echo Run restore
+docker-compose run main -restore IntegrationTest -once /test-backup.hcl
+sleep 1
+
+echo Validate data
+docker-compose run validate
+
+echo Clean all again
+docker-compose down -v
+rm -fr ./repo/* ./data/*

itest/test-backup.hcl

@@ -0,0 +1,38 @@
+job "IntegrationTest" {
+  schedule = "@daily"
+
+  config {
+    repo = "/repo"
+    passphrase = "shh"
+  }
+
+  mysql "MySQL" {
+    hostname = env("MYSQL_HOST")
+    database = "main"
+    username = env("MYSQL_USER")
+    password = env("MYSQL_PWD")
+    dump_to = "/tmp/mysql.sql"
+  }
+
+  postgres "Postgres" {
+    hostname = env("PGSQL_HOST")
+    database = "main"
+    username = env("PGSQL_USER")
+    password = env("PGSQL_PASS")
+    create = true
+    dump_to = "/tmp/psql.sql"
+  }
+
+  sqlite "SQLite" {
+    path = "/data/test_database.db"
+    dump_to = "/data/test_database.db.bak"
+  }
+
+  backup {
+    paths = ["/data"]
+
+    restore_opts {
+      Target = "/"
+    }
+  }
+}

itest/validate-tests.sh

@@ -0,0 +1,21 @@
+#! /bin/sh
+set -ex
+
+# Check flat file
+test -f /data/test.txt
+grep "^Hello" /data/test.txt
+
+# Check Sqlite database
+test -f /data/test_database.db
+sqlite3 /data/test_database.db "select data from test_table where id = 1" | grep "^Test row"
+
+# Check MySql database
+mysql --host "$MYSQL_HOST" --user "$MYSQL_USER" --password="$MYSQL_PWD" main <<EOF | grep "^Test row"
+select data from test_table where id = 1;
+EOF
+
+# Check Postgres database
+export PGPASSWORD="$PGSQL_PASS"
+psql --host "$PGSQL_HOST" --user "$PGSQL_USER" main <<EOF | grep "Test row"
+select data from test_table where id = 1;
+EOF

job.go

@@ -60,8 +60,9 @@ type Job struct {
 	// Meta Tasks
 	// NOTE: Now that these are also available within a task
 	// these could be removed to make task order more obvious
-	MySQL  []JobTaskMySQL  `hcl:"mysql,block"`
-	Sqlite []JobTaskSqlite `hcl:"sqlite,block"`
+	MySQL    []JobTaskMySQL    `hcl:"mysql,block"`
+	Postgres []JobTaskPostgres `hcl:"postgres,block"`
+	Sqlite   []JobTaskSqlite   `hcl:"sqlite,block"`
 
 	// Metrics and health
 	healthy bool
@@ -81,6 +82,12 @@ func (j Job) validateTasks() error {
 		}
 	}
 
+	for _, pg := range j.Postgres {
+		if err := pg.Validate(); err != nil {
+			return fmt.Errorf("job %s has an invalid task: %w", j.Name, err)
+		}
+	}
+
 	for _, sqlite := range j.Sqlite {
 		if err := sqlite.Validate(); err != nil {
 			return fmt.Errorf("job %s has an invalid task: %w", j.Name, err)
@@ -126,6 +133,10 @@ func (j Job) AllTasks() []ExecutableTask {
 		allTasks = append(allTasks, mysql.GetPreTask())
 	}
 
+	for _, pg := range j.Postgres {
+		allTasks = append(allTasks, pg.GetPreTask())
+	}
+
 	for _, sqlite := range j.Sqlite {
 		allTasks = append(allTasks, sqlite.GetPreTask())
 	}
@@ -146,6 +157,10 @@ func (j Job) AllTasks() []ExecutableTask {
 		allTasks = append(allTasks, mysql.GetPostTask())
 	}
 
+	for _, pg := range j.Postgres {
+		allTasks = append(allTasks, pg.GetPostTask())
+	}
+
 	for _, sqlite := range j.Sqlite {
 		allTasks = append(allTasks, sqlite.GetPostTask())
 	}
@@ -160,6 +175,10 @@ func (j Job) BackupPaths() []string {
 		paths = append(paths, t.DumpToPath)
 	}
 
+	for _, t := range j.Postgres {
+		paths = append(paths, t.DumpToPath)
+	}
+
 	for _, t := range j.Sqlite {
 		paths = append(paths, t.DumpToPath)
 	}
@@ -261,8 +280,10 @@ func (j Job) Run() {
 		result.LastError = err
 	} else {
 		Metrics.SnapshotCurrentCount.WithLabelValues(j.Name).Set(float64(len(snapshots)))
-		latestSnapshot := snapshots[len(snapshots)-1]
-		Metrics.SnapshotLatestTime.WithLabelValues(j.Name).Set(float64(latestSnapshot.Time.Unix()))
+		if len(snapshots) > 0 {
+			latestSnapshot := snapshots[len(snapshots)-1]
+			Metrics.SnapshotLatestTime.WithLabelValues(j.Name).Set(float64(latestSnapshot.Time.Unix()))
+		}
 	}
 
 	if result.Success {

job_test.go

@@ -92,6 +92,7 @@ func TestJobValidation(t *testing.T) {
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
 				MySQL:    []main.JobTaskMySQL{},
+				Postgres: []main.JobTaskPostgres{},
 				Sqlite:   []main.JobTaskSqlite{},
 			},
 			expectedErr: nil,
@@ -106,6 +107,7 @@ func TestJobValidation(t *testing.T) {
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
 				MySQL:    []main.JobTaskMySQL{},
+				Postgres: []main.JobTaskPostgres{},
 				Sqlite:   []main.JobTaskSqlite{},
 			},
 			expectedErr: main.ErrMissingField,
@@ -120,6 +122,7 @@ func TestJobValidation(t *testing.T) {
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
 				MySQL:    []main.JobTaskMySQL{},
+				Postgres: []main.JobTaskPostgres{},
 				Sqlite:   []main.JobTaskSqlite{},
 			},
 			expectedErr: main.ErrInvalidConfigValue,
@@ -134,6 +137,7 @@ func TestJobValidation(t *testing.T) {
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
 				MySQL:    []main.JobTaskMySQL{},
+				Postgres: []main.JobTaskPostgres{},
 				Sqlite:   []main.JobTaskSqlite{},
 			},
 			expectedErr: main.ErrMutuallyExclusive,
@@ -144,10 +148,13 @@ func TestJobValidation(t *testing.T) {
 				Name:     "Test job",
 				Schedule: "@daily",
 				Config:   ValidResticConfig(),
-				Tasks:    []main.JobTask{{}},
+				Tasks: []main.JobTask{
+					{}, //nolint:exhaustruct
+				},
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
 				MySQL:    []main.JobTaskMySQL{},
+				Postgres: []main.JobTaskPostgres{},
 				Sqlite:   []main.JobTaskSqlite{},
 			},
 			expectedErr: main.ErrMissingField,
@@ -161,7 +168,10 @@ func TestJobValidation(t *testing.T) {
 				Tasks:    []main.JobTask{},
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
-				MySQL:    []main.JobTaskMySQL{{}},
+				MySQL: []main.JobTaskMySQL{
+					{}, //nolint:exhaustruct
+				},
+				Postgres: []main.JobTaskPostgres{},
 				Sqlite:   []main.JobTaskSqlite{},
 			},
 			expectedErr: main.ErrMissingField,
@@ -176,7 +186,10 @@ func TestJobValidation(t *testing.T) {
 				Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 				Forget:   nil,
 				MySQL:    []main.JobTaskMySQL{},
-				Sqlite:   []main.JobTaskSqlite{{}},
+				Postgres: []main.JobTaskPostgres{},
+				Sqlite: []main.JobTaskSqlite{
+					{}, //nolint:exhaustruct
+				},
 			},
 			expectedErr: main.ErrMissingField,
 		},
@@ -215,7 +228,9 @@ func TestConfigValidation(t *testing.T) {
 					Config:   ValidResticConfig(),
 					Tasks:    []main.JobTask{},
 					Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
+					Forget:   nil,
 					MySQL:    []main.JobTaskMySQL{},
+					Postgres: []main.JobTaskPostgres{},
 					Sqlite:   []main.JobTaskSqlite{},
 				}},
 			},
@@ -231,7 +246,9 @@ func TestConfigValidation(t *testing.T) {
 					Config:   nil,
 					Tasks:    []main.JobTask{},
 					Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
+					Forget:   nil,
 					MySQL:    []main.JobTaskMySQL{},
+					Postgres: []main.JobTaskPostgres{},
 					Sqlite:   []main.JobTaskSqlite{},
 				}},
 			},
@@ -257,6 +274,7 @@ func TestConfigValidation(t *testing.T) {
 					Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 					Forget:   nil,
 					MySQL:    []main.JobTaskMySQL{},
+					Postgres: []main.JobTaskPostgres{},
 					Sqlite:   []main.JobTaskSqlite{},
 				}},
 			},
@@ -274,8 +292,10 @@ func TestConfigValidation(t *testing.T) {
 					Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 					Forget:   nil,
 					MySQL:    []main.JobTaskMySQL{},
+					Postgres: []main.JobTaskPostgres{},
 					Sqlite:   []main.JobTaskSqlite{},
-				}}},
+				}},
+			},
 			expectedErr: main.ErrMissingField,
 		},
 	}

main.go

@@ -29,8 +29,12 @@ func ParseConfig(path string) ([]Job, error) {
 		Functions: map[string]function.Function{
 			"env": function.New(&function.Spec{
 				Params: []function.Parameter{{
-					Name: "var",
-					Type: cty.String,
+					Name:             "var",
+					Type:             cty.String,
+					AllowNull:        false,
+					AllowUnknown:     false,
+					AllowDynamicType: false,
+					AllowMarked:      false,
 				}},
 				VarParam: nil,
 				Type:     function.StaticReturnType(cty.String),
@@ -40,8 +44,12 @@ func ParseConfig(path string) ([]Job, error) {
 			}),
 			"readfile": function.New(&function.Spec{
 				Params: []function.Parameter{{
-					Name: "path",
-					Type: cty.String,
+					Name:             "path",
+					Type:             cty.String,
+					AllowNull:        false,
+					AllowUnknown:     false,
+					AllowDynamicType: false,
+					AllowMarked:      false,
 				}},
 				VarParam: nil,
 				Type:     function.StaticReturnType(cty.String),
@@ -181,10 +189,32 @@ func runRestoreJobs(jobs []Job, names string, snapshot string) error {
 	return filterJobErr
 }
 
+func runUnlockJobs(jobs []Job, names string) error {
+	if names == "" {
+		return nil
+	}
+
+	namesSlice := strings.Split(names, ",")
+
+	if len(namesSlice) == 0 {
+		return nil
+	}
+
+	jobs, filterJobErr := FilterJobs(jobs, namesSlice)
+	for _, job := range jobs {
+		if err := job.NewRestic().Unlock(UnlockOpts{RemoveAll: true}); err != nil {
+			return err
+		}
+	}
+
+	return filterJobErr
+}
+
 type Flags struct {
 	showVersion        bool
 	backup             string
 	restore            string
+	unlock             string
 	restoreSnapshot    string
 	once               bool
 	healthCheckAddr    string
@@ -196,6 +226,7 @@ func readFlags() Flags {
 	flag.BoolVar(&flags.showVersion, "version", false, "Display the version and exit")
 	flag.StringVar(&flags.backup, "backup", "", "Run backup jobs now. Names are comma separated. `all` will run all.")
 	flag.StringVar(&flags.restore, "restore", "", "Run restore jobs now. Names are comma separated. `all` will run all.")
+	flag.StringVar(&flags.unlock, "unlock", "", "Unlock job repos now. Names are comma separated. `all` will run all.")
 	flag.BoolVar(&flags.once, "once", false, "Run jobs specified using -backup and -restore once and exit")
 	flag.StringVar(&flags.healthCheckAddr, "addr", "0.0.0.0:8080", "address to bind health check API")
 	flag.StringVar(&flags.metricsPushGateway, "push-gateway", "", "url of push gateway service for batch runs (optional)")
@@ -206,7 +237,12 @@ func readFlags() Flags {
 	return flags
 }
 
-func runSpecifiedJobs(jobs []Job, backupJobs, restoreJobs, snapshot string) error {
+func runSpecifiedJobs(jobs []Job, backupJobs, restoreJobs, unlockJobs, snapshot string) error {
+	// Run specified job unlocks
+	if err := runUnlockJobs(jobs, unlockJobs); err != nil {
+		return fmt.Errorf("Failed running unlock for jobs: %w", err)
+	}
+
 	// Run specified backup jobs
 	if err := runBackupJobs(jobs, backupJobs); err != nil {
 		return fmt.Errorf("Failed running backup jobs: %w", err)
@@ -222,6 +258,8 @@ func runSpecifiedJobs(jobs []Job, backupJobs, restoreJobs, snapshot string) erro
 
 func maybePushMetrics(metricsPushGateway string) error {
 	if metricsPushGateway != "" {
+		fmt.Println("Pushing metrics to push gateway")
+
 		if err := Metrics.PushToGateway(metricsPushGateway); err != nil {
 			return fmt.Errorf("Failed pushing metrics after jobs run: %w", err)
 		}
@@ -253,7 +291,7 @@ func main() {
 		log.Fatalf("Failed to read jobs from files: %v", err)
 	}
 
-	if err := runSpecifiedJobs(jobs, flags.backup, flags.restore, flags.restoreSnapshot); err != nil {
+	if err := runSpecifiedJobs(jobs, flags.backup, flags.restore, flags.unlock, flags.restoreSnapshot); err != nil {
 		log.Fatal(err)
 	}
 

main_test.go

@@ -31,7 +31,6 @@ func TestReadJobs(t *testing.T) {
 	t.Parallel()
 
 	jobs, err := main.ReadJobs([]string{"./test/sample.hcl"})
-
 	if err != nil {
 		t.Errorf("Unexpected error reading jobs: %v", err)
 	}
@@ -52,6 +51,7 @@ func TestRunJobs(t *testing.T) {
 		Backup:   main.BackupFilesTask{Paths: []string{"/test"}}, //nolint:exhaustruct
 		Forget:   nil,
 		MySQL:    []main.JobTaskMySQL{},
+		Postgres: []main.JobTaskPostgres{},
 		Sqlite:   []main.JobTaskSqlite{},
 	}
 

metrics.go

@@ -19,7 +19,6 @@ func (m ResticMetrics) PushToGateway(url string) error {
 	err := push.New(url, "batch").
 		Gatherer(m.Registry).
 		Add()
-
 	if err != nil {
 		return fmt.Errorf("error pushing to registry %s: %w", url, err)
 	}

restic.go

@@ -11,8 +11,10 @@ import (
 	"time"
 )
 
-var ErrRestic = errors.New("restic error")
-var ErrRepoNotFound = errors.New("repository not found or uninitialized")
+var (
+	ErrRestic       = errors.New("restic error")
+	ErrRepoNotFound = errors.New("repository not found or uninitialized")
+)
 
 func lineIn(needle string, haystack []string) bool {
 	for _, line := range haystack {
@@ -72,6 +74,16 @@ func (NoOpts) ToArgs() []string {
 	return []string{}
 }
 
+type UnlockOpts struct {
+	RemoveAll bool `hcl:"RemoveAll,optional"`
+}
+
+func (uo UnlockOpts) ToArgs() (args []string) {
+	args = maybeAddArgBool(args, "--remove-all", uo.RemoveAll)
+
+	return
+}
+
 type BackupOpts struct {
 	Exclude []string `hcl:"Exclude,optional"`
 	Include []string `hcl:"Include,optional"`
@@ -193,9 +205,10 @@ type ResticGlobalOpts struct {
 	TLSClientCertFile string            `hcl:"TlsClientCertFile,optional"`
 	LimitDownload     int               `hcl:"LimitDownload,optional"`
 	LimitUpload       int               `hcl:"LimitUpload,optional"`
-	Options           map[string]string `hcl:"Options,optional"`
 	VerboseLevel      int               `hcl:"VerboseLevel,optional"`
+	Options           map[string]string `hcl:"Options,optional"`
 	CleanupCache      bool              `hcl:"CleanupCache,optional"`
+	InsecureTLS       bool              `hcl:"InsecureTls,optional"`
 	NoCache           bool              `hcl:"NoCache,optional"`
 	NoLock            bool              `hcl:"NoLock,optional"`
 }
@@ -209,6 +222,7 @@ func (glo ResticGlobalOpts) ToArgs() (args []string) {
 	args = maybeAddArgInt(args, "--limit-upload", glo.LimitUpload)
 	args = maybeAddArgInt(args, "--verbose", glo.VerboseLevel)
 	args = maybeAddArgBool(args, "--cleanup-cache", glo.CleanupCache)
+	args = maybeAddArgBool(args, "--insecure-tls", glo.InsecureTLS)
 	args = maybeAddArgBool(args, "--no-cache", glo.NoCache)
 	args = maybeAddArgBool(args, "--no-lock", glo.NoLock)
 
@@ -331,6 +345,12 @@ func (rcmd Restic) Check() error {
 	return err
 }
 
+func (rcmd Restic) Unlock(unlockOpts UnlockOpts) error {
+	_, err := rcmd.RunRestic("unlock", unlockOpts)
+
+	return err
+}
+
 type Snapshot struct {
 	UID      int       `json:"uid"`
 	GID      int       `json:"gid"`
@@ -354,9 +374,11 @@ func (rcmd Restic) ReadSnapshots() ([]Snapshot, error) {
 		return nil, fmt.Errorf("no snapshot output to parse: %w", ErrRestic)
 	}
 
+	singleLineOutput := strings.Join(output.Stdout.Lines, "")
+
 	snapshots := new([]Snapshot)
-	if err = json.Unmarshal([]byte(output.Stdout.Lines[0]), snapshots); err != nil {
-		return nil, fmt.Errorf("failed parsing snapshot results from %s: %w", output.Stdout.Lines[0], err)
+	if err = json.Unmarshal([]byte(singleLineOutput), snapshots); err != nil {
+		return nil, fmt.Errorf("failed parsing snapshot results from %s: %w", singleLineOutput, err)
 	}
 
 	return *snapshots, nil

restic_test.go

@@ -32,6 +32,7 @@ func TestGlobalOptions(t *testing.T) {
 		LimitUpload:       1,
 		VerboseLevel:      1,
 		CleanupCache:      true,
+		InsecureTLS:       true,
 		NoCache:           true,
 		NoLock:            true,
 		Options: map[string]string{
@@ -48,6 +49,7 @@ func TestGlobalOptions(t *testing.T) {
 		"--limit-upload", "1",
 		"--verbose", "1",
 		"--cleanup-cache",
+		"--insecure-tls",
 		"--no-cache",
 		"--no-lock",
 		"--option", "key='a long value'",
@@ -150,6 +152,20 @@ func TestForgetOpts(t *testing.T) {
 	AssertEqual(t, "args didn't match", expected, args)
 }
 
+func TestUnlockOpts(t *testing.T) {
+	t.Parallel()
+
+	args := main.UnlockOpts{
+		RemoveAll: true,
+	}.ToArgs()
+
+	expected := []string{
+		"--remove-all",
+	}
+
+	AssertEqual(t, "args didn't match", expected, args)
+}
+
 func TestBuildEnv(t *testing.T) {
 	t.Parallel()
 
@@ -221,7 +237,7 @@ func TestResticInterface(t *testing.T) {
 	}
 
 	// Write test file to the data dir
-	err := os.WriteFile(dataFile, []byte("testing"), 0644)
+	err := os.WriteFile(dataFile, []byte("testing"), 0o644)
 	AssertEqualFail(t, "unexpected error writing to test file", nil, err)
 
 	// Make sure no existing repo is found
@@ -281,7 +297,7 @@ func TestResticInterface(t *testing.T) {
 	AssertEqualFail(t, "unexpected error checking repo", nil, err)
 
 	// Change the data file
-	err = os.WriteFile(dataFile, []byte("unexpected"), 0644)
+	err = os.WriteFile(dataFile, []byte("unexpected"), 0o644)
 	AssertEqualFail(t, "unexpected error writing to test file", nil, err)
 
 	// Check that data wrote
@@ -297,4 +313,8 @@ func TestResticInterface(t *testing.T) {
 	value, err = os.ReadFile(restoredDataFile)
 	AssertEqualFail(t, "unexpected error reading from test file", nil, err)
 	AssertEqualFail(t, "incorrect value in test file", "testing", string(value))
+
+	// Try to unlock the repo (repo shouldn't really be locked, but this should still run without error
+	err = restic.Unlock(main.UnlockOpts{}) //nolint:exhaustruct
+	AssertEqualFail(t, "unexpected error unlocking repo", nil, err)
 }

scheduler.go

@@ -13,8 +13,10 @@ import (
 	"github.com/robfig/cron/v3"
 )
 
-var jobResultsLock = sync.Mutex{}
-var jobResults = map[string]JobResult{}
+var (
+	jobResultsLock = sync.Mutex{}
+	jobResults     = map[string]JobResult{}
+)
 
 type JobResult struct {
 	JobName   string
@@ -113,6 +115,8 @@ func ScheduleAndRunJobs(jobs []Job) error {
 		defer func() {
 			ctx := scheduler.Stop()
 			<-ctx.Done()
+
+			fmt.Println("All jobs successfully stopped")
 		}()
 
 		return nil

tasks.go

@@ -67,7 +67,7 @@ func (t *JobTaskScript) SetName(name string) {
 	t.name = name
 }
 
-// JobTaskMySQL is a sqlite backup task that performs required pre and post tasks.
+// JobTaskMySQL is a MySQL backup task that performs required pre and post tasks.
 type JobTaskMySQL struct {
 	Port          int      `hcl:"port,optional"`
 	Name          string   `hcl:"name,label"`
@@ -160,12 +160,20 @@ func (t JobTaskMySQL) GetPostTask() ExecutableTask {
 		command = append(command, "--host", t.Hostname)
 	}
 
+	if t.Port != 0 {
+		command = append(command, "--port", fmt.Sprintf("%d", t.Port))
+	}
+
 	if t.Username != "" {
 		command = append(command, "--user", t.Username)
 	}
 
 	if t.Password != "" {
-		command = append(command, "--password", t.Password)
+		command = append(command, fmt.Sprintf("--password=%s", t.Password))
+	}
+
+	if t.Database != "" {
+		command = append(command, t.Database)
 	}
 
 	command = append(command, "<", t.DumpToPath)
@@ -179,6 +187,144 @@ func (t JobTaskMySQL) GetPostTask() ExecutableTask {
 	}
 }
 
+// JobTaskPostgres is a postgres backup task that performs required pre and post tasks.
+type JobTaskPostgres struct {
+	Port          int      `hcl:"port,optional"`
+	Name          string   `hcl:"name,label"`
+	Hostname      string   `hcl:"hostname,optional"`
+	Database      string   `hcl:"database,optional"`
+	Username      string   `hcl:"username,optional"`
+	Password      string   `hcl:"password,optional"`
+	Tables        []string `hcl:"tables,optional"`
+	DumpToPath    string   `hcl:"dump_to"`
+	NoTablespaces bool     `hcl:"no_tablespaces,optional"`
+	Clean         bool     `hcl:"clean,optional"`
+	Create        bool     `hcl:"create,optional"`
+}
+
+func (t JobTaskPostgres) Paths() []string {
+	return []string{t.DumpToPath}
+}
+
+func (t JobTaskPostgres) Validate() error {
+	if t.DumpToPath == "" {
+		return fmt.Errorf("task %s is missing dump_to path: %w", t.Name, ErrMissingField)
+	}
+
+	if stat, err := os.Stat(t.DumpToPath); err != nil {
+		if !errors.Is(err, fs.ErrNotExist) {
+			return fmt.Errorf(
+				"task %s: invalid dump_to: could not stat path: %s: %w",
+				t.Name,
+				t.DumpToPath,
+				ErrInvalidConfigValue,
+			)
+		}
+	} else if stat.Mode().IsDir() {
+		return fmt.Errorf("task %s: dump_to cannot be a directory: %w", t.Name, ErrInvalidConfigValue)
+	}
+
+	if len(t.Tables) > 0 && t.Database == "" {
+		return fmt.Errorf(
+			"task %s is invalid. Must specify a database to use tables: %w",
+			t.Name,
+			ErrMissingField,
+		)
+	}
+
+	return nil
+}
+
+//nolint:cyclop
+func (t JobTaskPostgres) GetPreTask() ExecutableTask {
+	command := []string{"pg_dump"}
+	if t.Database == "" {
+		command = []string{"pg_dumpall"}
+	}
+
+	command = append(command, "--file", t.DumpToPath)
+
+	if t.Hostname != "" {
+		command = append(command, "--host", t.Hostname)
+	}
+
+	if t.Port != 0 {
+		command = append(command, "--port", fmt.Sprintf("%d", t.Port))
+	}
+
+	if t.Username != "" {
+		command = append(command, "--username", t.Username)
+	}
+
+	if t.NoTablespaces {
+		command = append(command, "--no-tablespaces")
+	}
+
+	if t.Clean {
+		command = append(command, "--clean")
+	}
+
+	if t.Create {
+		command = append(command, "--create")
+	}
+
+	for _, table := range t.Tables {
+		command = append(command, "--table", table)
+	}
+
+	if t.Database != "" {
+		command = append(command, t.Database)
+	}
+
+	env := map[string]string{}
+	if t.Password != "" {
+		env["PGPASSWORD"] = t.Password
+	}
+
+	return JobTaskScript{
+		name:      t.Name,
+		env:       env,
+		Cwd:       ".",
+		OnBackup:  strings.Join(command, " "),
+		OnRestore: "",
+	}
+}
+
+func (t JobTaskPostgres) GetPostTask() ExecutableTask {
+	command := []string{"psql"}
+
+	if t.Hostname != "" {
+		command = append(command, "--host", t.Hostname)
+	}
+
+	if t.Port != 0 {
+		command = append(command, "--port", fmt.Sprintf("%d", t.Port))
+	}
+
+	if t.Username != "" {
+		command = append(command, "--username", t.Username)
+	}
+
+	if t.Database != "" {
+		command = append(command, t.Database)
+	}
+
+	command = append(command, "<", t.DumpToPath)
+
+	env := map[string]string{}
+	if t.Password != "" {
+		env["PGPASSWORD"] = t.Password
+	}
+
+	return JobTaskScript{
+		name:      t.Name,
+		env:       env,
+		Cwd:       ".",
+		OnBackup:  "",
+		OnRestore: strings.Join(command, " "),
+	}
+}
+
 // JobTaskSqlite is a sqlite backup task that performs required pre and post tasks.
 type JobTaskSqlite struct {
 	Name       string `hcl:"name,label"`
@@ -291,11 +437,12 @@ func (t *BackupFilesTask) Validate() error {
 
 // JobTask represents a single task within a backup job.
 type JobTask struct {
-	Name        string          `hcl:"name,label"`
-	PreScripts  []JobTaskScript `hcl:"pre_script,block"`
-	PostScripts []JobTaskScript `hcl:"post_script,block"`
-	MySQL       []JobTaskMySQL  `hcl:"mysql,block"`
-	Sqlite      []JobTaskSqlite `hcl:"sqlite,block"`
+	Name        string            `hcl:"name,label"`
+	PreScripts  []JobTaskScript   `hcl:"pre_script,block"`
+	PostScripts []JobTaskScript   `hcl:"post_script,block"`
+	MySQL       []JobTaskMySQL    `hcl:"mysql,block"`
+	Postgres    []JobTaskPostgres `hcl:"postgres,block"`
+	Sqlite      []JobTaskSqlite   `hcl:"sqlite,block"`
 }
 
 func (t JobTask) Validate() error {

tasks_test.go

@@ -163,7 +163,29 @@ func TestJobTaskSql(t *testing.T) {
 				" --user user --password=pass --no-tablespaces db table1 table2",
 			postBackup:  "",
 			preRestore:  "",
-			postRestore: "mysql --host host --user user --password pass < ./simple.sql",
+			postRestore: "mysql --host host --port 3306 --user user --password=pass db < ./simple.sql",
+		},
+		{
+			name: "psql all",
+			task: main.JobTaskPostgres{
+				Name:          "simple",
+				Hostname:      "host",
+				Port:          6543,
+				Username:      "user",
+				Password:      "pass",
+				Database:      "db",
+				NoTablespaces: true,
+				Create:        true,
+				Clean:         true,
+				Tables:        []string{"table1", "table2"},
+				DumpToPath:    "./simple.sql",
+			},
+			validationErr: nil,
+			preBackup: "pg_dump --file ./simple.sql --host host --port 6543 --username user --no-tablespaces" +
+				" --clean --create --table table1 --table table2 db",
+			postBackup:  "",
+			preRestore:  "",
+			postRestore: "psql --host host --port 6543 --username user db < ./simple.sql",
 		},
 		// Sqlite
 		{