Use remote cache instead of session storage #16114
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
xlson
suggested changes
Mar 21, 2019
xlson
reviewed
Mar 22, 2019
markelog
force-pushed
the
auth_proxy_remotecache
branch
7 times, most recently
from
2ec946c
to
2ebf264
Compare
markelog
changed the title
markelog
commented
Mar 25, 2019
There was a problem hiding this comment.
pkg/middleware/auth_proxy_test.go "unit" tests were removed since we are doing #16147 anyway and old stuff has to be rewrited there anyway.
Although, it seems middleware ("integration") tests already pretty extensive for auth_proxy module
Closed
xlson
reviewed
Mar 25, 2019
markelog
force-pushed
the
auth_proxy_remotecache
branch
from
52d5ccc
to
ff74199
Compare
xlson
reviewed
Apr 4, 2019
| @@ -265,287 +267,192 @@ func TestMiddlewareContext(t *testing.T) { | |||
| }) | |||
| }) | |||
|
|
|||
| middlewareScenario("When auth_proxy is enabled enabled and user exists", func(sc *scenarioContext) { | |||
There was a problem hiding this comment.
I haven't run the code so maybe I'm missing something here, but shouldn't this test still work after the changes? I see further tests that are related to auth_proxy without ldap, it seems like a bad idea to remove them. Let's sync up.
There was a problem hiding this comment.
Me and @xlson had talk about it - the tests are changed a little: description, tree-like structure report and default values hoisted from test blocks, plus added couple more, that's the gist of it :).
It seems we are good here
markelog
force-pushed
the
auth_proxy_remotecache
branch
from
ff74199
to
7bb88ff
Compare
|
Looks good. You can merge this now. |
xlson
approved these changes
Apr 8, 2019
ryantxu
added a commit
to ryantxu/grafana
that referenced
this pull request
Apr 9, 2019
* grafana/master: (27 commits) docs: fixes and update current version Docs: Updated changelog for v6.1.3 Graph: fixed png rendering with legend to the right (grafana#16463) Fix: Disables auto open datasource picker on focus (grafana#16398) add some mock/stub guidelines to testing guideline (grafana#16466) Feat: Suggestion list in Explore is virtualized (grafana#16342) Docs: Updated roadmap issue to link to the pinned roadmap issues Graph: Fixed auto decimals in legend values (grafana#16455) Styling: Aligned heading (grafana#16456) add PromQL keyword for adhoc filter (grafana#16426) Singlestat: Use decimal override when manually specified (grafana#16451) Graph: follow-up graph decimals fix, grafana#16414 (grafana#16450) Chore: use remote cache instead of session storage (grafana#16114) Docs: Minor changelog tweak Docs: Updated changelog with v6.1.2 release issues datasource: fix disable query when using mixed datasource (grafana#16409) Graph: Fixed series legend color for hidden series (grafana#16438) Templating: Fixed loading React variable query editor (grafana#16439) Styles: Fixed left menu highlight (grafana#16431) Fix: remove test artefact (grafana#16411) ...
markelog
added a commit
to markelog/grafana
that referenced
this pull request
Apr 22, 2019
* Added monkey dep for easy test stubbing * Small refactoring of the settings module * Update docs - remove references for the session storage * Update config files (sample and default configs) * Added tests for warning during the config load on defined storage cache * Removed all references to session storage * Removed macaron session dependency Fixes grafana#16148 Ref grafana#16114
markelog
added a commit
that referenced
this pull request
Apr 22, 2019
* Chore: remove session storage references * Small refactoring of the settings module * Update docs - remove references for the session storage * Update config files (sample and default configs) * Add tests for warning during the config load on defined storage cache * Remove all references to session storage * Remove macaron session dependency * Remove leftovers * Fix: address review comments * Fix: remove old deps * Fix: add skipStaticRootValidation = true to tests * Fix: improve the docs and warning message As per discussion in here - https://github.com/grafana/grafana/pull/16445/files#r273026255 * Chore: make linter happy Fixes #16148 Ref #16114
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.
What this PR does / why we need it:
Replaces session storage in auth_proxy middleware with remote cache
Which issue(s) this PR fixes:
Fixes #15161