Merge pull request #1 from aaronfern/working

Added tests for compaction backward compatibility
gardener · Jun 9, 2021 · bb6dc59 · bb6dc59
2 parents 53a08a7 + bf01c49
commit bb6dc59
Show file tree

Hide file tree

Showing 5 changed files with 924 additions and 19 deletions.
diff --git a/pkg/compactor/compactor_suite_test.go b/pkg/compactor/compactor_suite_test.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/gardener/etcd-backup-restore/pkg/compressor"
+	brtypes "github.com/gardener/etcd-backup-restore/pkg/types"
 	"github.com/gardener/etcd-backup-restore/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -83,7 +84,8 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	compressionConfig := compressor.NewCompressorConfig()
 	compressionConfig.Enabled = true
 	compressionConfig.CompressionPolicy = "gzip"
-	err = utils.RunSnapshotter(logger, testSnapshotDir, deltaSnapshotPeriod, endpoints, ctx.Done(), true, compressionConfig)
+	snapstoreConfig := brtypes.SnapstoreConfig{Container: testSnapshotDir, Provider: "Local"}
+	err = utils.RunSnapshotter(logger, snapstoreConfig, deltaSnapshotPeriod, endpoints, ctx.Done(), true, compressionConfig)
 	Expect(err).ShouldNot(HaveOccurred())
 
 	// Wait unitil the populator finishes with populating ETCD

diff --git a/pkg/snapshot/restorer/restorer_suite_test.go b/pkg/snapshot/restorer/restorer_suite_test.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/gardener/etcd-backup-restore/pkg/compressor"
+	brtypes "github.com/gardener/etcd-backup-restore/pkg/types"
 
 	"github.com/gardener/etcd-backup-restore/test/utils"
 	. "github.com/onsi/ginkgo"
@@ -78,12 +79,12 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	ctx := utils.ContextWithWaitGroupFollwedByGracePeriod(populatorCtx, wg, deltaSnapshotPeriod+2*time.Second)
 
 	compressionConfig := compressor.NewCompressorConfig()
-	err = utils.RunSnapshotter(logger, snapstoreDir, deltaSnapshotPeriod, endpoints, ctx.Done(), true, compressionConfig)
+	snapstoreConfig := brtypes.SnapstoreConfig{Container: snapstoreDir, Provider: "Local"}
+	err = utils.RunSnapshotter(logger, snapstoreConfig, deltaSnapshotPeriod, endpoints, ctx.Done(), true, compressionConfig)
 	Expect(err).ShouldNot(HaveOccurred())
 
 	keyTo = resp.KeyTo
 	return data
-
 }, func(data []byte) {})
 
 var _ = SynchronizedAfterSuite(func() {}, cleanUp)