Split manifest storage into two types

weaveworks · Aug 19, 2019 · 6588f62 · 6588f62
1 parent 5c4534e
commit 6588f62
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/pkg/gitops/gitops.go b/pkg/gitops/gitops.go
@@ -4,6 +4,8 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
+	"github.com/weaveworks/ignite/pkg/constants"
 	"github.com/weaveworks/ignite/pkg/gitops/gitdir"
 	"github.com/weaveworks/ignite/pkg/operations/reconcile"
 	"github.com/weaveworks/ignite/pkg/storage/manifest"
@@ -22,7 +24,7 @@ func RunGitOps(url, branch string, paths []string) error {
 	gitDir.WaitForClone()
 
 	// Construct a manifest storage for the path backed by git
-	s, err := manifest.NewManifestStorage(gitDir.Dir())
+	s, err := manifest.NewTwoWayManifestStorage(gitDir.Dir(), constants.DATA_DIR, scheme.Serializer)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/providers/manifeststorage/storage.go b/pkg/providers/manifeststorage/storage.go
@@ -2,6 +2,7 @@ package manifeststorage
 
 import (
 	log "github.com/sirupsen/logrus"
+	"github.com/weaveworks/ignite/pkg/apis/ignite/scheme"
 	"github.com/weaveworks/ignite/pkg/constants"
 	"github.com/weaveworks/ignite/pkg/providers"
 	"github.com/weaveworks/ignite/pkg/storage/cache"
@@ -12,7 +13,7 @@ var ManifestStorage *manifest.ManifestStorage
 
 func SetManifestStorage() (err error) {
 	log.Trace("Initializing the ManifestStorage provider...")
-	ManifestStorage, err = manifest.NewManifestStorage(constants.MANIFEST_DIR)
+	ManifestStorage, err = manifest.NewTwoWayManifestStorage(constants.MANIFEST_DIR, constants.DATA_DIR, scheme.Serializer)
 	if err != nil {
 		return
 	}

diff --git a/pkg/storage/manifest/storage.go b/pkg/storage/manifest/storage.go
@@ -7,7 +7,26 @@ import (
 	"github.com/weaveworks/ignite/pkg/storage/watch"
 )
 
-func NewManifestStorage(manifestDir, dataDir string, ser serializer.Serializer) (*ManifestStorage, error) {
+// NewManifestStorage constructs a new storage that watches unstructured manifests in the specified directory,
+// decodable using the given serializer.
+func NewManifestStorage(manifestDir string, ser serializer.Serializer) (*ManifestStorage, error) {
+	ws, err := watch.NewGenericWatchStorage(storage.NewGenericStorage(storage.NewGenericMappedRawStorage(manifestDir), ser))
+	if err != nil {
+		return nil, err
+	}
+
+	ss := sync.NewSyncStorage(ws)
+
+	return &ManifestStorage{
+		Storage: ss,
+	}, nil
+}
+
+// NewManifestStorage constructs a new storage that watches unstructured manifests in the specified directory,
+// decodable using the given serializer. However, all changes in the manifest directory, are also propagated to
+// the structured data directory that's backed by the default storage implementation. Writes to this storage are
+// propagated to both the manifest directory, and the data directory.
+func NewTwoWayManifestStorage(manifestDir, dataDir string, ser serializer.Serializer) (*ManifestStorage, error) {
 	ws, err := watch.NewGenericWatchStorage(storage.NewGenericStorage(storage.NewGenericMappedRawStorage(manifestDir), ser))
 	if err != nil {
 		return nil, err

diff --git a/pkg/storage/rawstorage.go b/pkg/storage/rawstorage.go
@@ -58,7 +58,7 @@ func (r *GenericRawStorage) realPath(key AnyKey) string {
 	// KindKeys get no special treatment
 	case Key:
 		// Keys get the metadata filename added to the returned path
-		file = constants.MetadataJSON
+		file = constants.METADATA
 	default:
 		panic(fmt.Sprintf("invalid key type received: %T", key))
 	}