Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove storage calls from local.Driver.alterModules #184

Merged
merged 5 commits into from
Jan 21, 2022
Merged

Remove storage calls from local.Driver.alterModules #184

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e8c239
Remove storage calls from local.Driver.alterModules
davis-haba Jan 19, 2022
ec333d4
Remove PutModules StorageError tests, since PutModules no longer writ…
davis-haba Jan 20, 2022
ac8fe07
Remove unused helper func getModules from client.drivers.local
davis-haba Jan 20, 2022
04baf3f
remove unused test helpers in driver.local
davis-haba Jan 20, 2022
0fc6951
Merge branch 'master' into remove-storage-calls-from-local-driver-alt…
davis-haba Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions constraint/pkg/client/drivers/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,6 @@ func (d *Driver) putModules(namePrefix string, srcs []string) error {
// the provided modules then returns the count of modules removed.
// alterModules expects that the caller is holding the modulesMux lock.
func (d *Driver) alterModules(insert insertParam, remove []string) (int, error) {
// TODO(davis-haba): Remove this Context once it is no longer necessary.
ctx := context.TODO()

updatedModules := copyModules(d.modules)
for _, name := range remove {
delete(updatedModules, name)
Expand All @@ -240,38 +237,14 @@ func (d *Driver) alterModules(insert insertParam, remove []string) (int, error)
updatedModules[name] = mod.parsed
}

txn, err := d.storage.NewTransaction(ctx, storage.WriteParams)
if err != nil {
return 0, err
}

for _, name := range remove {
if err := d.storage.DeletePolicy(ctx, txn, name); err != nil {
d.storage.Abort(ctx, txn)
return 0, err
}
}

c := ast.NewCompiler().WithPathConflictsCheck(storage.NonEmpty(ctx, d.storage, txn)).
c := ast.NewCompiler().
WithCapabilities(d.capabilities).
WithEnablePrintStatements(d.printEnabled)

if c.Compile(updatedModules); c.Failed() {
d.storage.Abort(ctx, txn)
return 0, fmt.Errorf("%w: %v", ErrCompile, c.Errors)
}

for name, mod := range insert {
if err := d.storage.UpsertPolicy(ctx, txn, name, []byte(mod.text)); err != nil {
d.storage.Abort(ctx, txn)
return 0, err
}
}

if err := d.storage.Commit(ctx, txn); err != nil {
return 0, err
}

d.compiler = c
d.modules = updatedModules

Expand Down