found NewBackupDestination applyMacros doesn't work for b.cfg

Signed-off-by: Slach <bloodjazman@gmail.com>

Author: Slach

pkg/backup/backuper.go

@@ -268,7 +268,7 @@ func (b *Backuper) getEmbeddedBackupLocation(ctx context.Context, backupName str
 		if os.Getenv("AWS_ACCESS_KEY_ID") != "" {
 			return fmt.Sprintf("S3('%s/%s/','%s','%s')", s3Endpoint, backupName, os.Getenv("AWS_ACCESS_KEY_ID"), os.Getenv("AWS_SECRET_ACCESS_KEY")), nil
 		}
-		return "", fmt.Errorf("provide s3->access_key and s3->secret_key in config to allow embedded backup without `clickhouse->embedded_backup_disk`")
+		return "", errors.WithStack(errors.New("provide s3->access_key and s3->secret_key in config to allow embedded backup without `clickhouse->embedded_backup_disk`"))
 	}
 	if b.cfg.General.RemoteStorage == "gcs" {
 		gcsEndpoint, err := b.ch.ApplyMacros(ctx, b.buildEmbeddedLocationGCS())

pkg/backup/delete.go

@@ -179,7 +179,7 @@ func (b *Backuper) RemoveBackupLocal(ctx context.Context, backupName string, dis
 
 func (b *Backuper) cleanEmbeddedAndObjectDiskLocalIfSameRemoteNotPresent(ctx context.Context, backupName string, disks []clickhouse.Disk, backup LocalBackup, hasObjectDisks bool) error {
 	skip, err := b.skipIfTheSameRemoteBackupPresent(ctx, backup.BackupName, backup.Tags)
-	log.Debug().Msgf("b.skipIfTheSameRemoteBackupPresent return skip=%v", skip)
+	log.Debug().Str("backupName", backup.BackupName).Str("tags", backup.Tags).Msgf("b.skipIfTheSameRemoteBackupPresent return skip=%v", skip)
 	if err != nil {
 		return err
 	}
@@ -333,6 +333,7 @@ func (b *Backuper) cleanEmbeddedAndObjectDiskRemoteIfSameLocalNotPresent(ctx con
 	if skip, err = b.skipIfSameLocalBackupPresent(ctx, backup.BackupName, backup.Tags); err != nil {
 		return err
 	}
+	log.Debug().Str("backupName", backup.BackupName).Str("tags", backup.Tags).Msgf("b.skipIfSameLocalBackupPresent return skip=%v", skip)
 	if !skip {
 		if b.isEmbedded && b.cfg.ClickHouse.EmbeddedBackupDisk != "" {
 			if err = b.cleanRemoteEmbedded(ctx, backup); err != nil {

test/integration/integration_test.go

@@ -4174,6 +4174,7 @@ func fullCleanup(t *testing.T, r *require.Assertions, env *TestEnvironment, back
 			if checkDeleteErr {
 				r.NoError(err, "checkDeleteErr delete %s %s output: \n%s\nerror: %v", backupType, backupName, out, err)
 			}
+			log.Debug().Msg(out)
 		}
 	}
 	otherBackupList, lsErr := env.DockerExecOut("clickhouse", "ls", "-1", "/var/lib/clickhouse/backup/*"+t.Name()+"*")
@@ -4184,6 +4185,7 @@ func fullCleanup(t *testing.T, r *require.Assertions, env *TestEnvironment, back
 				if checkDeleteOtherErr {
 					r.NoError(err, "%s\nunexpected delete local %s output: \n%s\nerror: %v, ", backupName, out, err)
 				}
+				log.Debug().Msg(out)
 			}
 		}
 	}