ewilliams28/releases
1
0
Fork 0
mirror of https://github.com/open-policy-agent/opa.git synced 2026-08-27 18:55:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

internal: Add helper package to store manifests

Browse Source 
Previously we had a bunch of ad-hoc code to store the revision and
roots internally. These changes just add a proper package to deal with
the reading and writing of the revision and roots.

Note, the bundle package itself is still hardcoding the manifest path
but we can fix that in a subsequent PR.

Signed-off-by: Torin Sandall <torinsandall@gmail.com>
This commit is contained in:
Torin Sandall
2019-02-15 13:25:59 -08:00
parent 7a4e82194a
commit 74fffc82ba
2 changed files with 86 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/bundle/plugin.go
+4 -49
View File
@@ -15,9 +15,9 @@ import (
"github.com/open-policy-agent/opa/ast"
"github.com/open-policy-agent/opa/bundle"
"github.com/open-policy-agent/opa/download"
"github.com/open-policy-agent/opa/internal/manifest"
"github.com/open-policy-agent/opa/plugins"
"github.com/open-policy-agent/opa/storage"
"github.com/open-policy-agent/opa/util"
"github.com/sirupsen/logrus"
)
@@ -195,7 +195,7 @@ func (p *Plugin) activate(ctx context.Context, b *bundle.Bundle) error {
}
}
if roots, err := p.readRoots(ctx, txn); err == nil {
if roots, err := manifest.ReadBundleRoots(ctx, p.manager.Store, txn); err == nil {
for _, root := range roots {
erase[root] = struct{}{}
}
@@ -217,11 +217,11 @@ func (p *Plugin) activate(ctx context.Context, b *bundle.Bundle) error {
return err
}
if err := p.writeManifest(ctx, txn, b.Manifest); err != nil {
if err := p.writeModules(ctx, txn, b.Modules); err != nil {
return err
}
if err := p.writeModules(ctx, txn, b.Modules); err != nil {
if err := manifest.Write(ctx, p.manager.Store, txn, b.Manifest); err != nil {
return err
}
@@ -314,45 +314,6 @@ func (p *Plugin) writeModules(ctx context.Context, txn storage.Transaction, file
return nil
}
func (p *Plugin) readRoots(ctx context.Context, txn storage.Transaction) ([]string, error) {
value, err := p.manager.Store.Read(ctx, txn, rootsPath)
if err != nil {
return nil, err
}
sl, ok := value.([]interface{})
if !ok {
return nil, fmt.Errorf("corrupt manifest roots")
}
roots := make([]string, len(sl))
for i := range sl {
roots[i], ok = sl[i].(string)
if !ok {
return nil, fmt.Errorf("corrupt manifest root")
}
}
return roots, nil
}
func (p *Plugin) writeManifest(ctx context.Context, txn storage.Transaction, m bundle.Manifest) error {
var value interface{} = m
if err := util.RoundTrip(&value); err != nil {
return err
}
if err := storage.MakeDir(ctx, p.manager.Store, txn, bundlePath); err != nil {
return err
}
return p.manager.Store.Write(ctx, txn, storage.AddOp, manifestPath, value)
}
func (p *Plugin) logError(fmt string, a ...interface{}) {
logrus.WithFields(p.logrusFields()).Errorf(fmt, a...)
}
@@ -372,12 +333,6 @@ func (p *Plugin) logrusFields() logrus.Fields {
}
}
var (
bundlePath = storage.MustParsePath("/system/bundle")
manifestPath = storage.MustParsePath("/system/bundle/manifest")
rootsPath = storage.MustParsePath("/system/bundle/manifest/roots")
)
func lookup(path storage.Path, data map[string]interface{}) (interface{}, bool) {
if len(path) == 0 {
return data, true