Fix: path must not, backup-source must be resolved

Author: jkellerer

config/config.go

@@ -461,6 +461,12 @@ func (c *Config) GetProfile(profileKey string) (*Profile, error) {
 		return nil, err
 	}
 
+	// All files in the configuration are relative to the configuration file,
+	// NOT the folder where resticprofile is started
+	// So we need to fix all relative files
+	rootPath := filepath.Dir(c.GetConfigFile())
+	profile.SetRootPath(rootPath)
+
 	// Copy tag and path parameters from Backup where requested
 	if profile.Backup != nil {
 		// Copy tags from backup if tag is set to boolean true
@@ -472,12 +478,6 @@ func (c *Config) GetProfile(profileKey string) (*Profile, error) {
 		profile.SetPath(profile.Backup.Source...)
 	}
 
-	// All files in the configuration are relative to the configuration file,
-	// NOT the folder where resticprofile is started
-	// So we need to fix all relative files
-	rootPath := filepath.Dir(c.GetConfigFile())
-	profile.SetRootPath(rootPath)
-
 	return profile, nil
 }
 

config/profile.go

@@ -170,7 +170,6 @@ func (p *Profile) SetRootPath(rootPath string) {
 		"cache-dir",
 		"repository-file",
 		"password-file",
-		constants.ParameterPath,
 	}
 	for _, section := range p.allFlagsSections() {
 		if section == nil {

config/profile_test.go

@@ -364,11 +364,13 @@ source = "` + sourcePattern + `"
 }
 
 func TestPathAndTagInRetention(t *testing.T) {
-	root, err := filepath.Abs("/")
+	examples, err := filepath.Abs("../examples")
+	require.NoError(t, err)
+	sourcePattern := filepath.ToSlash(filepath.Join(examples, "[a-p]*"))
+	backupSource, err := filepath.Glob(sourcePattern)
+	require.Greater(t, len(backupSource), 5)
 	require.NoError(t, err)
-	root = filepath.ToSlash(root)
 
-	backupSource := []string{root}
 	backupTags := []string{"one", "two"}
 
 	testProfile := func(t *testing.T, version Version, retention string) *Profile {
@@ -382,12 +384,13 @@ func TestPathAndTagInRetention(t *testing.T) {
 
 			[` + p + `profile.backup]
 			tag = ["one", "two"]
-			source = ["` + root + `"]
+			source = ["` + sourcePattern + `"]
 
 			[` + p + `profile.retention]
 			` + retention
 
 		profile, err := getResolvedProfile("toml", config, "profile")
+		profile.SetRootPath(examples) // ensure relative paths are converted to absolute paths
 		require.NoError(t, err)
 		require.NotNil(t, profile)
 
@@ -412,11 +415,8 @@ func TestPathAndTagInRetention(t *testing.T) {
 		})
 
 		t.Run("ReplacePath", func(t *testing.T) {
-			rootPath := filepath.Dir("")
-			expected := []string{
-				filepath.FromSlash(fixPath("/another/path", absolutePrefix(rootPath))),
-			}
-			profile := testProfile(t, Version01, `path = "/another/path"`)
+			expected := []string{"relative/custom/path", "."}
+			profile := testProfile(t, Version01, `path = ["relative/custom/path", "."]`)
 			assert.Equal(t, expected, pathFlag(t, profile))
 		})