Refactor rulerstore packages #3887
Merged
Conversation
This file contains hidden or 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
pracucci
commented
Feb 26, 2021
| @@ -31,28 +26,3 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) { | |||
| cfg.ConfigDB.RegisterFlagsWithPrefix(prefix, f) | |||
| cfg.RegisterFlagsWithPrefix(prefix, f) | |||
| } | |||
|
|
|||
| // NewRuleStore creates a new bucket client based on the configured backend | |||
| func NewRuleStore(ctx context.Context, cfg Config, cfgProvider bucket.TenantConfigProvider, logger log.Logger, reg prometheus.Registerer) (rules.RuleStore, error) { | |||
There was a problem hiding this comment.
Moved to pkg/ruler/storage.go to avoid circular dependencies.
gotjosh
approved these changes
Feb 26, 2021
jtlisi
approved these changes
Feb 26, 2021
pkg/ruler/ruler.go
Outdated
Comment on lines
31
to
32
| "github.com/cortexproject/cortex/pkg/ruler/rulespb" | ||
| store "github.com/cortexproject/cortex/pkg/ruler/rulespb" |
There was a problem hiding this comment.
suggestion: we may be able to trim this down
Suggested change
| "github.com/cortexproject/cortex/pkg/ruler/rulespb" | |
| store "github.com/cortexproject/cortex/pkg/ruler/rulespb" | |
| "github.com/cortexproject/cortex/pkg/ruler/rulespb" |
There was a problem hiding this comment.
Definitely! I didn't notice it, thanks! (and done)
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
pracucci
force-pushed
the
refactor-rulerstore-packages
branch
from
d941008 to
44a3700
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.
What this PR does:
Similarly to the package refactoring done in #3881, in this PR I'm proposing the same refactoring (same structure) for the rulestore. This should help to better reorganize packages.
The diff is huge and I'm sorry for that, but most changes have been done with the Goland IDE refactoring tool and splitted in different commits:
Which issue(s) this PR fixes:
N/A
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]