mirror of
https://github.com/cupcakearmy/autorestic.git
synced 2024-12-22 16:26:25 +00:00
Compare commits
3 Commits
a5af001521
...
a33b782c54
Author | SHA1 | Date | |
---|---|---|---|
|
a33b782c54 | ||
|
f7d28b486c | ||
|
6895df1c83 |
@ -6,7 +6,7 @@ RUN go mod download
|
|||||||
COPY . .
|
COPY . .
|
||||||
RUN go build
|
RUN go build
|
||||||
|
|
||||||
FROM restic/restic:0.17.1
|
FROM restic/restic:0.17.2
|
||||||
RUN apk add --no-cache rclone bash curl docker-cli
|
RUN apk add --no-cache rclone bash curl docker-cli
|
||||||
COPY --from=builder /app/autorestic /usr/bin/autorestic
|
COPY --from=builder /app/autorestic /usr/bin/autorestic
|
||||||
ENTRYPOINT []
|
ENTRYPOINT []
|
||||||
|
@ -14,19 +14,20 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type BackendRest struct {
|
type BackendRest struct {
|
||||||
User string `mapstructure:"user,omitempty"`
|
User string `mapstructure:"user,omitempty" yaml:"user,omitempty"`
|
||||||
Password string `mapstructure:"password,omitempty"`
|
Password string `mapstructure:"password,omitempty" yaml:"password,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Backend struct {
|
type Backend struct {
|
||||||
name string
|
name string
|
||||||
Type string `mapstructure:"type,omitempty"`
|
Type string `mapstructure:"type,omitempty" yaml:"type,omitempty"`
|
||||||
Path string `mapstructure:"path,omitempty"`
|
Path string `mapstructure:"path,omitempty" yaml:"path,omitempty"`
|
||||||
Key string `mapstructure:"key,omitempty"`
|
Key string `mapstructure:"key,omitempty" yaml:"key,omitempty"`
|
||||||
RequireKey bool `mapstructure:"requireKey,omitempty"`
|
RequireKey bool `mapstructure:"requireKey,omitempty" yaml:"requireKey,omitempty"`
|
||||||
Env map[string]string `mapstructure:"env,omitempty"`
|
AllowFailure bool `mapstructure:"allowFailure,omitempty" yaml:"allowFailure,omitempty"`
|
||||||
Rest BackendRest `mapstructure:"rest,omitempty"`
|
Env map[string]string `mapstructure:"env,omitempty" yaml:"env,omitempty"`
|
||||||
Options Options `mapstructure:"options,omitempty"`
|
Rest BackendRest `mapstructure:"rest,omitempty" yaml:"rest,omitempty"`
|
||||||
|
Options Options `mapstructure:"options,omitempty" yaml:"options,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetBackend(name string) (Backend, bool) {
|
func GetBackend(name string) (Backend, bool) {
|
||||||
|
@ -23,11 +23,11 @@ type OptionMap map[string][]interface{}
|
|||||||
type Options map[string]OptionMap
|
type Options map[string]OptionMap
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Version string `mapstructure:"version"`
|
Version string `mapstructure:"version" yaml:"version"`
|
||||||
Extras interface{} `mapstructure:"extras"`
|
Extras interface{} `mapstructure:"extras" yaml:"extras"`
|
||||||
Locations map[string]Location `mapstructure:"locations"`
|
Locations map[string]Location `mapstructure:"locations" yaml:"locations"`
|
||||||
Backends map[string]Backend `mapstructure:"backends"`
|
Backends map[string]Backend `mapstructure:"backends" yaml:"backends"`
|
||||||
Global Options `mapstructure:"global"`
|
Global Options `mapstructure:"global" yaml:"global"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var once sync.Once
|
var once sync.Once
|
||||||
|
@ -1,10 +1,15 @@
|
|||||||
package internal
|
package internal
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"path"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/spf13/viper"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestOptionToString(t *testing.T) {
|
func TestOptionToString(t *testing.T) {
|
||||||
@ -143,6 +148,48 @@ func TestGetOptionsMultipleKeys(t *testing.T) {
|
|||||||
reflect.DeepEqual(result, expected)
|
reflect.DeepEqual(result, expected)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSaveConfigProducesReadableConfig(t *testing.T) {
|
||||||
|
workDir := t.TempDir()
|
||||||
|
viper.SetConfigFile(path.Join(workDir, ".autorestic.yml"))
|
||||||
|
|
||||||
|
// Required to appease the config reader
|
||||||
|
viper.Set("version", 2)
|
||||||
|
|
||||||
|
c := Config{
|
||||||
|
Version: "2",
|
||||||
|
Locations: map[string]Location{
|
||||||
|
"test": {
|
||||||
|
Type: "local",
|
||||||
|
name: "test",
|
||||||
|
From: []string{"in-dir"},
|
||||||
|
To: []string{"test"},
|
||||||
|
// ForgetOption & ConfigOption have previously marshalled in a way that
|
||||||
|
// can't get read correctly
|
||||||
|
ForgetOption: "foo",
|
||||||
|
CopyOption: map[string][]string{"foo": {"bar"}},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Backends: map[string]Backend{
|
||||||
|
"test": {
|
||||||
|
name: "test",
|
||||||
|
Type: "local",
|
||||||
|
Path: "backup-target",
|
||||||
|
Key: "supersecret",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
err := c.SaveConfig()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
// Ensure we the config reading logic actually runs
|
||||||
|
config = nil
|
||||||
|
once = sync.Once{}
|
||||||
|
readConfig := GetConfig()
|
||||||
|
assert.NotNil(t, readConfig)
|
||||||
|
assert.Equal(t, c, *readConfig)
|
||||||
|
}
|
||||||
|
|
||||||
func assertEqual[T comparable](t testing.TB, result, expected T) {
|
func assertEqual[T comparable](t testing.TB, result, expected T) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
|
@ -34,26 +34,26 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Hooks struct {
|
type Hooks struct {
|
||||||
Dir string `mapstructure:"dir"`
|
Dir string `mapstructure:"dir" yaml:"dir"`
|
||||||
PreValidate HookArray `mapstructure:"prevalidate,omitempty"`
|
PreValidate HookArray `mapstructure:"prevalidate,omitempty" yaml:"prevalidate,omitempty"`
|
||||||
Before HookArray `mapstructure:"before,omitempty"`
|
Before HookArray `mapstructure:"before,omitempty" yaml:"before,omitempty"`
|
||||||
After HookArray `mapstructure:"after,omitempty"`
|
After HookArray `mapstructure:"after,omitempty" yaml:"after,omitempty"`
|
||||||
Success HookArray `mapstructure:"success,omitempty"`
|
Success HookArray `mapstructure:"success,omitempty" yaml:"success,omitempty"`
|
||||||
Failure HookArray `mapstructure:"failure,omitempty"`
|
Failure HookArray `mapstructure:"failure,omitempty" yaml:"failure,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type LocationCopy = map[string][]string
|
type LocationCopy = map[string][]string
|
||||||
|
|
||||||
type Location struct {
|
type Location struct {
|
||||||
name string `mapstructure:",omitempty"`
|
name string `mapstructure:",omitempty" yaml:",omitempty"`
|
||||||
From []string `mapstructure:"from,omitempty"`
|
From []string `mapstructure:"from,omitempty" yaml:"from,omitempty"`
|
||||||
Type string `mapstructure:"type,omitempty"`
|
Type string `mapstructure:"type,omitempty" yaml:"type,omitempty"`
|
||||||
To []string `mapstructure:"to,omitempty"`
|
To []string `mapstructure:"to,omitempty" yaml:"to,omitempty"`
|
||||||
Hooks Hooks `mapstructure:"hooks,omitempty"`
|
Hooks Hooks `mapstructure:"hooks,omitempty" yaml:"hooks,omitempty"`
|
||||||
Cron string `mapstructure:"cron,omitempty"`
|
Cron string `mapstructure:"cron,omitempty" yaml:"cron,omitempty"`
|
||||||
Options Options `mapstructure:"options,omitempty"`
|
Options Options `mapstructure:"options,omitempty" yaml:"options,omitempty"`
|
||||||
ForgetOption LocationForgetOption `mapstructure:"forget,omitempty"`
|
ForgetOption LocationForgetOption `mapstructure:"forget,omitempty" yaml:"forget,omitempty"`
|
||||||
CopyOption LocationCopy `mapstructure:"copy,omitempty"`
|
CopyOption LocationCopy `mapstructure:"copy,omitempty" yaml:"copy,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetLocation(name string) (Location, bool) {
|
func GetLocation(name string) (Location, bool) {
|
||||||
@ -267,6 +267,13 @@ func (l Location) Backup(cron bool, specificBackend string) []error {
|
|||||||
|
|
||||||
// If error save it and continue
|
// If error save it and continue
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if backend.AllowFailure {
|
||||||
|
colors.Faint.Printf("skipping backend \"%s\" since allowFailure was set to \"true\"\n", to)
|
||||||
|
if flags.VERBOSE {
|
||||||
|
colors.Error.Printf("reason: %s", out)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
colors.Error.Println(out)
|
colors.Error.Println(out)
|
||||||
errors = append(errors, fmt.Errorf("%s@%s:\n%s%s", l.name, backend.name, out, err))
|
errors = append(errors, fmt.Errorf("%s@%s:\n%s%s", l.name, backend.name, out, err))
|
||||||
continue
|
continue
|
||||||
|
Loading…
Reference in New Issue
Block a user