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.

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

Add relations to the cache, and extra model details. #11124

Merged
merged 5 commits into from Jan 20, 2020

Conversation

howbazaar
Copy link
Contributor

In order to provide the information to the upcoming model summary watcher (which will be implemented in the cache), we need to get some extra information into the cache.

There is a drive by that renames the ModelUpdate type from the core/multiwatcher package back to ModelInfo. This was renamed previously when the type was moved into the apiserver/params package and we had to deal with a naming collision. Renamed it back for this type for consistency with the rest of the package.

Adds three pieces of information from the state.Model in through the allwatcher: Cloud, Region, and Credential. Each of these is just a string value in the underlying document, so just adding these to the multiwatcher info type is sufficient to pass them along. Also needed to add these to the cache change type, and this makes them available to the internals of the cache.

The cache needed to know about relations, so pass the relation changes from the modelcache worker though to the controller, and add methods to add and remove the relations to the cached model.

QA steps

Nothing is exposed to the outside world yet, that is coming.

Documentation changes

Everything is internal, no user facing change.

permissions := make(map[string]permission.Access)
for _, user := range users {
// Cache permission map is always lower case.
permissions[strings.ToLower(user.UserName)] = user.Access
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works for external users also? ie fred@external.
I can't recall if UserName includes the domain suffix

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does. UserName is the fred@external bit.

@howbazaar
Copy link
Contributor Author

$$merge$$

@howbazaar
Copy link
Contributor Author

$$merge$$ intermittent test failure

@howbazaar
Copy link
Contributor Author

$$merge$$ different intermittent failure

@jujubot jujubot merged commit 341cb40 into juju:develop Jan 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants