Introduce rootkey storage from bakeryv2 upstream #11082
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tlm
reviewed
Jan 8, 2020
| bakery, err := bakery.NewService(bakery.NewServiceParams{ | ||
| Location: "juju model " + s.State.ModelUUID(), | ||
| Store: store, | ||
| b := bakery.New(bakery.BakeryParams{ |
There was a problem hiding this comment.
(Suggestion), give the b object a better name.
There was a problem hiding this comment.
It's only used a couple of lines below and "bakery" clashes with the package name. "bkry" or something seems worse?
ycliuhw
approved these changes
Jan 8, 2020
| c.Assert(err, jc.ErrorIsNil) | ||
|
|
||
| // The background thread that removes records runs every 60s. | ||
| // Give a little bit of leeway for loaded systems. | ||
| for i := 0; i < 90; i++ { | ||
| _, err = s.service.CheckAny([]macaroon.Slice{{mac}}, nil, nil) | ||
| _, _, err = s.bakery.Oven.VerifyMacaroon(context.TODO(), macaroon.Slice{mac.M()}) | ||
| if err == nil { | ||
| time.Sleep(time.Second) |
There was a problem hiding this comment.
not related to current pr, but not sure if we can inject clock and mock for testing.
There was a problem hiding this comment.
sadly the clock is hard wired in the upstream repo
wallyworld
force-pushed
the
bakeryv2-storage
branch
from
d15d038
to
dcffc56
Compare
|
|
|
|
wallyworld
force-pushed
the
bakeryv2-storage
branch
2 times, most recently
from
cc48db1
to
e4170af
Compare
|
|
wallyworld
force-pushed
the
bakeryv2-storage
branch
from
e4170af
to
7d5f80c
Compare
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
More progress on moving off bakeryv2-unstable.
Some tests are updated to use bakeryv2 and the mongo backed root key storage is also ported across.
QA steps
bootstrap a controller
clear local cookies
login